Hardik Ansodariya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability-purchase_invoce_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_invoce_control-han/+merge/74068
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase_invoce_control-han/+merge/74068
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 10:25: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 10:25:25 +0000
@@ -698,6 +698,7 @@
<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">
@@ -708,7 +709,7 @@
</group>
<notebook colspan="4">
<page string="Products">
- <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines}">
+ <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" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -737,7 +738,6 @@
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"/>
@@ -760,7 +760,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>
@@ -810,7 +810,6 @@
</page>
<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"/>
_______________________________________________
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
