Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-trunk-addons21_werehouse_imp-shp into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-trunk-addons21_werehouse_imp-shp/+merge/138456
Hello,
I have done the following issues:-
1) add kg after weight,
2) Incoming Shipments form view, rename Date Done=>Date of Reception
3) Internal Moves form view, rename Date Done=>Date of Transfer
4) Delivery Orders form view, rename Date Done=>Date of Delivery
4) change field label "Stock journal" => "Stock Journal"
thanks
shp
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-trunk-addons21_werehouse_imp-shp/+merge/138456
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-trunk-addons21_werehouse_imp-shp.
=== modified file 'delivery/delivery_view.xml'
--- delivery/delivery_view.xml 2012-11-30 17:11:30 +0000
+++ delivery/delivery_view.xml 2012-12-06 13:48:39 +0000
@@ -243,8 +243,12 @@
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<field name="company_id" position="before">
- <field name="weight"/>
- <field name="weight_net" groups="base.group_no_one"/>
+ <label for="weight" string="Weight"/>
+ <div>
+ <field name="weight" class="oe_inline"/>
+ <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
+ </div>
+ <field name="weight_net" groups="base.group_no_one" class="oe_inline"/>
</field>
</field>
</record>
@@ -279,8 +283,12 @@
<field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='main_grp']" position="inside">
- <field name="weight"/>
- <field name="weight_net" groups="base.group_no_one"/>
+ <label for="weight" string="Weight"/>
+ <div>
+ <field name="weight" class="oe_inline"/>
+ <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
+ </div>
+ <field name="weight_net" groups="base.group_no_one" class="oe_inline"/>
</xpath>
</field>
</record>
=== modified file 'delivery/stock.py'
--- delivery/stock.py 2012-11-29 22:26:45 +0000
+++ delivery/stock.py 2012-12-06 13:48:39 +0000
@@ -66,6 +66,7 @@
}),
'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
'number_of_packages': fields.integer('Number of Packages'),
+ 'weight_uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of Measure (Unit of Measure) is the unit of measurement for Weight",),
}
def _prepare_shipping_invoice_line(self, cr, uid, picking, invoice, context=None):
@@ -133,6 +134,10 @@
invoice_obj.button_compute(cr, uid, [invoice.id], context=context)
return result
+ _defaults = {
+ 'weight_uom_id': lambda self,cr,uid,c: self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'product_uom_kgm')[1]
+ }
+
stock_picking()
class stock_move(osv.osv):
@@ -169,8 +174,11 @@
store={
'stock.move': (lambda self, cr, uid, ids, c=None: ids, ['product_id', 'product_qty', 'product_uom'], 20),
}),
+ 'weight_uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of Measure (Unit of Measure) is the unit of measurement for Weight",),
}
-
+ _defaults = {
+ 'weight_uom_id': lambda self,cr,uid,c: self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'product_uom_kgm')[1]
+ }
stock_move()
# Redefinition of the new fields in order to update the model stock.picking.out in the orm
=== modified file 'stock/product.py'
--- stock/product.py 2012-11-29 22:26:45 +0000
+++ stock/product.py 2012-12-06 13:48:39 +0000
@@ -530,7 +530,7 @@
_columns = {
'property_stock_journal': fields.property('account.journal',
relation='account.journal', type='many2one',
- string='Stock journal', view_load=True,
+ string='Stock Journal', view_load=True,
help="When doing real-time inventory valuation, this is the Accounting Journal in which entries will be automatically posted when stock moves are processed."),
'property_stock_account_input_categ': fields.property('account.account',
type='many2one', relation='account.account',
=== modified file 'stock/stock.py'
--- stock/stock.py 2012-11-30 17:11:30 +0000
+++ stock/stock.py 2012-12-06 13:48:39 +0000
@@ -655,7 +655,7 @@
'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
store=True, type='datetime', string='Scheduled Time', select=1, help="Scheduled time for the shipment to be processed"),
'date': fields.datetime('Time', help="Creation time, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
- 'date_done': fields.datetime('Date Done', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
+ 'date_done': fields.datetime('Date of Transfer', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
store=True, type='datetime', string='Max. Expected Date', select=2),
'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
@@ -3037,6 +3037,7 @@
_columns = {
'backorder_id': fields.many2one('stock.picking.in', '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),
+ 'date_done': fields.datetime('Date of Reception', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'state': fields.selection(
[('draft', 'Draft'),
('auto', 'Waiting Another Operation'),
@@ -3082,6 +3083,7 @@
_columns = {
'backorder_id': fields.many2one('stock.picking.out', '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),
+ 'date_done': fields.datetime('Date of Delivery ', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'state': fields.selection(
[('draft', 'Draft'),
('auto', 'Waiting Another Operation'),
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
