Hardik Ansodariya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability-purchase_invoice_control-han
into lp:~openerp-dev/openobject-addons/trunk-usability.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase_invoice_control-han/+merge/74048
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase_invoice_control-han/+merge/74048
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-usability.
=== modified file 'purchase/stock_view.xml'
--- purchase/stock_view.xml 2011-07-22 13:00:50 +0000
+++ purchase/stock_view.xml 2011-09-05 07:02:25 +0000
@@ -109,7 +109,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('type','=','in')]</field>
- <field name="context">{'search_default_done':1,'search_default_to_invoice':1}</field>
+ <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
<field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
<field name="help">Create invoice from reception of products. If you selected this invoice control method in the purchase order, all receptions done are available here to be invoiced.</field>
</record>
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2011-08-04 10:26:35 +0000
+++ stock/stock_view.xml 2011-09-05 07:02:25 +0000
@@ -690,14 +690,14 @@
<field name="name">stock.picking.form</field>
<field name="model">stock.picking</field>
<field name="type">form</field>
- <field eval="12" name="priority"/>
<field name="arch" type="xml">
- <form string="Internal Picking list">
+ <form string="Internal Picking List">
<group colspan="4" col="6">
<group colspan="4" col="4">
<field name="name" readonly="1"/>
<field name="origin"/>
<field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" colspan="4"/>
+ <field name="invoice_state" string="Invoice Control"/>
<field name="backorder_id" readonly="1" groups="base.group_extended"/>
</group>
<group colspan="2" col="2">
@@ -707,13 +707,12 @@
</group>
</group>
<notebook colspan="4">
- <page string="Products">
- <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines}">
- <tree colors="grey:scrapped == True" string="Stock Moves">
- <field name="product_id"/>
- <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
- <field name="product_uom" string="UoM"/>
- <field name="product_uos" groups="product.group_uos"/>
+ <page string="General Information">
+ <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}" >
+ <tree colors="grey:scrapped==True" string="Stock Moves">
+ <field name="product_id" />
+ <field name="product_qty" />
+ <field name="product_uom" string="UoM" />
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
icon="gtk-convert" context="{'scrap': True}"
@@ -722,24 +721,21 @@
<field name="scrapped" invisible="1"/>
<field name="prodlot_id" groups="base.group_extended"/>
<button
- name="%(stock.track_line)d"
- string="Split in production lots"
- groups="base.group_extended"
- type="action" icon="terp-stock_effects-object-colorize"
- states="draft,waiting,confirmed,assigned" />
- <field groups="base.group_extended" name="tracking_id"/>
+ name="%(stock.track_line)d"
+ string="Split in production lots"
+ groups="base.group_extended"
+ type="action" icon="terp-stock_effects-object-colorize"
+ states="draft,waiting,confirmed,assigned" />
+ <field name="tracking_id" groups="base.group_extended"/>
<button name="setlast_tracking" string="Put in current pack" type="object"
- attrs="{'invisible': [('tracking_id','<>',False)]}"
- icon="terp-stock_effects-object-colorize"
groups="base.group_extended"
+ icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','<>',False)]}"
states="draft,assigned,confirmed"/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="base.group_extended"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed"/>
- <field name="location_id"/>
<field name="location_dest_id"/>
- <field name="date_expected" string="Date Expected"/>
<field name="state"/>
</tree>
<form string="Stock Moves">
@@ -760,7 +756,7 @@
<group colspan="2" col="2">
<separator string="Locations" colspan="2" />
- <field name="location_id" domain="[('usage','=','internal')]" />
+ <field name="location_id" domain="[('usage','<>','view')]" />
<field name="location_dest_id" domain="[('usage','=','internal')]" />
</group>
@@ -773,24 +769,24 @@
<group colspan="2" col="4" groups="base.group_extended">
<separator string="Traceability" colspan="4" groups="base.group_extended"/>
- <field name="tracking_id" groups="base.group_extended" colspan="3"/>
+ <field name="tracking_id" groups="base.group_extended" colspan="3" />
<button name="%(split_into)d" string="New pack" type="action"
groups="base.group_extended"
icon="terp-stock_effects-object-colorize"
- states="draft,assigned,confirmed" colspan="1"/>
+ states="draft,assigned,confirmed" colspan="1"/>
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]"
- on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
+ on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
<button name="%(track_line)d"
- groups="base.group_extended"
- states="draft,waiting,confirmed,assigned"
- string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
+ groups="base.group_extended"
+ states="draft,waiting,confirmed,assigned"
+ string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
</group>
<label string="" colspan="4"/>
<field name="state"/>
<group col="4" colspan="2">
- <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+ <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
@@ -800,19 +796,19 @@
<group col="10" 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-apply"/>
+ <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
<button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
<button name="action_assign" states="confirmed" string="Check Availability" type="object" 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="Process" groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
- <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="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
+ <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
+ <group colspan="1" states="done">
+ <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
+ </group>
+ <button states="done" 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" />
</group>
</page>
- <page string="Additional info" groups="base.group_extended,base.group_multi_company">
+ <page string="Additional Info" groups="base.group_extended,base.group_multi_company">
<field name="auto_picking" groups="base.group_extended"/>
- <field name="invoice_state" groups="base.group_extended"/>
- <field name="date_done" groups="base.group_extended"/>
- <field name="move_type" groups="base.group_extended"/>
<field name="type" groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</page>
_______________________________________________
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
