openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06438
[Merge] lp:~openerp-dev/openobject-addons/trunk-fixes-ind-addons2 into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind
Rifakat Haradwala (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-fixes-ind-addons2 into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.
Requested reviews:
Husen Daudi (husendaudi)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-fixes-ind-addons2/+merge/60335
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-fixes-ind-addons2/+merge/60335
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.
=== modified file 'mrp/wizard/mrp_workcenter_load_view.xml'
--- mrp/wizard/mrp_workcenter_load_view.xml 2011-01-14 00:11:01 +0000
+++ mrp/wizard/mrp_workcenter_load_view.xml 2011-05-09 06:17:25 +0000
@@ -1,35 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
+
<!-- Work Center Load Report -->
-
- <record id="view_mrp_workcenter_load_wizard" model="ir.ui.view">
+
+ <record id="view_mrp_workcenter_load_wizard" model="ir.ui.view">
<field name="name">Work Center Load</field>
<field name="model">mrp.workcenter.load</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Select time unit">
- <field name="time_unit"/>
- <newline/>
- <field name="measure_unit"/>
- <newline/>
- <group col="2" colspan="4">
- <button icon='gtk-stop' special="cancel"
- string="Cancel" />
- <button name="print_report" string="Print"
- colspan="1" type="object" icon="gtk-print" />
- </group>
- </form>
- </field>
- </record>
-
- <act_window name="Work Center Load"
+ <form string="Select time unit">
+ <group col="2" colspan="4">
+ <label string="Work Center Loads gives you a projection of work center loads over a specified period. It is expressed in number of hours and machine related cycles." colspan="2"/>
+ <newline/>
+ <field name="time_unit"/>
+ <newline/>
+ <field name="measure_unit"/>
+ </group>
+ <group col="2" colspan="4">
+ <separator string="" colspan="4"/>
+ <button icon='gtk-stop' special="cancel"
+ string="Cancel" />
+ <button name="print_report" string="Print"
+ colspan="1" type="object" icon="gtk-print" />
+ </group>
+ </form>
+ </field>
+ </record>
+
+ <act_window name="Work Center Load"
res_model="mrp.workcenter.load"
src_model="mrp.workcenter"
- view_mode="form"
- target="new"
- key2="client_print_multi"
- id="action_mrp_workcenter_load_wizard"/>
- </data>
+ view_mode="form"
+ target="new"
+ key2="client_print_multi"
+ id="action_mrp_workcenter_load_wizard"/>
+ </data>
</openerp>
=== modified file 'share/wizard/share_wizard.py'
--- share/wizard/share_wizard.py 2011-03-08 11:22:08 +0000
+++ share/wizard/share_wizard.py 2011-05-09 06:17:25 +0000
@@ -66,7 +66,7 @@
'user_type' : lambda self, cr, uid, *a: 'existing' if self.pool.get('res.users').search(cr, uid, [('share', '=', True)]) else 'new',
'domain': lambda self, cr, uid, context, *a: context.get('domain', '[]'),
'share_root_url': lambda self, cr, uid, context, *a: context.get('share_root_url') or _('Please specify "share_root_url" in context'),
- 'action_id': lambda self, cr, uid, context, *a: context.get('action_id'),
+ 'action_id': lambda self, cr, uid, context, *a: context.get('action_id', False),
'access_mode': 'readonly'
}
=== modified file 'stock/i18n/stock.pot'
--- stock/i18n/stock.pot 2011-03-17 17:33:16 +0000
+++ stock/i18n/stock.pot 2011-05-09 06:17:25 +0000
@@ -923,19 +923,21 @@
#. module: stock
#: help:stock.location,usage:0
msgid "* Supplier Location: Virtual location representing the source location for products coming from your suppliers\n"
-" \n"
+" \n"
"* View: Virtual location used to create a hierarchical structures for your warehouse, aggregating its child locations ; can't directly contain products\n"
-" \n"
-"* Internal Location: Physical locations inside your own warehouses,\n"
-" \n"
+" \n"
+"* Internal Location: Physical locations inside your own warehouses\n"
+" \n"
"* Customer Location: Virtual location representing the destination location for products sent to your customers\n"
-" \n"
+" \n"
"* Inventory: Virtual location serving as counterpart for inventory operations used to correct stock levels (Physical inventories)\n"
-" \n"
-"* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (supplier or production) is not known yet. This location should be empty when the procurement scheduler has finished running.\n"
-" \n"
+" \n"
+"* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (supplier or production) is not known yet. This location should be empty when the procurement scheduler has finished running\n"
+" \n"
"* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products\n"
-" "
+" \n"
+"* Transit Location for Inter-Companies Transfers: Used as an intermediate location in a multi-company environment.\n"
+" "
msgstr ""
#. module: stock
@@ -1225,7 +1227,7 @@
#. module: stock
#: help:stock.location,address_id:0
-msgid "Address of customer or supplier."
+msgid "Address of customer or supplier."
msgstr ""
#. module: stock
=== modified file 'stock/stock.py'
--- stock/stock.py 2011-04-07 11:40:14 +0000
+++ stock/stock.py 2011-05-09 06:17:25 +0000
@@ -154,15 +154,21 @@
_columns = {
'name': fields.char('Location Name', size=64, required=True, translate=True),
'active': fields.boolean('Active', help="By unchecking the active field, you may hide a location without deleting it."),
- 'usage': fields.selection([('supplier', 'Supplier Location'), ('view', 'View'), ('internal', 'Internal Location'), ('customer', 'Customer Location'), ('inventory', 'Inventory'), ('procurement', 'Procurement'), ('production', 'Production'), ('transit', 'Transit Location for Inter-Companies Transfers')], 'Location Type', required=True,
- help="""* Supplier Location: Virtual location representing the source location for products coming from your suppliers
- \n* View: Virtual location used to create a hierarchical structures for your warehouse, aggregating its child locations ; can't directly contain products
- \n* Internal Location: Physical locations inside your own warehouses,
- \n* Customer Location: Virtual location representing the destination location for products sent to your customers
- \n* Inventory: Virtual location serving as counterpart for inventory operations used to correct stock levels (Physical inventories)
- \n* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (supplier or production) is not known yet. This location should be empty when the procurement scheduler has finished running.
- \n* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products
- """, select = True),
+ 'usage': fields.selection([('supplier', 'Supplier Location'),\
+ ('view', 'View'), ('internal', 'Internal Location'),\
+ ('customer', 'Customer Location'), ('inventory', 'Inventory'),\
+ ('procurement', 'Procurement'), ('production', 'Production'),\
+ ('transit', 'Transit Location for Inter-Companies Transfers')],\
+ 'Location Type', required=True,\
+ help="""* Supplier Location: Virtual location representing the source location for products coming from your suppliers
+ \n* View: Virtual location used to create a hierarchical structures for your warehouse, aggregating its child locations ; can't directly contain products
+ \n* Internal Location: Physical locations inside your own warehouses
+ \n* Customer Location: Virtual location representing the destination location for products sent to your customers
+ \n* Inventory: Virtual location serving as counterpart for inventory operations used to correct stock levels (Physical inventories)
+ \n* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (supplier or production) is not known yet. This location should be empty when the procurement scheduler has finished running
+ \n* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products
+ \n* Transit Location for Inter-Companies Transfers: Used as an intermediate location in a multi-company environment.
+ """, select = True),
# temporarily removed, as it's unused: 'allocation_method': fields.selection([('fifo', 'FIFO'), ('lifo', 'LIFO'), ('nearest', 'Nearest')], 'Allocation Method', required=True),
'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Location Name"),
@@ -194,7 +200,7 @@
'chained_picking_type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', help="Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."),
'chained_company_id': fields.many2one('res.company', 'Chained Company', help='The company the Picking List containing the chained move will belong to (leave empty to use the default company determination rules'),
'chained_delay': fields.integer('Chaining Lead Time',help="Delay between original move and chained move in days"),
- 'address_id': fields.many2one('res.partner.address', 'Location Address',help="Address of customer or supplier."),
+ 'address_id': fields.many2one('res.partner.address', 'Location Address',help="Address of customer or supplier."),
'icon': fields.selection(tools.icons, 'Icon', size=64,help="Icon show in hierarchical tree view"),
'comment': fields.text('Additional Information'),
=== modified file 'stock/wizard/stock_inventory_merge_view.xml'
--- stock/wizard/stock_inventory_merge_view.xml 2011-01-14 00:11:01 +0000
+++ stock/wizard/stock_inventory_merge_view.xml 2011-05-09 06:17:25 +0000
@@ -9,7 +9,7 @@
<field name="arch" type="xml">
<form string="Merge inventories">
<separator colspan="4" string="Merge inventories" />
- <label string="Do you want to merge theses inventories ?"/>
+ <label string="Do you want to merge these inventories ?"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
Follow ups
