Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-commiter/openobject-addons/chricar_trunk_stock_SoPo_account_project_mrp_crm into lp:openobject-addons

  1. chricar_trunk_stock_SoPo_account_project_mrp_crm
  2. Merge into trunk
Proposed by Ferdinand
Status: Rejected
Rejected by: qdp (OpenERP)
Proposed branch: lp:~openerp-commiter/openobject-addons/chricar_trunk_stock_SoPo_account_project_mrp_crm
Merge into: lp:openobject-addons
Diff against target: 1053 lines (+338/-190)
17 files modified
account/account_invoice_view.xml (+56/-58)
account/account_view.xml (+9/-10)
account/project/project_view.xml (+4/-4)
account_tax_include/account_tax_include_view.xml (+1/-1)
mrp/mrp_view.xml (+8/-10)
procurement/procurement_view.xml (+3/-2)
project/project.py (+2/-2)
project/project_view.xml (+28/-31)
purchase/partner.py (+13/-5)
purchase/partner_view.xml (+14/-0)
purchase/purchase.py (+5/-3)
purchase/purchase_view.xml (+15/-12)
sale/sale.py (+96/-4)
sale/sale_view.xml (+21/-14)
sale/stock_view.xml (+16/-4)
sale_order_dates/sale_order_dates_view.xml (+11/-1)
stock/stock_view.xml (+36/-29)
To merge this branch: bzr merge lp:~openerp-commiter/openobject-addons/chricar_trunk_stock_SoPo_account_project_mrp_crm
Reviewer Review Type Date Requested Status
qdp (OpenERP) Disapprove
Review via email: mp+34726@code.launchpad.net

Description of the change

unified layout according to proposed specs (accounting experts) for crm related forms

please merge after
https://code.launchpad.net/~openerp-commiter/openobject-addons/chricar_trunk_stock_SoPo_account_project_mrp

To post a comment you must log in.
Revision history for this message
qdp (OpenERP) (qdp) wrote :

Hello Ferdinand,

i think that something went wrong with your branches, all your branches related to SOPO seems to share the same diff.

Besides, there are not onyl changes related to xml changes (but also in .py files).

And i must admit that even if the 2 above points would be fixed i'm not sure we would accept this branch. You certainly have noticed that we improved a lot the usability in v6 and, due to our slowness, your suggestion are probably deprecated now.

But thank you a lot for your interest and contribution,
Quentin

