odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]Add Button Print delivery order and Return Product in Delivery Module .lp BUG:-674578 

bzr revid: ron@tinyerp.com-20101118133157-s8w7i43mjbuqxcx4
This commit is contained in:
ron@tinyerp.com 2010-11-18 19:01:57 +05:30
parent 255bf5806a
commit b5a5314fc0
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/delivery/delivery_report.xml
View File

@ -6,7 +6,8 @@
id="report_shipping"
model="stock.picking"
name="sale.shipping"
rml="delivery/report/shipping.rml"
multi="True"
rml="delivery/report/shipping.rml"
string="Delivery order"/>
</data>

19
addons/delivery/delivery_view.xml
View File

@ -4,6 +4,9 @@
<!-- Delivery Carriers -->
<menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_configuration" sequence="4"/>
<record id="view_delivery_carrier_tree" model="ir.ui.view">
<field name="name">delivery.carrier.tree</field>
<field name="model">delivery.carrier</field>
@ -266,10 +269,24 @@
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Sales Order']/group[1]/button[@name='button_dummy']" position="after">
<button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>
<button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>
</xpath>
</field>
</record>
<record id="view_delivary_order_inherit_stock" model="ir.ui.view">
<field name="name">stock.picking.out.form</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Products']/group/button[@name='action_process']" position="after">
<button name="%(stock.act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
<button name="%(report_shipping)d" string="Delivery Order" states="done,assigned" type="action" icon="gtk-print"/>
</xpath>
</field>
</record>
</data>
</openerp>

2
addons/stock/stock_view.xml
View File

@ -911,7 +911,7 @@
</group>
</form>
</field>
<group col="10" colspan="4">
<group col="12" colspan="4">
<field name="state" readonly="1"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
<button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>

11
addons/stock/wizard/stock_return_picking_view.xml
View File

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<act_window name="Return Picking"
<act_window name="Return Picking"
res_model="stock.return.picking"
src_model="stock.picking"
view_mode="form"
target="new"
key2="client_action_multi"
id="act_stock_return_picking"/>
target="new"
key2="client_action_multi"
multi="True"
id="act_stock_return_picking"/>
</data>
</openerp>
</openerp>