Merge lp:~yann-papouin/openobject-addons/6.1-bug-1222733-address-create-wpartner into lp:openobject-addons/6.1
- 6.1-bug-1222733-address-create-wpartner
- Merge into 6.1
Proposed by
Yann Papouin
Status: | Needs review |
---|---|
Proposed branch: | lp:~yann-papouin/openobject-addons/6.1-bug-1222733-address-create-wpartner |
Merge into: | lp:openobject-addons/6.1 |
Diff against target: |
168 lines (+24/-13) 12 files modified
crm/crm_lead_view.xml (+2/-0) crm/crm_meeting_view.xml (+3/-1) crm/crm_phonecall_view.xml (+3/-1) crm_claim/crm_claim_view.xml (+3/-1) crm_fundraising/crm_fundraising_view.xml (+2/-0) crm_helpdesk/crm_helpdesk_view.xml (+2/-1) hr_recruitment/hr_recruitment_view.xml (+1/-1) project/project_view.xml (+2/-2) project_issue/project_issue_view.xml (+1/-1) purchase/purchase_view.xml (+1/-1) purchase_requisition/wizard/purchase_requisition_partner_view.xml (+1/-1) sale/sale_view.xml (+3/-3) |
To merge this branch: | bzr merge lp:~yann-papouin/openobject-addons/6.1-bug-1222733-address-create-wpartner |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+184542@code.launchpad.net |
Commit message
Description of the change
Basically, always add a context [1] to "partner_
[1] context=
[2] options=
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 'crm/crm_lead_view.xml' | |||
2 | --- crm/crm_lead_view.xml 2012-11-20 11:39:58 +0000 | |||
3 | +++ crm/crm_lead_view.xml 2013-09-09 11:26:37 +0000 | |||
4 | @@ -483,6 +483,8 @@ | |||
5 | 483 | <field name="partner_address_id" | 483 | <field name="partner_address_id" |
6 | 484 | string="Contact" | 484 | string="Contact" |
7 | 485 | on_change="onchange_partner_address_id(partner_address_id, email_from)" | 485 | on_change="onchange_partner_address_id(partner_address_id, email_from)" |
8 | 486 | options='{"quick_create": false}' | ||
9 | 487 | context="{'default_partner_id':partner_id}" | ||
10 | 486 | colspan="1" /> | 488 | colspan="1" /> |
11 | 487 | <group col="3" colspan="2"> | 489 | <group col="3" colspan="2"> |
12 | 488 | <field name="email_from" string="Email" /> | 490 | <field name="email_from" string="Email" /> |
13 | 489 | 491 | ||
14 | === modified file 'crm/crm_meeting_view.xml' | |||
15 | --- crm/crm_meeting_view.xml 2012-01-31 13:36:57 +0000 | |||
16 | +++ crm/crm_meeting_view.xml 2013-09-09 11:26:37 +0000 | |||
17 | @@ -62,7 +62,9 @@ | |||
18 | 62 | on_change="onchange_partner_id(partner_id)" /> | 62 | on_change="onchange_partner_id(partner_id)" /> |
19 | 63 | <field name="partner_address_id" | 63 | <field name="partner_address_id" |
20 | 64 | string="Contact" | 64 | string="Contact" |
22 | 65 | on_change="onchange_partner_address_id(partner_address_id, email_from)" /> | 65 | on_change="onchange_partner_address_id(partner_address_id, email_from)" |
23 | 66 | options='{"quick_create": false}' | ||
24 | 67 | context="{'default_partner_id':partner_id}" /> | ||
25 | 66 | <field name="email_from"/> | 68 | <field name="email_from"/> |
26 | 67 | </group><group col="2" colspan="2"> | 69 | </group><group col="2" colspan="2"> |
27 | 68 | <separator colspan="2" string="Visibility"/> | 70 | <separator colspan="2" string="Visibility"/> |
28 | 69 | 71 | ||
29 | === modified file 'crm/crm_phonecall_view.xml' | |||
30 | --- crm/crm_phonecall_view.xml 2011-12-21 13:10:28 +0000 | |||
31 | +++ crm/crm_phonecall_view.xml 2013-09-09 11:26:37 +0000 | |||
32 | @@ -92,7 +92,9 @@ | |||
33 | 92 | groups="base.group_partner_manager"/> | 92 | groups="base.group_partner_manager"/> |
34 | 93 | <newline/> | 93 | <newline/> |
35 | 94 | <field name="partner_address_id" | 94 | <field name="partner_address_id" |
37 | 95 | on_change="onchange_partner_address_id(partner_address_id)" /> | 95 | on_change="onchange_partner_address_id(partner_address_id)" |
38 | 96 | options='{"quick_create": false}' | ||
39 | 97 | context="{'default_partner_id':partner_id}" /> | ||
40 | 96 | <newline/> | 98 | <newline/> |
41 | 97 | <field name="partner_mobile" /> | 99 | <field name="partner_mobile" /> |
42 | 98 | </group> | 100 | </group> |
43 | 99 | 101 | ||
44 | === modified file 'crm_claim/crm_claim_view.xml' | |||
45 | --- crm_claim/crm_claim_view.xml 2012-01-31 13:36:57 +0000 | |||
46 | +++ crm_claim/crm_claim_view.xml 2013-09-09 11:26:37 +0000 | |||
47 | @@ -91,7 +91,9 @@ | |||
48 | 91 | <field name="partner_id" string="Partner" | 91 | <field name="partner_id" string="Partner" |
49 | 92 | on_change="onchange_partner_id(partner_id)" /> | 92 | on_change="onchange_partner_id(partner_id)" /> |
50 | 93 | <field name="partner_address_id" string="Contact" | 93 | <field name="partner_address_id" string="Contact" |
52 | 94 | on_change="onchange_partner_address_id(partner_address_id, email_from)" /> | 94 | on_change="onchange_partner_address_id(partner_address_id, email_from)" |
53 | 95 | options='{"quick_create": false}' | ||
54 | 96 | context="{'default_partner_id':partner_id}" /> | ||
55 | 95 | <field name="partner_phone"/> | 97 | <field name="partner_phone"/> |
56 | 96 | <field name="email_from" widget="email"/> | 98 | <field name="email_from" widget="email"/> |
57 | 97 | </group> | 99 | </group> |
58 | 98 | 100 | ||
59 | === modified file 'crm_fundraising/crm_fundraising_view.xml' | |||
60 | --- crm_fundraising/crm_fundraising_view.xml 2011-12-19 16:54:40 +0000 | |||
61 | +++ crm_fundraising/crm_fundraising_view.xml 2013-09-09 11:26:37 +0000 | |||
62 | @@ -97,6 +97,8 @@ | |||
63 | 97 | <field name="partner_address_id" | 97 | <field name="partner_address_id" |
64 | 98 | string="Contact" | 98 | string="Contact" |
65 | 99 | on_change="onchange_partner_address_id(partner_address_id, email_from)" | 99 | on_change="onchange_partner_address_id(partner_address_id, email_from)" |
66 | 100 | options='{"quick_create": false}' | ||
67 | 101 | context="{'default_partner_id':partner_id}" | ||
68 | 100 | colspan="1" /> | 102 | colspan="1" /> |
69 | 101 | <field name="email_from" colspan="2"/> | 103 | <field name="email_from" colspan="2"/> |
70 | 102 | </group> | 104 | </group> |
71 | 103 | 105 | ||
72 | === modified file 'crm_helpdesk/crm_helpdesk_view.xml' | |||
73 | --- crm_helpdesk/crm_helpdesk_view.xml 2011-12-19 16:54:40 +0000 | |||
74 | +++ crm_helpdesk/crm_helpdesk_view.xml 2013-09-09 11:26:37 +0000 | |||
75 | @@ -49,7 +49,8 @@ | |||
76 | 49 | select="1" /> | 49 | select="1" /> |
77 | 50 | <field name="partner_address_id" colspan="2" | 50 | <field name="partner_address_id" colspan="2" |
78 | 51 | on_change="onchange_partner_address_id(partner_address_id, email_from)" | 51 | on_change="onchange_partner_address_id(partner_address_id, email_from)" |
80 | 52 | /> | 52 | options='{"quick_create": false}' |
81 | 53 | context="{'default_partner_id':partner_id}" /> | ||
82 | 53 | <newline/> | 54 | <newline/> |
83 | 54 | <field name="email_from" colspan="2"/> | 55 | <field name="email_from" colspan="2"/> |
84 | 55 | <button name="remind_partner" | 56 | <button name="remind_partner" |
85 | 56 | 57 | ||
86 | === modified file 'hr_recruitment/hr_recruitment_view.xml' | |||
87 | --- hr_recruitment/hr_recruitment_view.xml 2011-12-21 13:10:28 +0000 | |||
88 | +++ hr_recruitment/hr_recruitment_view.xml 2013-09-09 11:26:37 +0000 | |||
89 | @@ -104,7 +104,7 @@ | |||
90 | 104 | name="%(action_hr_recruitment_partner_create)d" | 104 | name="%(action_hr_recruitment_partner_create)d" |
91 | 105 | icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/> | 105 | icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/> |
92 | 106 | <newline/> | 106 | <newline/> |
94 | 107 | <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/> | 107 | <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" options='{"quick_create": false}' context="{'default_partner_id':partner_id}" colspan="3"/> |
95 | 108 | <field name="email_from" colspan="3"/> | 108 | <field name="email_from" colspan="3"/> |
96 | 109 | <field name="partner_phone" colspan="3"/> | 109 | <field name="partner_phone" colspan="3"/> |
97 | 110 | <field name="partner_mobile" colspan="3"/> | 110 | <field name="partner_mobile" colspan="3"/> |
98 | 111 | 111 | ||
99 | === modified file 'project/project_view.xml' | |||
100 | --- project/project_view.xml 2012-03-12 10:20:01 +0000 | |||
101 | +++ project/project_view.xml 2013-09-09 11:26:37 +0000 | |||
102 | @@ -68,8 +68,8 @@ | |||
103 | 68 | </field> | 68 | </field> |
104 | 69 | </page> | 69 | </page> |
105 | 70 | <page string="Billing" groups="account.group_account_invoice"> | 70 | <page string="Billing" groups="account.group_account_invoice"> |
108 | 71 | <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/> | 71 | <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer" colspan="4" /> |
109 | 72 | <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address"/> | 72 | <field name="contact_id" string="Contact Address" domain="[('partner_id','=',partner_id)]" options='{"quick_create": false}' context="{'default_partner_id':partner_id}" /> |
110 | 73 | <field name="warn_customer"/> | 73 | <field name="warn_customer"/> |
111 | 74 | <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/> | 74 | <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/> |
112 | 75 | <newline/> | 75 | <newline/> |
113 | 76 | 76 | ||
114 | === modified file 'project_issue/project_issue_view.xml' | |||
115 | --- project_issue/project_issue_view.xml 2012-03-12 11:29:31 +0000 | |||
116 | +++ project_issue/project_issue_view.xml 2013-09-09 11:26:37 +0000 | |||
117 | @@ -68,7 +68,7 @@ | |||
118 | 68 | <group col="2" colspan="2"> | 68 | <group col="2" colspan="2"> |
119 | 69 | <separator colspan="2" string="Contact Information"/> | 69 | <separator colspan="2" string="Contact Information"/> |
120 | 70 | <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/> | 70 | <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/> |
122 | 71 | <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/> | 71 | <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" options='{"quick_create": false}' context="{'default_partner_id':partner_id}" /> |
123 | 72 | <field name="email_from"/> | 72 | <field name="email_from"/> |
124 | 73 | </group> | 73 | </group> |
125 | 74 | <group col="3" colspan="2"> | 74 | <group col="3" colspan="2"> |
126 | 75 | 75 | ||
127 | === modified file 'purchase/purchase_view.xml' | |||
128 | --- purchase/purchase_view.xml 2012-10-23 07:56:26 +0000 | |||
129 | +++ purchase/purchase_view.xml 2013-09-09 11:26:37 +0000 | |||
130 | @@ -173,7 +173,7 @@ | |||
131 | 173 | <notebook colspan="4"> | 173 | <notebook colspan="4"> |
132 | 174 | <page string="Purchase Order"> | 174 | <page string="Purchase Order"> |
133 | 175 | <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier', '=', True)]" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" options='{"quick_create": false}'/> | 175 | <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier', '=', True)]" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" options='{"quick_create": false}'/> |
135 | 176 | <field name="partner_address_id" options='{"quick_create": false}'/> | 176 | <field name="partner_address_id" options='{"quick_create": false}' context="{'default_partner_id':partner_id}"/> |
136 | 177 | <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/> | 177 | <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/> |
137 | 178 | <field name="origin" groups="base.group_extended"/> | 178 | <field name="origin" groups="base.group_extended"/> |
138 | 179 | <newline/> | 179 | <newline/> |
139 | 180 | 180 | ||
140 | === modified file 'purchase_requisition/wizard/purchase_requisition_partner_view.xml' | |||
141 | --- purchase_requisition/wizard/purchase_requisition_partner_view.xml 2011-01-14 00:11:01 +0000 | |||
142 | +++ purchase_requisition/wizard/purchase_requisition_partner_view.xml 2013-09-09 11:26:37 +0000 | |||
143 | @@ -9,7 +9,7 @@ | |||
144 | 9 | <form string="Purchase Requisition"> | 9 | <form string="Purchase Requisition"> |
145 | 10 | <group colspan="2" col="2"> | 10 | <group colspan="2" col="2"> |
146 | 11 | <field name="partner_id" on_change="onchange_partner_id(partner_id)"/> | 11 | <field name="partner_id" on_change="onchange_partner_id(partner_id)"/> |
148 | 12 | <field domain="[('partner_id','=',partner_id)]" name="partner_address_id"/> | 12 | <field name="partner_address_id" domain="[('partner_id','=',partner_id)]" options='{"quick_create": false}' context="{'default_partner_id':partner_id}" /> |
149 | 13 | <separator string="" colspan="4" /> | 13 | <separator string="" colspan="4" /> |
150 | 14 | <button icon="gtk-cancel" special="cancel" string="_Cancel"/> | 14 | <button icon="gtk-cancel" special="cancel" string="_Cancel"/> |
151 | 15 | <button icon="gtk-ok" name="create_order" string="Create Quotation" type="object"/> | 15 | <button icon="gtk-ok" name="create_order" string="Create Quotation" type="object"/> |
152 | 16 | 16 | ||
153 | === modified file 'sale/sale_view.xml' | |||
154 | --- sale/sale_view.xml 2013-01-02 11:50:01 +0000 | |||
155 | +++ sale/sale_view.xml 2013-09-09 11:26:37 +0000 | |||
156 | @@ -116,9 +116,9 @@ | |||
157 | 116 | <notebook colspan="5"> | 116 | <notebook colspan="5"> |
158 | 117 | <page string="Sales Order"> | 117 | <page string="Sales Order"> |
159 | 118 | <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/> | 118 | <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/> |
163 | 119 | <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'/> | 119 | <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}' context="{'default_partner_id':partner_id}"/> |
164 | 120 | <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}'/> | 120 | <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}' context="{'default_partner_id':partner_id}"/> |
165 | 121 | <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended" options='{"quick_create": false}'/> | 121 | <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended" options='{"quick_create": false}' context="{'default_partner_id':partner_id}"/> |
166 | 122 | <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended" on_change="onchange_pricelist_id(pricelist_id,order_line)"/> | 122 | <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended" on_change="onchange_pricelist_id(pricelist_id,order_line)"/> |
167 | 123 | <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('type','<>','view'), ('company_id', '=', company_id), ('parent_id', '!=', False)]"/> | 123 | <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('type','<>','view'), ('company_id', '=', company_id), ('parent_id', '!=', False)]"/> |
168 | 124 | <newline/> | 124 | <newline/> |