← Back to branch summary

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

« back to all changes in this revision

Viewing changes to sale_override/sale_view.xml

  • Committer: jf
  • Date: 2012-11-29 13:00:27 UTC
  • mfrom: (1287.9.8 unifield-wm)
  • Revision ID: jfb@tempo-consulting.fr-20121129130027-564r4yns8t5d2v7d
UTP-368 [FIX] Shouldn't be possible to source a non-stockable product to stock in the order sourcing tool (fix unit test)
lp:~unifield-team/unifield-wm/utp-368

Show diffs side-by-side

added added

removed removed

Lines of Context:
sale_override/sale_view.xml
16
16
                    <xpath expr="/form//field[@name='name']" position="replace">
17
17
                        <field name="name" required="1" />
18
18
                    </xpath>
19
 
                    <!-- UF-1846: we hide the product_uos_qty and product_uos that were displayed after the user right installation -->
20
 
                    <xpath expr="/form//field[@name='order_line']/form//field[@name='product_uos_qty']" position="attributes">
21
 
                         <attribute name="invisible">1</attribute>
22
 
                    </xpath>
23
 
                    <xpath expr="/form//field[@name='order_line']/form//field[@name='product_uos']" position="attributes">
24
 
                         <attribute name="invisible">1</attribute>
25
 
                    </xpath>
26
19
 
27
 
                    <!-- uf-1499
28
20
                    <xpath expr="/form/group//field[@name='invoiced']" position="attributes">
29
21
                         <attribute name="string">Invoiced</attribute>
30
22
                         <attribute name="attrs">{'invisible': [('intl_customer_ok', '=', False)]}</attribute>
31
 
                    </xpath>
32
 
                     -->
 
23
                     </xpath>
33
24
 
34
 
                    <xpath expr="/form/notebook//page[@string='Sales Order']//field[@name='order_line']/form/notebook//field[@name='product_id']" position="attributes">
 
25
                     <xpath expr="/form/notebook//page[@string='Sales Order']//field[@name='order_line']/form/notebook//field[@name='product_id']" position="attributes">
35
26
                         <attribute name="domain">[('sale_ok', '=', True), ('purchase_type', '=', parent.categ)]</attribute>
36
 
                    </xpath>
37
 
 
38
 
                    <xpath expr="/form/group//field[@name='invoiced']" position="attributes">
39
 
                         <attribute name="string">Invoiced</attribute>
40
 
                         <attribute name="invisible">1</attribute>
41
 
                    </xpath>
 
27
                     </xpath>
42
28
 
43
29
                    <xpath expr="/form/notebook//page[@string='Sales Order']//field[@name='order_line']/form/notebook//page[@string='Extra Info']" position="replace">
44
30
                    </xpath>
45
31
                    <xpath expr="/form/notebook//page[@string='Sales Order']//field[@name='order_line']/form/notebook//page[@string='History']" position="replace">
46
32
                    </xpath>
47
33
 
48
 
                    <xpath expr="/form/group/field[@name='client_order_ref']" position="attributes">
 
34
                                        <xpath expr="/form/group/field[@name='client_order_ref']" position="attributes">
49
35
                        <attribute name="attrs">{'readonly': ['|', ('partner_type', 'not in', ['external', 'esc']), ('state', 'not in', ['draft', 'validated'])]}</attribute>
50
36
                    </xpath>
51
37
 
52
38
                    <xpath expr="/form//field[@name='partner_id']" position="replace">
53
39
                        <field name="company_id2" invisible="1" />
54
 
                        <field name="partner_id" on_change="onchange_partner_id(partner_id, order_type)" context="{'search_default_customer':1}" required="1" domain="[('customer','=',True), ('id', '!=', company_id2), ('check_partner_so', '=', {'order_type':order_type, 'partner_id': partner_id})]"/>
 
40
                        <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" required="1"/>
55
41
                    </xpath>
56
42
                    <xpath expr="/form/group/field[@name='shipped']" position="after">
57
43
                        <!-- <field name="order_type" on_change="shipping_policy_change(order_policy, order_type, partner_id, 'order_type')" /> -->
58
44
                        <field name="order_type" />
59
45
                        <field name="priority" />
 
46
                        <newline />
60
47
                        <field name="categ" on_change="onchange_categ(categ)" />
