Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-8966 into lp:unifield-server

  1. US-8966
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6287
Proposed branch: lp:~dorian-kemps/unifield-server/US-8966
Merge into: lp:unifield-server
Diff against target: 77 lines (+13/-10)
4 files modified
bin/addons/msf_doc_import/view/internal_request_import_line_view.xml (+3/-3)
bin/addons/msf_doc_import/wizard/wizard_cancel_lines.py (+4/-1)
bin/addons/purchase/purchase_view.xml (+3/-3)
bin/addons/sale/sale_view.xml (+3/-3)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-8966
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+426539@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_doc_import/view/internal_request_import_line_view.xml'
2--- bin/addons/msf_doc_import/view/internal_request_import_line_view.xml 2022-05-02 12:00:43 +0000
3+++ bin/addons/msf_doc_import/view/internal_request_import_line_view.xml 2022-07-08 07:47:49 +0000
4@@ -66,13 +66,13 @@
5 <attribute name="on_change">onchange_uom(product_id, product_uom, product_uom_qty)</attribute>
6 </xpath>
7 <xpath expr="/form/notebook/page[@string='Products']/field[@name='order_line']" position="before" >
8- <group name="import" string=" Import Lines " colspan="4" attrs="{'invisible':[('state', '!=', 'draft')]}">
9+ <group name="import" string=" Import Lines " colspan="4" attrs="{'invisible':[('state', 'not in', ['draft', 'draft_p', 'validated'])]}">
10 <button name="wizard_import_ir_line" string="Import lines" icon="gtk-dnd" col="1" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}" context="{'noraise': True}" />
11 <button name="button_cancel_lines" string="Cancel Lines" icon="gtk-remove" colspan="1" type="object" context="{'noraise': True}" />
12- <button name="check_lines_to_fix" string="Check Lines" icon="gtk-dialog-warning" colspan="1" type="object" invisible="0" context="{'noraise': True}" />
13+ <button name="check_lines_to_fix" string="Check Lines" icon="gtk-dialog-warning" colspan="1" type="object" invisible="0" attrs="{'invisible':[('state', '!=', 'draft')]}" context="{'noraise': True}" />
14 <field name="hide_column_error_ok" invisible="1" colspan="1" />
15 <newline />
16- <button name="add_multiple_lines" string="Add multiple lines" icon="gtk-add" colspan="4" type="object" context="{'noraise': True}" />
17+ <button name="add_multiple_lines" string="Add multiple lines" icon="gtk-add" colspan="4" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}" context="{'noraise': True}" />
18 </group>
19 </xpath>
20 <xpath expr="/form//field[@name='order_line']" position="attributes" >
21
22=== modified file 'bin/addons/msf_doc_import/wizard/wizard_cancel_lines.py'
23--- bin/addons/msf_doc_import/wizard/wizard_cancel_lines.py 2021-07-07 16:30:21 +0000
24+++ bin/addons/msf_doc_import/wizard/wizard_cancel_lines.py 2022-07-08 07:47:49 +0000
25@@ -365,7 +365,10 @@
26 line_ids = line_obj.search(cr, uid, [(wiz.linked_field_name, '=', wiz.initial_doc_id)], context=context)
27
28 if wiz.to_cancel_type in ['sale.order.line', 'purchase.order.line']:
29- line_ids = line_obj.search(cr, uid, [('id', 'in', line_ids), ('state', 'not in', ['cancel', 'cancel_r'])], context=context)
30+ states = ['draft', 'validated']
31+ if wiz.to_cancel_type == 'purchase.order.line':
32+ states.append('validated_n')
33+ line_ids = line_obj.search(cr, uid, [('id', 'in', line_ids), ('state', 'in', states)], context=context)
34
35 self.write(cr, uid, [wiz.id], {'line_ids': line_ids}, context=context)
36
37
38=== modified file 'bin/addons/purchase/purchase_view.xml'
39--- bin/addons/purchase/purchase_view.xml 2022-05-02 12:00:43 +0000
40+++ bin/addons/purchase/purchase_view.xml 2022-07-08 07:47:49 +0000
41@@ -228,12 +228,12 @@
42 </group>
43 <button colspan="4" string="Round Qty to SoQ" type="object" name="round_to_soq" icon="gtk-execute" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
44 </group>
45- <group name="import" string=" Import Lines " colspan="1" col="4" attrs="{'invisible':[('state', '!=', 'draft')]}">
46+ <group name="import" string=" Import Lines " colspan="1" col="4" attrs="{'invisible':[('state', 'not in', ['draft', 'draft_p', 'validated'])]}">
47 <button name="wizard_import_po_line" string="Import lines" icon="gtk-dnd" colspan="1" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
48 <button name="wizard_import_ad" string="Import AD" icon="terp-stock_symbol-selection" colspan="1" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
49 <button name="button_cancel_lines" string="Cancel Lines" icon="gtk-remove" colspan="1" type="object" />
50- <button name="check_lines_to_fix" string="Check Lines" icon="gtk-dialog-warning" colspan="1" type="object" context="{'rfq_ok': False}"/>
51- <button name="add_multiple_lines" string="Add multiple lines" icon="gtk-add" colspan="4" type="object"/>
52+ <button name="check_lines_to_fix" string="Check Lines" icon="gtk-dialog-warning" colspan="1" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}" context="{'rfq_ok': False}"/>
53+ <button name="add_multiple_lines" string="Add multiple lines" icon="gtk-add" colspan="4" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
54 </group>
55 <group colspan="4" col="4" attrs="{'invisible':['&amp;', ('state', 'not in', ['validated', 'validated_p']), '|', ('partner_type', 'not in', ['esc', 'external']), ('state', 'not in', ['confirmed', 'confirmed_p'])]}">
56 <button name="wizard_import_file" string="Import PO confirmation" icon="gtk-execute" colspan="1" type="object" />
57
58=== modified file 'bin/addons/sale/sale_view.xml'
59--- bin/addons/sale/sale_view.xml 2022-05-02 12:00:43 +0000
60+++ bin/addons/sale/sale_view.xml 2022-07-08 07:47:49 +0000
61@@ -213,13 +213,13 @@
62 </group>
63 <button colspan="4" string="Round Qty to SoQ" type="object" name="round_to_soq" icon="gtk-execute" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
64 <newline/>
65- <group name="import" string=" Import Lines " colspan="4" attrs="{'invisible':[('state', '!=', 'draft')]}">
66+ <group name="import" string=" Import Lines " colspan="4" attrs="{'invisible':[('state', 'not in', ['draft', 'draft_p', 'validated'])]}">
67 <button name="wizard_import_fo_line" string="Import lines" icon="gtk-dnd" colspan="1" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
68 <button name="wizard_import_ad" string="Import AD" icon="terp-stock_symbol-selection" colspan="1" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
69 <button name="button_cancel_lines" string="Cancel Lines" icon="gtk-remove" colspan="1" type="object"/>
70- <button name="check_lines_to_fix" string="Check Lines" icon="gtk-dialog-warning" colspan="1" type="object" invisible="0"/>
71+ <button name="check_lines_to_fix" string="Check Lines" icon="gtk-dialog-warning" colspan="1" type="object" invisible="0" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
72 <newline/>
73- <button name="add_multiple_lines" string="Add multiple lines" icon="gtk-add" colspan="4" type="object"/>
74+ <button name="add_multiple_lines" string="Add multiple lines" icon="gtk-add" colspan="4" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
75 </group>
76 <field name="order_line" colspan="4" mode="tree,form,graph" nolabel="1" widget="one2many_list"
77 context="{'sale_id': active_id, 'pricelist_id': pricelist_id, 'categ': categ, 'partner_id': partner_id, 'fo_created_by_po_sync': fo_created_by_po_sync}"

Subscribers

People subscribed via source and target branches