review: Disapprove

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_invoice_view.xml'
2--- account/account_invoice_view.xml 2010-09-01 03:33:18 +0000
3+++ account/account_invoice_view.xml 2010-09-07 06:36:14 +0000
4@@ -147,31 +147,36 @@
5 <field name="priority">2</field>
6 <field name="arch" type="xml">
7 <form string="Supplier invoice">
8- <group col="8" colspan="4">
9- <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
10+
11+ <group col="6" colspan="4">
12 <field name="number" readonly="1"/>
13- <field name="type" invisible="1"/>
14- <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
15- <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
16- <newline/>
17- <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
18- <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
19- <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
20- <newline/>
21 <field name="date_invoice"/>
22+ <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
23+ <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}" colspan="4"/>
24+<field name="reference_type" nolabel="1" size="0"/>
25+ <field name="reference" nolabel="1"/>
26+ <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" colspan="4"/>
27+ <newline/>
28+ <field name="type" />
29 <field name="period_id" groups="account.group_account_user"/>
30- <group colspan="2" col="1" groups="account.group_account_user">
31- <label align="0.0" string="(keep empty to use the current period)"/>
32- </group>
33- </group>
34+ <group col="4" colspan="2">
35+ <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" widget="selection"/>
36+ <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
37+ </group>
38+ </group>
39+
40 <notebook colspan="4">
41 <page string="Invoice">
42- <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user"/>
43- <field name="reference_type" nolabel="1" size="0"/>
44- <field name="reference" nolabel="1"/>
45- <field name="date_due"/>
46- <field name="check_total" required="2"/>
47- <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
48+ <group col="6" colspan="4">
49+ <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
50+ <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
51+ <field name="payment_term" widget="selection"/>
52+ <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user" colspan="4"/>
53+ <field name="date_due"/>
54+ <field name="name" colspan="4"/>
55+ <field name="reconciled"/>
56+ </group>
57+ <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
58 <tree string="Invoice lines">
59 <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
60 <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
61@@ -202,7 +207,7 @@
62 <field name="amount_untaxed"/>
63 <label string="" colspan="2"/>
64 <field name="amount_tax"/>
65- <field name="reconciled"/>
66+ <field name="check_total" required="2" string="Vendor Total"/>
67 <field name="amount_total"/>
68 <field name="state"/>
69 <field name="residual"/>
70@@ -216,16 +221,11 @@
71 </group>
72 </page>
73 <page string="Other Info">
74- <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
75-
76- <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
77- <newline/>
78- <field name="payment_term" widget="selection"/>
79- <field name="name"/>
80- <newline/>
81+ <field domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended" colspan="4"/>
82+ <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)" colspan="4"/>
83+ <field name="user_id"/>
84 <field name="origin" groups="base.group_extended"/>
85- <field domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
86- <field name="user_id"/>
87+
88 <field name="move_id" groups="account.group_account_user"/>
89 <separator colspan="4" string="Additional Information"/>
90 <field colspan="4" name="comment" nolabel="1"/>
91@@ -255,29 +255,33 @@
92 <field name="type">form</field>
93 <field name="arch" type="xml">
94 <form string="Invoice">
95- <group colspan="4" col="8">
96- <field name="journal_id" groups="base.group_user"/>
97- <field name="number"/>
98- <field name="type" invisible="1"/>
99- <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
100- <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
101- <newline/>
102- <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
103- <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
104- <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
105- <newline/>
106- <field name="date_invoice"/>
107- <field name="period_id" groups="account.group_account_user"/>
108- <group colspan="2" col="1" groups="account.group_account_user">
109- <label align="0.0" string="(keep empty to use the current period)"/>
110- </group>
111+ <group colspan="4" col="6">
112+ <field name="number"/>
113+ <field name="date_invoice"/>
114+ <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
115+ <newline/>
116+ <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" colspan="4"/>
117+ <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" colspan="4"/>
118+ <newline/>
119+ <field name="type" />
120+ <field name="period_id" groups="account.group_account_user"/>
121+ <group colspan="2" col="4">
122+ <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50" widget="selection"/>
123+ <button name="549" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
124+ </group>
125 </group>
126 <notebook colspan="4">
127 <page string="Invoice">
128- <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user"/>
129- <field name="name"/>
130+ <group col="6" colspan="4">
131+ <field name="journal_id" groups="base.group_user"/>
132+ <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
133 <field name="payment_term" widget="selection"/>
134- <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
135+ <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user" colspan="4"/>
136+ <field name="date_due"/>
137+ <field name="name" colspan="4"/>
138+ <field name="reconciled"/>
139+ </group>
140+ <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
141 <group col="1" colspan="2">
142 <field name="tax_line" nolabel="1">
143 <tree editable="bottom" string="Taxes">
144@@ -294,7 +298,7 @@
145 <field name="amount_untaxed"/>
146 <label string="" colspan="2"/>
147 <field name="amount_tax"/>
148- <field name="reconciled"/>
149+ <label align="0.0" string="" colspan="2"/>
150 <field name="amount_total"/>
151 <field name="state"/>
152 <field name="residual"/>
153@@ -310,16 +314,10 @@
154 </group>
155 </page>
156 <page string="Other Info">
157- <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
158- <newline/>
159- <field name="date_due"/>
160+ <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
161+ <field colspan="4" domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id" groups="base.group_extended"/>
162 <field name="user_id"/>
163- <newline/>
164- <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"
165- groups="base.group_extended"/>
166 <field name="origin"/>
167- <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"
168- groups="base.group_extended"/>
169 <field name="move_id" groups="account.group_account_user"/>
170 <separator colspan="4" string="Additional Information"/>
171 <field colspan="4" name="comment" nolabel="1"/>
172
173=== modified file 'account/account_view.xml'
174--- account/account_view.xml 2010-09-03 07:24:13 +0000
175+++ account/account_view.xml 2010-09-07 06:36:14 +0000
176@@ -121,7 +121,7 @@
177 </tree>
178 </field>
179 </record>
180-
181+
182 <record id="view_account_period_search" model="ir.ui.view">
183 <field name="name">account.period.search</field>
184 <field name="model">account.period</field>
185@@ -137,7 +137,7 @@
186 </search>
187 </field>
188 </record>
189-
190+
191 <record id="action_account_period_form" model="ir.actions.act_window">
192 <field name="name">Periods</field>
193 <field name="res_model">account.period</field>
194@@ -157,14 +157,13 @@
195 <field name="type">form</field>
196 <field name="arch" type="xml">
197 <form string="Account">
198- <group col="6" colspan="4">
199- <field name="name" select="1"/>
200- <field name="code" select="1"/>
201- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
202- <newline/>
203- <field name="parent_id"/>
204- <field name="type" select="1"/>
205- <field name="user_type" select="1"/>
206+ <group col="6" colspan="6">
207+ <field name="code" select="1"/>
208+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
209+ <field name="name" select="1" colspan="6"/>
210+ <field name="parent_id" colspan="6"/>
211+ <field name="type" select="1"/>
212+ <field name="user_type" select="1"/>
213 </group>
214 <notebook colspan="4">
215 <page string="General Information">
216
217=== modified file 'account/project/project_view.xml'
218--- account/project/project_view.xml 2010-09-01 15:09:45 +0000
219+++ account/project/project_view.xml 2010-09-07 06:36:14 +0000
220@@ -71,16 +71,16 @@
221 <field name="arch" type="xml">
222 <form string="Analytic account">
223 <group colspan="4" col="6">
224- <field name="name" select="1" colspan="4"/>
225 <field name="code" select="1"/>
226- <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
227 <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
228+ <field name="name" select="1" colspan="6"/>
229+ <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended" colspan="6"/>
230 <field name="type" select="2"/>
231- <field name="company_currency_id" select="2"/>
232+ <field name="company_currency_id" select="2" widget="selection" />
233 </group>
234 <notebook colspan="4">
235 <page string="Account Data">
236- <field name="partner_id" select="1"/>
237+ <field name="partner_id" select="1" colspan="4"/>
238 <newline/>
239 <field name="date_start"/>
240 <field name="date" select="2"/>
241
242=== modified file 'account_tax_include/account_tax_include_view.xml'
243--- account_tax_include/account_tax_include_view.xml 2010-08-12 20:45:13 +0000
244+++ account_tax_include/account_tax_include_view.xml 2010-09-07 06:36:14 +0000
245@@ -21,7 +21,7 @@
246 <field name="model">account.invoice</field>
247 <field name="inherit_id" ref="account.invoice_form"/>
248 <field name="arch" type="xml">
249- <field name="payment_term" position="after">
250+ <field name="invoice_line" position="before">
251 <field name="price_type"/>
252 </field>
253 </field>
254
255=== modified file 'mrp/mrp_view.xml'
256--- mrp/mrp_view.xml 2010-09-03 11:44:46 +0000
257+++ mrp/mrp_view.xml 2010-09-07 06:36:14 +0000
258@@ -297,6 +297,7 @@
259 <field name="type">form</field>
260 <field name="arch" type="xml">
261 <form string="Bill of Material">
262+
263 <group colspan="4" col="6">
264 <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
265 <field name="name" select="1"/>
266@@ -562,27 +563,24 @@
267 <group colspan="4" col="6">
268 <field name="name" string="Reference"/>
269 <field name="date_planned"/>
270+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
271+
272+ <field name="product_id" on_change="product_id_change(product_id)" colspan="4"/>
273 <field name="origin"/>
274- <field name="product_id" on_change="product_id_change(product_id)"/>
275 <field name="product_qty"/>
276- <group colspan="2" col="3">
277 <field name="product_uom"/>
278 <button type="action"
279 name="%(mrp.action_change_production_qty)d"
280 string="Change Qty" states="ready,confirmed" />
281- </group>
282- <label string="" colspan="2"/>
283+ <newline/>
284 <field name="product_uos_qty" groups="product.group_uos"/>
285- <group colspan="2" col="3" groups="product.group_uos">
286- <field name="product_uos"/>
287- <label string=""/>
288- </group>
289+ <field name="product_uos"/>
290 </group>
291
292 <notebook colspan="4">
293 <page string="Consumed Products">
294- <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)" />
295- <field name="routing_id" groups="base.group_extended" select="1"/>
296+ <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)" colspan="4"/>
297+ <field name="routing_id" groups="base.group_extended" select="1" colspan="4"/>
298 <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
299 <field name="location_dest_id" domain="[('usage','=','internal')]"/>
300 <separator string="" colspan="4"/>
301
302=== modified file 'procurement/procurement_view.xml'
303--- procurement/procurement_view.xml 2010-08-18 06:30:58 +0000
304+++ procurement/procurement_view.xml 2010-09-07 06:36:14 +0000
305@@ -45,8 +45,9 @@
306 <notebook colspan="4">
307 <page string="Procurement Details">
308 <separator colspan="4" string="Product &amp; Location"/>
309- <field name="product_id" on_change="onchange_product_id(product_id)"/>
310- <field name="location_id" domain="[('usage','=','internal')]"/>
311+ <field name="product_id" on_change="onchange_product_id(product_id)" colspan="4"/>
312+ <field name="location_id" domain="[('usage','=','internal')]"/>
313+ <newline/>
314 <field name="product_qty"/>
315 <field name="product_uom" widget="selection"/>
316
317
318=== modified file 'project/project.py'
319--- project/project.py 2010-08-27 12:05:25 +0000
320+++ project/project.py 2010-09-07 06:36:14 +0000
321@@ -416,8 +416,8 @@
322 help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
323 \n If the task is over, the states is set to \'Done\'.'),
324 'create_date': fields.datetime('Create Date', readonly=True),
325- 'date_start': fields.datetime('Starting Date'),
326- 'date_end': fields.datetime('Ending Date'),
327+ 'date_start': fields.datetime('Date Start'),
328+ 'date_end': fields.datetime('Date End'),
329 'date_deadline': fields.date('Deadline'),
330 'project_id': fields.many2one('project.project', 'Project', ondelete='cascade',
331 help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
332
333=== modified file 'project/project_view.xml'
334--- project/project_view.xml 2010-08-27 11:36:48 +0000
335+++ project/project_view.xml 2010-09-07 06:36:14 +0000
336@@ -17,13 +17,18 @@
337 <field name="type">form</field>
338 <field name="arch" type="xml">
339 <form string="Project">
340- <group colspan="6" col="6">
341- <field name="name" string="Project Name" select="1"/>
342- <field name="parent_id" string="Parent Project"/>
343- <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
344+ <group colspan="4" col="6">
345+ <field name="name" string="Project Name" select="1" colspan="4"/>
346+ <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
347+ <field name="parent_id" string="Parent Project" colspan="4"/>
348+ <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" colspan="2"/>
349 <field name="date_start" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
350 <field name="date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
351- <field name="progress_rate" widget="progressbar"/>
352+ <field name="progress_rate" widget="progressbar" />
353+ <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" />
354+ <field name="warn_customer"/>
355+ <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address" colspan="4"/>
356+ <field name="warn_manager"/>
357 </group>
358 <notebook colspan="4">
359 <page string="Administration">
360@@ -39,8 +44,8 @@
361 </group>
362 <group col="2" colspan="2" name="misc">
363 <separator colspan="2" string="Miscelleanous"/>
364- <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
365- <field name="warn_manager"/>
366+
367+
368 </group>
369 <newline/>
370 <group col="9" colspan="8">
371@@ -61,10 +66,6 @@
372 <field colspan="4" name="members" nolabel="1"/>
373 </page>
374 <page groups="base.group_extended" string="Partner Info">
375- <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
376- <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address"/>
377- <field name="warn_customer"/>
378- <newline/>
379 <separator colspan="2" string="Mail Header"/>
380 <separator colspan="2" string="Mail Footer"/>
381 <field name="warn_header" nolabel="1" colspan="2"/>
382@@ -197,31 +198,31 @@
383 <field eval="2" name="priority"/>
384 <field name="arch" type="xml">
385 <form string="Task edition">
386- <group colspan="6" col="6">
387- <field name="name" select="1"/>
388- <field name="project_id" required="1" select="1" domain="[('user_id','=',uid)]"/>
389- <field name="total_hours" widget="float_time"/>
390- <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
391+ <group colspan="4" col="6">
392+ <field name="project_id" required="1" select="1" domain="[('user_id','=',uid)]" colspan="4"/>
393+ <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
394+ <field name="name" select="1" colspan="4"/>
395 <field name="user_id" select="1" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
396+ <field name="date_start" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
397+ <field name="date_end" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
398 <field name="progress" widget="progressbar"/>
399+ <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
400+ <field name="total_hours" widget="float_time"/>
401 </group>
402 <notebook colspan="4">
403 <page string="Information">
404- <group col="2" colspan="2">
405- <field
406- name="planned_hours"
407- widget="float_time"
408- attrs="{'readonly':[('state','!=','draft')]}"
409- on_change="onchange_planned(planned_hours, effective_hours)"/>
410- <field name="effective_hours" widget="float_time"/>
411- </group>
412- <group col="3" colspan="2">
413+ <group colspan="4" col="6">
414+ <field name="partner_id" colspan="6" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
415+ <field name="planned_hours"
416+ widget="float_time"
417+ attrs="{'readonly':[('state','!=','draft')]}"
418+ on_change="onchange_planned(planned_hours, effective_hours)"/>
419 <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
420 <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
421-
422+ <newline/>
423+ <field name="effective_hours" widget="float_time"/>
424 <field name="delay_hours" widget="float_time"/>
425 </group>
426-
427 <field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
428 <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}">
429 <tree string="Task Work" editable="top">
430@@ -268,13 +269,9 @@
431 </group>
432 <group colspan="2" col="2">
433 <separator string="Dates" colspan="2"/>
434- <field name="date_start"/>
435- <field name="date_end"/>
436 <field name="create_date"/>
437 </group>
438 <separator string="Miscelleanous" colspan="4"/>
439- <field name="partner_id"/>
440- <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
441 <group col="4" colspan="2">
442 <field name="type_id" widget="selection" readonly="1"/>
443 <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
444
445=== modified file 'purchase/partner.py'
446--- purchase/partner.py 2010-06-29 09:13:12 +0000
447+++ purchase/partner.py 2010-09-07 06:36:14 +0000
448@@ -1,6 +1,6 @@
449 # -*- coding: utf-8 -*-
450 ##############################################################################
451-#
452+#
453 # OpenERP, Open Source Management Solution
454 # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
455 #
456@@ -15,7 +15,7 @@
457 # GNU Affero General Public License for more details.
458 #
459 # You should have received a copy of the GNU Affero General Public License
460-# along with this program. If not, see <http://www.gnu.org/licenses/>.
461+# along with this program. If not, see <http://www.gnu.org/licenses/>.
462 #
463 ##############################################################################
464
465@@ -27,13 +27,21 @@
466 _columns = {
467 'property_product_pricelist_purchase': fields.property(
468 'product.pricelist',
469- type='many2one',
470- relation='product.pricelist',
471+ type='many2one',
472+ relation='product.pricelist',
473 domain=[('type','=','purchase')],
474- string="Purchase Pricelist",
475+ string="Purchase Pricelist",
476 method=True,
477 view_load=True,
478 help="This pricelist will be used, instead of the default one, for purchases from the current partner"),
479+ 'property_purchase_payment_term': fields.property(
480+ 'account.payment.term',
481+ type='many2one',
482+ relation='account.payment.term',
483+ string ='Purchase Payment Term',
484+ method=True,
485+ view_load=True,
486+ help="This purchase payment term will be used instead of the default one for the current partner"),
487 }
488 res_partner()
489
490
491=== modified file 'purchase/partner_view.xml'
492--- purchase/partner_view.xml 2010-06-12 16:50:46 +0000
493+++ purchase/partner_view.xml 2010-09-07 06:36:14 +0000
494@@ -17,5 +17,19 @@
495 </field>
496 </record>
497
498+ <record id="view_partner_term_property_form" model="ir.ui.view">
499+ <field name="name">res.partner.account.term.property.form.inherit</field>
500+ <field name="model">res.partner</field>
501+ <field name="type">form</field>
502+ <field name="inherit_id" ref="account.view_partner_property_form"/>
503+ <field name="priority">36</field>
504+ <field name="arch" type="xml">
505+ <field name="property_account_payable" position="after">
506+ <field name="property_purchase_payment_term"/>
507+ </field>
508+ </field>
509+ </record>
510+
511+
512 </data>
513 </openerp>
514
515=== modified file 'purchase/purchase.py'
516--- purchase/purchase.py 2010-09-03 09:38:12 +0000
517+++ purchase/purchase.py 2010-09-07 06:36:14 +0000
518@@ -208,6 +208,7 @@
519 'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
520 'create_uid': fields.many2one('res.users', 'Responsible'),
521 'company_id': fields.many2one('res.company','Company',required=True,select=1),
522+ 'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
523 }
524 _defaults = {
525 'date_order': time.strftime('%Y-%m-%d'),
526@@ -260,12 +261,13 @@
527 def onchange_partner_id(self, cr, uid, ids, part):
528
529 if not part:
530- return {'value':{'partner_address_id': False, 'fiscal_position': False}}
531+ return {'value':{'partner_address_id': False, 'payment_term': False,'fiscal_position': False}}
532 addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default'])
533 part = self.pool.get('res.partner').browse(cr, uid, part)
534 pricelist = part.property_product_pricelist_purchase.id
535 fiscal_position = part.property_account_position and part.property_account_position.id or False
536- return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
537+ payment_term = part.property_purchase_payment_term and part.property_purchase_payment_term.id or False
538+ return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist, 'payment_term': payment_term, 'fiscal_position': fiscal_position}}
539
540 def wkf_approve_order(self, cr, uid, ids, context={}):
541 self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')})
542@@ -378,7 +380,7 @@
543 'origin': o.name,
544 'invoice_line': il,
545 'fiscal_position': o.partner_id.property_account_position.id,
546- 'payment_term': o.partner_id.property_payment_term and o.partner_id.property_payment_term.id or False,
547+ 'payment_term': o.payment_term.id,
548 'company_id': o.company_id.id,
549 }
550 inv_id = self.pool.get('account.invoice').create(cr, uid, inv, {'type':'in_invoice'})
551
552=== modified file 'purchase/purchase_view.xml'
553--- purchase/purchase_view.xml 2010-08-25 15:03:33 +0000
554+++ purchase/purchase_view.xml 2010-09-07 06:36:14 +0000
555@@ -87,24 +87,28 @@
556 <field name="model">purchase.order</field>
557 <field name="type">form</field>
558 <field name="arch" type="xml">
559- <form string="Purchase Order">
560+ <form string="Purchase Order">
561 <group col="6" colspan="4">
562 <field name="name"/>
563 <field name="date_order"/>
564- <field name="invoiced"/>
565- <newline/>
566- <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
567+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
568+ <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier','=', 1)]" colspan="4"/>
569 <field name="partner_ref"/>
570- <field name="shipped"/>
571- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
572+ <field name="partner_address_id" colspan="4"/>
573 </group>
574 <notebook colspan="4">
575 <page string="Purchase Order">
576- <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier','=', 1)]"/>
577- <field name="partner_address_id"/>
578+ <group col="6" colspan="4">
579+ <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)" colspan="4"/>
580+ <field name="shipped"/>
581+ <newline/>
582+ <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
583+ <field name="minimum_planned_date"/>
584+ <field name="invoiced"/>
585+ <newline/>
586 <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
587- <field name="origin" groups="base.group_extended"/>
588- <newline/>
589+ <field name="payment_term" widget="selection"/>
590+ </group>
591 <field colspan="4" name="order_line" nolabel="1" mode="tree,form">
592 <tree colors="red:date_planned&lt;=current_date;black:date_planned&gt;current_date" string="Purchase Order Lines">
593 <field name="date_planned"/>
594@@ -138,9 +142,8 @@
595 <page string="Delivery &amp; Invoices" groups="base.group_extended">
596 <group colspan="2" col="2">
597 <separator string="Delivery" colspan="2"/>
598- <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
599- <field name="minimum_planned_date"/>
600 <field name="location_id"/>
601+ <field name="origin" groups="base.group_extended"/>
602 </group>
603 <group colspan="2" col="2">
604 <separator string="Invoice Control" colspan="2"/>
605
606=== modified file 'sale/sale.py'
607--- sale/sale.py 2010-09-03 04:58:47 +0000
608+++ sale/sale.py 2010-09-07 06:36:14 +0000
609@@ -165,6 +165,7 @@
610 res[sale.id] = False
611 return res
612
613+
614 def _invoiced_search(self, cursor, user, obj, name, args, context=None):
615 if context is None:
616 context = {}
617@@ -175,6 +176,92 @@
618 for arg in args:
619 if arg[1] == '=':
620 if arg[2]:
621+ clause += 'AND inv.state = \'open\''
622+ else:
623+ clause += 'AND inv.state <> \'open\''
624+ no_invoiced = True
625+ cursor.execute('SELECT rel.order_id ' \
626+ 'FROM sale_order_invoice_rel AS rel, account_invoice AS inv ' \
627+ 'WHERE rel.invoice_id = inv.id ' + clause)
628+ res = cursor.fetchall()
629+ if no_invoiced:
630+ cursor.execute('SELECT sale.id ' \
631+ 'FROM sale_order AS sale ' \
632+ 'WHERE sale.id NOT IN ' \
633+ '(SELECT rel.order_id ' \
634+ 'FROM sale_order_invoice_rel AS rel)')
635+ res.extend(cursor.fetchall())
636+ if not res:
637+ return [('id', '=', 0)]
638+ return [('id', 'in', [x[0] for x in res])]
639+
640+ def _paid(self, cursor, user, ids, name, arg, context=None):
641+ if context is None:
642+ context = {}
643+ res = {}
644+ for sale in self.browse(cursor, user, ids, context=context):
645+ res[sale.id] = True
646+ for invoice in sale.invoice_ids:
647+ if invoice.reconciled != True:
648+ res[sale.id] = False
649+ break
650+ if not sale.invoice_ids:
651+ res[sale.id] = False
652+ return res
653+
654+ def _paid_search(self, cursor, user, obj, name, args, context=None):
655+ if context is None:
656+ context = {}
657+ if not len(args):
658+ return []
659+ clause = ''
660+ no_invoiced = False
661+ for arg in args:
662+ if arg[1] == '=':
663+ if arg[2]:
664+ clause += 'AND inv.state = \'open\''
665+ else:
666+ clause += 'AND inv.state <> \'open\''
667+ no_invoiced = True
668+ cursor.execute('SELECT rel.order_id ' \
669+ 'FROM sale_order_invoice_rel AS rel, account_invoice AS inv ' \
670+ 'WHERE rel.invoice_id = inv.id ' + clause)
671+ res = cursor.fetchall()
672+ if no_invoiced:
673+ cursor.execute('SELECT sale.id ' \
674+ 'FROM sale_order AS sale ' \
675+ 'WHERE sale.id NOT IN ' \
676+ '(SELECT rel.order_id ' \
677+ 'FROM sale_order_invoice_rel AS rel)')
678+ res.extend(cursor.fetchall())
679+ if not res:
680+ return [('id', '=', 0)]
681+ return [('id', 'in', [x[0] for x in res])]
682+
683+ def _paid(self, cursor, user, ids, name, arg, context=None):
684+ if context is None:
685+ context = {}
686+ res = {}
687+ for sale in self.browse(cursor, user, ids, context=context):
688+ res[sale.id] = True
689+ for invoice in sale.invoice_ids:
690+ if invoice.reconciled != True:
691+ res[sale.id] = False
692+ break
693+ if not sale.invoice_ids:
694+ res[sale.id] = False
695+ return res
696+
697+ def _paid_search(self, cursor, user, obj, name, args, context=None):
698+ if context is None:
699+ context = {}
700+ if not len(args):
701+ return []
702+ clause = ''
703+ no_invoiced = False
704+ for arg in args:
705+ if arg[1] == '=':
706+ if arg[2]:
707 clause += 'AND inv.state = \'paid\''
708 else:
709 clause += 'AND inv.state <> \'paid\''
710@@ -250,8 +337,10 @@
711 'shipped': fields.boolean('Picked', readonly=True, help="It indicates that a picking has been done. It will be set to True if the ordered quantities are available and the picking is done. If the ordered quantities are not available it generates a Purchase/Manufacturing order. Unless its Picking and Purchase/Manufacturing order are not in the done state it wont be set to True"),
712 'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
713 'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
714- 'invoiced': fields.function(_invoiced, method=True, string='Paid',
715- fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid"),
716+ 'invoiced': fields.function(_invoiced, method=True, string='Invoiced',
717+ fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been invoiced"),
718+ 'paid': fields.function(_invoiced, method=True, string='Paid',
719+ fnct_search=_paid_search, type='boolean', help="It indicates that an invoice has been paid"),
720 'note': fields.text('Notes'),
721
722 'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
723@@ -276,7 +365,7 @@
724 'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True),
725 'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
726 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
727- 'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
728+ 'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
729 }
730 _defaults = {
731 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.order', context=c),
732@@ -290,6 +379,8 @@
733 'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
734 'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'],
735 'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
736+
737+
738 }
739 _order = 'name desc'
740
741@@ -800,7 +891,7 @@
742 'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
743 'name': fields.char('Description', size=256, required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
744 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sale order lines."),
745- 'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer", readonly=True, states={'draft':[('readonly',False)]}),
746+ 'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation and the shipping of the products to the customer", readonly=True, states={'draft':[('readonly',False)]}),
747 'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
748 'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
749 'invoiced': fields.boolean('Invoiced', readonly=True),
750@@ -830,6 +921,7 @@
751 'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
752 'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'),
753 'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
754+
755 }
756 _order = 'sequence, id'
757 _defaults = {
758
759=== modified file 'sale/sale_view.xml'
760--- sale/sale_view.xml 2010-09-03 06:17:18 +0000
761+++ sale/sale_view.xml 2010-09-07 06:36:14 +0000
762@@ -102,21 +102,27 @@
763 <group col="6" colspan="4">
764 <field name="name"/>
765 <field name="date_order"/>
766- <field name="shipped"/>
767+ <field name="company_id" groups="base.group_multi_company" readonly="1"/>
768+ <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1" colspan="4"/>
769 <field name="client_order_ref"/>
770- <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection"/>
771- <field name="invoiced"/>
772+ <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" colspan="4"/>
773+ <newline/>
774 </group>
775 <notebook colspan="5">
776 <page string="Sale Order">
777- <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1"/>
778- <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
779- <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended"/>
780- <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended"/>
781+ <group col="6" colspan="4">
782+ <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" colspan="4"/>
783+ <field name="shipped"/>
784+ <!-- FIXME here we should see the contact - base_contact issue? -->
785+ <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" colspan="4"/>
786+ <field name="invoiced"/>
787+ <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection"/>
788+ <label align="0.0" string="(Expected date)" colspan="2"/>
789+ <field name="paid"/>
790 <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
791- <field name="project_id"
792- context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
793- groups="base.group_extended" domain="[('parent_id','!=',False)]" />
794+ <field name="payment_term" widget="selection"/>
795+ <label align="0.0" string="backorder" colspan="2"/>
796+ </group>
797 <newline/>
798 <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
799 <form string="Sale Order Lines">
800@@ -143,11 +149,11 @@
801 domain="[('product_id','=',product_id)]"
802 groups="base.group_extended"/>
803
804- <field name="company_id" groups="base.group_multi_company" readonly="1"/>
805+
806 <field colspan="4" name="name"/>
807 <field name="price_unit"/>
808 <field name="discount"/>
809- <field name="type" groups="base.group_extended"/>
810+ <field name="type" groups="base.group_extended"/>
811 <field name="delay" groups="base.group_extended"/>
812 <newline/>
813 <separator colspan="5" string="Taxes"/>
814@@ -228,9 +234,10 @@
815 </group>
816 <group colspan="2" col="2" groups="base.group_extended">
817 <separator string="Conditions" colspan="2"/>
818- <field name="payment_term" widget="selection"/>
819+ <field name="project_id"
820+ context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
821+ groups="base.group_extended" domain="[('parent_id','!=',False)]" />
822 <field name="fiscal_position" widget="selection"/>
823- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
824 </group>
825 <group colspan="2" col="2" groups="base.group_extended">
826 <separator string="Dates" colspan="2"/>
827
828=== modified file 'sale/stock_view.xml'
829--- sale/stock_view.xml 2010-08-25 19:07:01 +0000
830+++ sale/stock_view.xml 2010-09-07 06:36:14 +0000
831@@ -7,25 +7,37 @@
832 <field name="type">form</field>
833 <field name="inherit_id" ref="stock.view_picking_form"/>
834 <field name="arch" type="xml">
835- <field name="active" position="after">
836+ <field name="backorder_id" position="after">
837 <field name="sale_id"/>
838 </field>
839 </field>
840 </record>
841-
842+
843 <!-- Adding Sale Order Reference to outgoing picking -->
844-
845+
846 <record id="stock_picking_out_inherit_sale" model="ir.ui.view">
847 <field name="name">Outgoing picking Inherited</field>
848 <field name="model">stock.picking</field>
849 <field name="type">form</field>
850 <field name="inherit_id" ref="stock.view_picking_out_form"/>
851 <field name="arch" type="xml">
852- <field name="move_type" position="after">
853+ <field name="backorder_id" position="after">
854 <field name="sale_id"/>
855 </field>
856 </field>
857 </record>
858
859+ <!--
860+ see https://bugs.launchpad.net/openobject-server/+bug/601480
861+ -->
862+ <act_window
863+ domain="[('sale_id', '=', active_id),('type','=','out')]"
864+ id="act_purchase_order_2_stock_picking"
865+ view_id="view.picking.out.tree"
866+ name="Outgoing Orders"
867+ res_model="stock.picking"
868+ src_model="sale.order"
869+ context="{'contact_display': 'partner'}" />
870+
871 </data>
872 </openerp>
873
874=== modified file 'sale_order_dates/sale_order_dates_view.xml'
875--- sale_order_dates/sale_order_dates_view.xml 2010-06-30 10:31:08 +0000
876+++ sale_order_dates/sale_order_dates_view.xml 2010-09-07 06:36:14 +0000
877@@ -11,11 +11,21 @@
878 <field name="date_confirm" position="after">
879 <field name="commitment_date"/>
880 <field name="effective_date"/>
881+ </field>
882+ </field>
883+ </record>
884+
885+ <record id="view_sale_orderfor_a" model="ir.ui.view">
886+ <field name="name">sale.order.form.inherit5a</field>
887+ <field name="model">sale.order</field>
888+ <field name="type">form</field>
889+ <field name="inherit_id" ref="view_sale_orderfor"/>
890+ <field name="arch" type="xml">
891+ <field name="partner_invoice_id" position="after">
892 <field name="requested_date"/>
893 </field>
894 </field>
895 </record>
896
897-
898 </data>
899 </openerp>
900
901=== modified file 'stock/stock_view.xml'
902--- stock/stock_view.xml 2010-09-03 06:17:18 +0000
903+++ stock/stock_view.xml 2010-09-07 06:36:14 +0000
904@@ -564,17 +564,21 @@
905 <field name="name">stock.picking.form</field>
906 <field name="model">stock.picking</field>
907 <field name="type">form</field>
908+ <field eval="12" name="priority"/>
909 <field name="arch" type="xml">
910 <form string="Picking list">
911 <group colspan="4" col="6">
912 <field name="name" readonly="1"/>
913+ <field name="date"/>
914+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
915+ <field name="address_id" required="1" colspan="4"/>
916 <field name="origin"/>
917+ <newline/>
918+ <field name="min_date"/>
919 <field name="backorder_id" groups="base.group_extended" readonly="1"/>
920- <field name="date"/>
921- <field name="min_date"/>
922- <field name="type"/>
923+ <newline/>
924+ <field name="type" readonly="1"/>
925 <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
926- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
927 </group>
928 <notebook colspan="4">
929 <page string="General Information">
930@@ -741,14 +745,15 @@
931 <form string="Picking list">
932 <group col="6" colspan="4" attrs="{'readonly': [('state','not in',['draft','auto'])]}">
933 <field name="name" readonly="1"/>
934- <field name="address_id" required="1"/>
935+ <field name="date"/>
936+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
937+ <field name="address_id" required="1" colspan="4"/>
938 <field name="origin"/>
939+ <field name="min_date"/>
940 <field name="backorder_id" groups="base.group_extended" readonly="1"/>
941- <field name="date" />
942- <field name="min_date"/>
943+ <newline/>
944+ <field name="type" readonly="1"/>
945 <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
946- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
947- <field name="type" invisible="1"/>
948 </group>
949 <notebook colspan="4">
950 <page string="General Information">
951@@ -830,7 +835,7 @@
952 </page>
953 <page string="Return Picking History">
954 <field name="move_stock_return_history" nolabel="1"/>
955- </page>
956+ </page>
957 </notebook>
958 </form>
959 </field>
960@@ -944,16 +949,18 @@
961 <field name="type">form</field>
962 <field name="arch" type="xml">
963 <form string="Picking list">
964- <group col="6" colspan="4">
965- <field name="address_id" required="1" />
966+ <group col="6" colspan="4">
967+ <field name="name" readonly="1"/>
968+ <field name="date"/>
969+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
970+ <field name="address_id" required="1" colspan="4"/>
971+ <field name="origin" readonly="1"/>
972 <field name="min_date"/>
973- <field name="name" readonly="1"/>
974+ <field name="backorder_id" readonly="1"/>
975+ <newline/>
976+ <field name="type" readonly="1"/>
977+ <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
978 <field name="invoice_state"/>
979- <field name="backorder_id" readonly="1"/>
980- <field name="origin" readonly="1"/>
981- <field name="type" invisible="1"/>
982- <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
983- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
984 </group>
985 <notebook colspan="4">
986 <page string="General Information">
987@@ -1143,15 +1150,15 @@
988 <form string="Input Picking List">
989 <group colspan="4" col="6">
990 <field name="name" readonly="1"/>
991- <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" required="1" />
992+ <field name="date"/>
993+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
994+ <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" required="1" colspan="4"/>
995 <field name="origin"/>
996+ <field name="min_date" readonly="1"/>
997 <field name="backorder_id" readonly="1" groups="base.group_extended"/>
998- <field name="date"/>
999- <field name="type"/>
1000- <field name="min_date" readonly="1"/>
1001+ <field name="type" readonly="1"/>
1002+ <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
1003 <field name="invoice_state" string="Invoice Control"/>
1004- <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
1005- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
1006 </group>
1007 <notebook colspan="4">
1008 <page string="General Information">
1009@@ -1221,7 +1228,7 @@
1010 <page string="Return Picking History">
1011 <field name="move_stock_return_history" nolabel="1"/>
1012 </page>
1013-
1014+
1015 </notebook>
1016 </form>
1017 </field>
1018@@ -1444,7 +1451,7 @@
1019 </page>
1020 <page string="Return Picking History">
1021 <field name="move_stock_return_history" nolabel="1"/>
1022- </page>
1023+ </page>
1024 </notebook>
1025 <group col="6" colspan="4">
1026 <field name="state"/>
1027@@ -1604,7 +1611,7 @@
1028 </page>
1029 <page string="Return Picking History">
1030 <field name="move_stock_return_history" nolabel="1"/>
1031- </page>
1032+ </page>
1033 </notebook>
1034 </form>
1035 </field>
1036@@ -1744,7 +1751,7 @@
1037 <field name="name">Products</field>
1038 <field eval="'ir.actions.act_window,%d'%act_product_location_open" name="value"/>
1039 <field eval="True" name="object"/>
1040- </record>    
1041+ </record>
1042
1043
1044 <record id="ir_act_product_location_open" model="ir.values">
1045@@ -1753,7 +1760,7 @@
1046 <field name="name">Open Products</field>
1047 <field eval="'ir.actions.act_window,%d'%action_view_stock_location_product" name="value"/>
1048 <field eval="True" name="object"/>
1049- </record>  
1050+ </record>
1051
1052 <!-- Graph Views -->
1053 <!-- Products To Received Vs Planned -->

Subscribers

People subscribed via source and target branches

to all changes: