← Back to branch summary

~unifield-team/unifield-wm/us-826

« back to all changes in this revision

Viewing changes to product_attributes/product_attributes_view.xml

  • Committer: Matthieu Dietrich
  • Date: 2012-07-10 14:12:40 UTC
  • mfrom: (913 unifield-wm)
  • mto: This revision was merged to the branch mainline in revision 935.
  • Revision ID: mdietrich@chloups211-20120710141240-celi3o016fqz7mj1
UF-881: [MERGE] merged with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
product_attributes/product_attributes_view.xml
47
47
                                <field name="procure_method" groups="base.group_extended"/>
48
48
                                <field name="supply_method"/>
49
49
                            </group>
50
 
                            <group colspan="2" col="2">
51
 
                                <separator string="Base Prices" colspan="2"/>
52
 
                                <field groups="base.group_extended" name="cost_method"/>
53
 
                                <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
54
 
                                <field name="list_price"/>
 
50
                            <group colspan="2" col="3">
 
51
                                <separator string="Base Prices" colspan="3"/>
 
52
                                <field groups="base.group_extended" name="cost_method" colspan="3"/>
 
53
                                <field name="standard_price" string="Cost Price " attrs="{'readonly':[('cost_method','=','average')]}"/>
 
54
                                <field name="currency_id" nolabel="1" />
 
55
                                <field name="list_price" colspan="2"/>
 
56
                                <field name="field_currency_id" nolabel="1" />
55
57
                                <newline/>
56
 
                                <field name="price_margin" groups="product.group_product_variant"/>
 
58
                                <field name="price_margin" groups="product.group_product_variant" colspan="3"/>
57
59
                            </group>
58
60
 
59
61
                            <group colspan="2" col="2" groups="base.group_extended">
221
223
            </field>
222
224
        </record>
223
225
        
 
226
        <record id="product_product_product_tree_view" model="ir.ui.view">
 
227
                <field name="name">porduct.product.product.tree.view</field>
 
228
                <field name="model">product.product</field>
 
229
                <field name="type">tree</field>
 
230
                <field name="inherit_id" ref="product.product_product_tree_view" />
 
231
                <field name="arch" type="xml">
 
232
                        <xpath expr="/tree//field[@name='lst_price']" position="attributes" >
 
233
                                <attribute name="invisible">context.get('pricelist', False)</attribute>
 
234
                        </xpath>
 
235
                        <xpath expr="/tree//field[@name='standard_price']" position="attributes" >
 
236
                                <attribute name="invisible">context.get('pricelist', False)</attribute>
 
237
                        </xpath>
 
238
                        <xpath expr="/tree//field[@name='price']" position="attributes">
 
239
                                <attribute name="string">Price</attribute>
 
240
                        </xpath>
 
241
                </field>
 
242
        </record>
 
243
        
224
244
        
225
245
        <record id="product_supplierinfo_form_view" model="ir.ui.view">
226
246
            <field name="name">product.supplierinfo.form.view.inherit</field>
333
353
                <search string="Product">
334
354
                   <filter string="Stockable" icon="terp-accessories-archiver" domain="[('type','=','product')]"/>
335
355
                   <filter string="Non-Stockable" icon="terp-accessories-archiver" domain="[('type','=','consu')]"/>
336
 
                   <filter string="Service" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
 
356
                   <filter string="Service with Reception" icon="terp-accessories-archiver" domain="[('type','=','service_recep')]" />
337
357
                   <separator orientation="vertical"/>
338
358
                   <field name="default_code"/>
339
359
                   <field name="name"/>
344
364
                   <filter string="Asset" icon="terp-accessories-archiver" domain="[('subtype','=','asset')]"/>
345
365
                   <newline/>
346
366
                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
347
 
                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
348
367
                       <field name="list_ids" widget="many2one" context="{'list': self}" />
349
368
                   </group>
350
369
                   <newline/>
359
378
                </search>
360
379
            </field>
361
380
        </record>
 
381
        
 
382
        <record id="stock.product_search_form_view_stock" model="ir.ui.view">
 
383
            <field name="name">product.search.stock.form</field>
 
384
            <field name="model">product.product</field>
 
385
            <field name="type">search</field>
 
386
            <field name="inherit_id" ref="product.product_search_form_view"/>
 
387
            <field name="arch" type="xml">
 
388
                   <field name="list_ids" position="before">
 
389
                       <field name="location_id" context="{'location': self}"/>
 
390
                       <separator orientation="vertical"/>
 
391
                   </field>
 
392
            </field>
 
393
        </record>
362
394
 
363
395
        <menuitem id="menu_main_product" name="Products" sequence="1" 
364
396
                  web_icon_hover="images/products.png"