Divyesh Makwana(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-stock_picking_usability-mdi into
lp:~openerp-dev/openobject-addons/trunk-stock_picking_usability.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-stock_picking_usability-mdi/+merge/98814
Hello Sir,
I have improved button name and report name according to the
Incoming Shipment, Internal Shipment and Delivery Order.
Thanks,
Divyesh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-stock_picking_usability-mdi/+merge/98814
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-stock_picking_usability-mdi into
lp:~openerp-dev/openobject-addons/trunk-stock_picking_usability.
=== modified file 'stock/stock.py'
--- stock/stock.py 2012-03-21 11:58:21 +0000
+++ stock/stock.py 2012-03-22 10:44:37 +0000
@@ -681,11 +681,11 @@
if report['report_name'] != 'stock.picking.list':
continue
if type == 'in':
- report['string'] = 'Incoming Shipment'
+ report['string'] = 'Receipt Slip'
elif type == 'internal':
- report['string'] = 'Internal Shipment'
+ report['string'] = 'Picking Slip'
elif type == 'out':
- report['string'] = 'Delivery Order'
+ report['string'] = 'Delivery Slip'
report['name'] = report['string']
for field in res['fields']:
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2012-03-21 11:14:45 +0000
+++ stock/stock_view.xml 2012-03-22 10:44:37 +0000
@@ -989,12 +989,13 @@
</field>
<group col="12" colspan="4">
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
- <button name="draft_validate" states="draft" string="Deliver Now" type="object" icon="gtk-media-play"/>
- <button name="action_assign" states="draft" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-find"/>
+ <button name="draft_force_assign" states="draft" string="Confirm" type="object" icon="gtk-ok"/>
+ <button name="draft_validate" states="draft" string="Confirm & Deliver" type="object" icon="gtk-media-play"/>
+ <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-find"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward"/>
- <button name="%(report_picking_list)d" string="Print Delivery Order" states="done" type="action" icon="gtk-print"/>
- <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
+ <button name="%(report_picking_list)d" string="Print Delivery Slip" states="done" type="action" icon="gtk-print"/>
+ <button name="%(act_stock_return_picking)d" string="Products Return" states="done" type="action" icon="gtk-execute"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
</group>
_______________________________________________
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