61
48
                        <field name="loan_duration" attrs="{'invisible': [('order_type', '!=', 'loan')], 'required': [('order_type', '=', 'loan')]}" />
62
49
                        <field name="details" />
65
52
                    <xpath expr="/form/notebook/page[@string='Other Information']/group/field[@name='order_policy']" position="replace">
66
53
                        <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
67
54
                    </xpath>
68
 
                    <xpath expr="/form/notebook/page[@string='Other Information']/group/field[@name='invoice_quantity']" position="replace">
69
 
                        <field name="invoice_quantity" readonly="1" />
70
 
                    </xpath>
 
55
                    <button name="%(sale.action_view_sale_advance_payment_inv)d" position="replace">
 
56
                        <group colspan="1" col="1" attrs="{'invisible': [('noinvoice', '=', True)]}">
 
57
                            <button name="%(sale.action_view_sale_advance_payment_inv)d" string="Advance Invoice"
 
58
                                  type="action" icon="gtk-execute" states="draft,manual" />
 
59
                        </group>
 
60
                    </button>
71
61
                    <button name="manual_invoice" position="replace">
72
62
                        <group colspan="1" col="1" attrs="{'invisible': [('noinvoice', '=', True)]}">
73
63
                            <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>   
155
145
                        <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" help="Field Order validated"/>
156
146
                        <filter icon="gtk-paste-v" name="sourced" string="Sourced" domain="[('state','=','sourced')]" separator="1" />
157
147
                    </xpath>
158
 
                    <xpath expr="/search//filter[@string='Sales']" position="replace">
159
 
                        <filter icon="terp-check" string="Confirmed" domain="[('state','in',('manual','progress'))]"/>
160
 
                        <filter icon="terp-dialog-close" name="done" string="Closed" domain="[('state_hidden_sale_order','=','done')]"/>
161
 
                    </xpath>
162
148
 
163
149
                    <xpath expr="/search//filter[@string='To Invoice']" position="after">
164
150
                        <separator orientation="vertical" />
204
190
        </record>
205
191
 
206
192
        <!-- REWORK THE SALE MENU ACCORDING TO UF-657 ERGONOMIC IMPROVEMENTS -->
207
 
        <!-- MOVED THIS BLOCK TO hidden_menu.xml === DO NOT HARD DELETE MenuItem -->
208
 
        
209
 
        <!-- 
210
 
        
211
193
        <delete id="base.menu_partner_address_form" model="ir.ui.menu" />
212
194
        <delete id="base.menu_address_book" model="ir.ui.menu" />
213
195
        <delete id="sale.menu_invoiced" model="ir.ui.menu" />
214
196
        <delete id="sale.menu_action_picking_list_to_invoice" model="ir.ui.menu" />
215
197
        <delete id="sale.menu_invoicing_sales_order_lines" model="ir.ui.menu" />
216
198
 
217
 
                -->
218
 
                
219
199
        <menuitem action="sale.action_order_form" id="sale.menu_sale_order" parent="base.menu_sales" sequence="1" />
220
200
 
221
201
        <menuitem action="base.action_partner_form"
411
391
            </field>
412
392
        </record>
413
393
 
 
394
        <delete id="base.menu_crm_config_lead" model="ir.ui.menu" />
 
395
        <delete id="base.menu_res_partner_canal-act" model="ir.ui.menu" />
 
396
        <delete id="resource.menu_resource_config" model="ir.ui.menu" />
 
397
<!--        <delete id="sale.menu_action_shop_form" model="ir.ui.menu" />
 
398
            used in useability_dashboard_and_menu/menu/supply_config_menu.xml
 
399
-->
 
400
        <delete id="resource.menu_view_resource_calendar_leaves_search" model="ir.ui.menu" />
414
401
 
 
402
        <delete id="base.menu_country_state_partner" model="ir.ui.menu" />
415
403
<!--        <delete id="base.menu_country_partner" model="ir.ui.menu" />
416
404
            used in useability_dashboard_and_menu/menu/supply_config_menu.xml
417
405
-->
 
406
        <delete id="base.menu_localisation" model="ir.ui.menu" />
418
407
 
419
408
        <menuitem id="menu_localisation" name="Localisation" parent="base.menu_administration" sequence="1"/>
420
409
        <menuitem action="base.action_country" id="menu_country_partner" parent="menu_localisation" sequence="0"/>