Pankita Shah(OpenERP) 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/135656
Hello,
I have done the following issues:-
1) add kg in weight,cm in height,width,length
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/135656
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-10-05 07:25:41 +0000
+++ delivery/delivery_view.xml 2012-11-22 12:01:25 +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="product_uom_weight" nolabel="1" class="oe_inline"/>
+ </div>
+ <field name="weight_net" groups="base.group_no_one"/>
</field>
</field>
</record>
=== modified file 'delivery/stock.py'
--- delivery/stock.py 2012-09-30 10:26:12 +0000
+++ delivery/stock.py 2012-11-22 12:01:25 +0000
@@ -66,6 +66,7 @@
}),
'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
'number_of_packages': fields.integer('Number of Packages'),
+ 'product_uom_weight': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of Measure (Unit of Measure) is the unit of measurement for Duration",),
}
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 = {
+ 'product_uom_weight': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('kg'))], context=c)[0],
+ }
+
stock_picking()
class stock_move(osv.osv):
=== modified file 'product/product.py'
--- product/product.py 2012-11-20 11:36:00 +0000
+++ product/product.py 2012-11-22 12:01:25 +0000
@@ -784,6 +784,9 @@
'height': fields.float('Height', help='The height of the package'),
'width': fields.float('Width', help='The width of the package'),
'length': fields.float('Length', help='The length of the package'),
+ 'product_uom_width': fields.many2one('product.uom', 'Unit of Measure',readonly="1", required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for Duration",),
+ 'product_uom_length': fields.many2one('product.uom', 'Unit of Measure', readonly="1",required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for Duration",),
+ 'product_uom_height': fields.many2one('product.uom', 'Unit of Measure',readonly="1", required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for Duration",),
}
@@ -813,6 +816,10 @@
'rows' : lambda *a : 3,
'sequence' : lambda *a : 1,
'ul' : _get_1st_ul,
+ 'product_uom_width': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('cm'))], context=c)[0],
+ 'product_uom_length': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('cm'))], context=c)[0],
+ 'product_uom_height': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('cm'))], context=c)[0]
+
}
def checksum(ean):
=== modified file 'product/product_view.xml'
--- product/product_view.xml 2012-11-22 10:41:59 +0000
+++ product/product_view.xml 2012-11-22 12:01:25 +0000
@@ -547,26 +547,42 @@
<field name="model">product.packaging</field>
<field name="arch" type="xml">
<form string="Packaging" version="7.0">
- <group col="4">
- <field name="product_id"/>
- <newline/>
- <field name="ean"/>
- <field name="sequence" invisible="1"/>
- <newline/>
- <field name="qty"/>
- <field name="ul"/>
- <field name="weight_ul"/>
- <separator colspan="4" string="Palletization"/>
- <field name="ul_qty"/>
- <field name="rows"/>
- <field name="weight"/>
- <separator colspan="4" string="Pallet Dimension"/>
- <field name="height"/>
- <field name="width"/>
- <field name="length"/>
- <separator colspan="4" string="Other Info"/>
- <field colspan="4" name="name"/>
- </group>
+ <group col="6">
+ <field name="product_id"/>
+ <newline/>
+ <field name="ean"/>
+ <newline/>
+ <field name="qty"/>
+ <field name="ul"/>
+ <newline/>
+ <field name="weight_ul"/>
+ <newline/>
+ <separator colspan="6" string="Palletization"/>
+ <field name="ul_qty"/>
+ <field name="rows"/>
+ <newline/>
+ <field name="weight"/>
+ <separator colspan="6" string="Pallet Dimension"/>
+ <label for="height" string="Height"/>
+ <div>
+ <field name="height" class="oe_inline"/>
+ <field name="product_uom_height" nolabel="1" class="oe_inline"/>
+ </div>
+ <label for="width" string="Width"/>
+ <div>
+ <field name="width" class="oe_inline"/>
+ <field name="product_uom_width" nolabel="1" class="oe_inline"/>
+ </div>
+ <newline/>
+ <label for="length" string="Length"/>
+ <div>
+ <field name="length" class="oe_inline"/>
+ <field name="product_uom_length" nolabel="1" class="oe_inline"/>
+ </div>
+ <newline/>
+ <separator colspan="6" string="Other Info"/>
+ <field colspan="4" name="name"/>
+ </group>
</form>
</field>
</record>
=== modified file 'stock/product.py'
--- stock/product.py 2012-11-02 17:34:07 +0000
+++ stock/product.py 2012-11-22 12:01:25 +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-22 06:12:44 +0000
+++ stock/stock.py 2012-11-22 12:01:25 +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)]}),
@@ -1606,7 +1606,7 @@
_name = "stock.move"
_description = "Stock Move"
- _order = 'date_expected desc, id'
+ _order = 'id desc, picking_id'
_log_create = False
def action_partial_move(self, cr, uid, ids, context=None):
@@ -3035,6 +3035,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'),
@@ -3080,6 +3081,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 : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
