Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-gde-warehouse-bde into lp:openobject-addons

  1. trunk-gde-warehouse-bde
  2. Merge into trunk
Proposed by DJ Patel (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-gde-warehouse-bde
Merge into: lp:openobject-addons
Diff against target: 702 lines (+127/-120)
19 files modified
account_followup/__openerp__.py (+1/-1)
account_voucher/__openerp__.py (+1/-1)
base_gengo/__openerp__.py (+1/-1)
crm/__openerp__.py (+1/-1)
crm_claim/__openerp__.py (+1/-1)
hr_expense/__openerp__.py (+1/-1)
hr_recruitment/__openerp__.py (+1/-1)
l10n_ch/__openerp__.py (+2/-2)
l10n_fr_hr_payroll/__openerp__.py (+2/-2)
mrp/mrp_view.xml (+4/-4)
note_pad/__openerp__.py (+1/-1)
point_of_sale/__openerp__.py (+1/-1)
stock/__openerp__.py (+1/-1)
stock/report/stock_inventory_move.rml (+22/-25)
stock/stock.py (+4/-3)
stock/stock_view.xml (+23/-23)
stock_location/stock_location.py (+6/-1)
stock_location/stock_location_view.xml (+53/-49)
web_analytics/__openerp__.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-gde-warehouse-bde
Reviewer Review Type Date Requested Status
Christophe Matthieu (OpenERP) (community) Needs Information
Review via email: mp+136874@code.launchpad.net
To post a comment you must log in.
lp:~openerp-dev/openobject-addons/trunk-gde-warehouse-bde updated
8009. By DJ Patel (OpenERP)

[Merge] Merge with main addons.

8010. By DJ Patel (OpenERP)

[Merge] Merge with main addons.

8011. By DJ Patel (OpenERP)

[IMP] stock_location : Improved the labels.

Revision history for this message
Christophe Matthieu (OpenERP) (chm-openerp) wrote :

Please post a comments or the related bug.
Thanks.

review: Needs Information
Reply
Revision history for this message
DJ Patel (OpenERP) (mdi-openerp) wrote :

Hello,

For more details see the pad: http://pad.openerp.com/p/rd-project.task-4332-PT7LSYC1

Thanks,
Divyesh

Reply

Unmerged revisions

8011. By DJ Patel (OpenERP)

[IMP] stock_location : Improved the labels.

8010. By DJ Patel (OpenERP)

[Merge] Merge with main addons.

8009. By DJ Patel (OpenERP)

[Merge] Merge with main addons.

8008. By DJ Patel (OpenERP)

[Merge] Merged the push flow.

8007. By DJ Patel (OpenERP)

[Merge] Merge the stock move section.

8006. By DJ Patel (OpenERP)

[Merge] Merge with main addons.

8005. By Bharat Devnani (Open ERP)

[MERGE] merged pna's branch lp:~openerp-dev/openobject-addons/trunk-gde-warehouse-bde-stock_inventory-pna

8004. By Bharat Devnani (Open ERP)

[MERGE] merged pna's branch lp:~openerp-dev/openobject-addons/trunk-gde-warehouse-bde-sort_order-pna

8003. By Bharat Devnani (Open ERP)

[IMP] improved underlines on titles

8002. By Bharat Devnani (Open ERP)

[MERGE] merged vba's branch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_followup/__openerp__.py'
2--- account_followup/__openerp__.py 2012-11-26 13:59:08 +0000
3+++ account_followup/__openerp__.py 2012-12-03 09:43:21 +0000
4@@ -25,7 +25,7 @@
5 'category': 'Accounting & Finance',
6 'description': """
7 Module to automate letters for unpaid invoices, with multi-level recalls.
8-==========================================================================
9+=========================================================================
10
11 You can define your multiple levels of recall through the menu:
12 ---------------------------------------------------------------
13
14=== modified file 'account_voucher/__openerp__.py'
15--- account_voucher/__openerp__.py 2012-11-13 12:30:13 +0000
16+++ account_voucher/__openerp__.py 2012-12-03 09:43:21 +0000
17@@ -26,7 +26,7 @@
18 'summary': 'Send Invoices and Track Payments',
19 'description': """
20 Invoicing & Payments by Accounting Voucher & Receipts
21-======================================================
22+=====================================================
23 The specific and easy-to-use Invoicing system in OpenERP allows you to keep track of your accounting, even when you are not an accountant. It provides an easy way to follow up on your suppliers and customers.
24
25 You could use this simplified accounting in case you work with an (external) account to keep your books, and you still want to keep track of payments.
26
27=== modified file 'base_gengo/__openerp__.py'
28--- base_gengo/__openerp__.py 2012-10-31 14:31:14 +0000
29+++ base_gengo/__openerp__.py 2012-12-03 09:43:21 +0000
30@@ -24,7 +24,7 @@
31 'category': 'Tools',
32 'description': """
33 Automated Translations through Gengo API
34-----------------------------------------
35+========================================
36
37 This module will install passive scheduler job for automated translations
38 using the Gengo API. To activate it, you must
39
40=== modified file 'crm/__openerp__.py'
41--- crm/__openerp__.py 2012-11-19 09:24:57 +0000
42+++ crm/__openerp__.py 2012-12-03 09:43:21 +0000
43@@ -28,7 +28,7 @@
44 'summary': 'Leads, Opportunities, Phone Calls',
45 'description': """
46 The generic OpenERP Customer Relationship Management
47-=====================================================
48+====================================================
49
50 This application enables a group of people to intelligently and efficiently manage leads, opportunities, meetings and phone calls.
51
52
53=== modified file 'crm_claim/__openerp__.py'
54--- crm_claim/__openerp__.py 2012-09-27 08:53:26 +0000
55+++ crm_claim/__openerp__.py 2012-12-03 09:43:21 +0000
56@@ -27,7 +27,7 @@
57 'description': """
58
59 Manage Customer Claims.
60-================================================================================
61+=======================
62 This application allows you to track your customers/suppliers claims and grievances.
63
64 It is fully integrated with the email gateway so that you can create
65
66=== modified file 'hr_expense/__openerp__.py'
67--- hr_expense/__openerp__.py 2012-10-30 06:01:05 +0000
68+++ hr_expense/__openerp__.py 2012-12-03 09:43:21 +0000
69@@ -35,7 +35,7 @@
70
71
72 The whole flow is implemented as:
73-----------------------------------
74+---------------------------------
75 * Draft expense
76 * Confirmation of the sheet by the employee
77 * Validation by his manager
78
79=== modified file 'hr_recruitment/__openerp__.py'
80--- hr_recruitment/__openerp__.py 2012-11-28 11:54:17 +0000
81+++ hr_recruitment/__openerp__.py 2012-12-03 09:43:21 +0000
82@@ -28,7 +28,7 @@
83 'summary': 'Jobs, Recruitment, Applications, Job Interviews',
84 'description': """
85 Manage job positions and the recruitment process
86-=================================================
87+================================================
88
89 This application allows you to easily keep track of jobs, vacancies, applications, interviews...
90
91
92=== modified file 'l10n_ch/__openerp__.py'
93--- l10n_ch/__openerp__.py 2012-09-26 12:16:27 +0000
94+++ l10n_ch/__openerp__.py 2012-12-03 09:43:21 +0000
95@@ -22,8 +22,8 @@
96 {
97 'name': 'Switzerland - Accounting',
98 'description': """
99-Swiss localization :
100-====================
101+Swiss localization:
102+===================
103 - DTA generation for a lot of payment types
104 - BVR management (number generation, report.)
105 - Import account move from the bank file (like v11)
106
107=== modified file 'l10n_fr_hr_payroll/__openerp__.py'
108--- l10n_fr_hr_payroll/__openerp__.py 2012-08-22 13:02:32 +0000
109+++ l10n_fr_hr_payroll/__openerp__.py 2012-12-03 09:43:21 +0000
110@@ -32,8 +32,8 @@
111 - All main contributions rules for French payslip, for 'cadre' and 'non-cadre'
112 - New payslip report
113
114-TODO :
115-------
116+TODO:
117+-----
118 - Integration with holidays module for deduction and allowance
119 - Integration with hr_payroll_account for the automatic account_move_line
120 creation from the payslip
121
122=== modified file 'mrp/mrp_view.xml'
123--- mrp/mrp_view.xml 2012-11-26 21:39:21 +0000
124+++ mrp/mrp_view.xml 2012-12-03 09:43:21 +0000
125@@ -687,7 +687,7 @@
126 groups="stock.group_production_lot"/>
127 <button name="%(stock.move_scrap)d"
128 string="Scrap Products" type="action"
129- icon="gtk-convert" context="{'scrap': True}"
130+ icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
131 states="draft,waiting,confirmed,assigned"/>
132 </tree>
133 </field>
134@@ -704,7 +704,7 @@
135 <button
136 name="%(stock.move_scrap)d"
137 string="Scrap Products" type="action"
138- icon="gtk-convert"
139+ icon="terp-gtk-jump-to-ltr"
140 states="done,cancel"/>
141 </tree>
142 </field>
143@@ -726,7 +726,7 @@
144 icon="gtk-justify-fill"/>
145 <button name="%(stock.move_scrap)d"
146 string="Scrap Products" type="action"
147- icon="gtk-convert" context="{'scrap': True}"
148+ icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
149 states="draft,waiting,confirmed,assigned"/>
150 </tree>
151 </field>
152@@ -744,7 +744,7 @@
153 <button name="%(stock.track_line)d"
154 string="Split in Serial Numbers" type="action" icon="gtk-justify-fill" states="done,cancel"/>
155 <button name="%(stock.move_scrap)d"
156- string="Scrap Products" type="action" icon="gtk-convert"
157+ string="Scrap Products" type="action" icon="terp-gtk-jump-to-ltr"
158 states="done,cancel"/>
159 </tree>
160 </field>
161
162=== modified file 'note_pad/__openerp__.py'
163--- note_pad/__openerp__.py 2012-10-02 15:11:17 +0000
164+++ note_pad/__openerp__.py 2012-12-03 09:43:21 +0000
165@@ -25,7 +25,7 @@
166 'category': 'Tools',
167 'description': """
168 This module update memos inside OpenERP for using an external pad
169-===================================================================
170+=================================================================
171
172 Use for update your text memo in real time with the following user that you invite.
173
174
175=== modified file 'point_of_sale/__openerp__.py'
176--- point_of_sale/__openerp__.py 2012-11-21 11:26:44 +0000
177+++ point_of_sale/__openerp__.py 2012-12-03 09:43:21 +0000
178@@ -28,7 +28,7 @@
179 'summary': 'Touchscreen Interface for Shops',
180 'description': """
181 Quick and Easy sale process
182-============================
183+===========================
184
185 This module allows you to manage your shop sales very easily with a fully web based touchscreen interface.
186 It is compatible with all PC tablets and the iPad, offering multiple payment methods.
187
188=== modified file 'stock/__openerp__.py'
189--- stock/__openerp__.py 2012-09-26 12:16:27 +0000
190+++ stock/__openerp__.py 2012-12-03 09:43:21 +0000
191@@ -34,7 +34,7 @@
192 OpenERP has the capacity to manage lots and serial numbers ensuring compliance with the traceability requirements imposed by the majority of industries.
193
194 Key Features
195--------------
196+------------
197 * Moves history and planning,
198 * Stock valuation (standard or average price, ...)
199 * Robustness faced with Inventory differences
200
201=== modified file 'stock/report/stock_inventory_move.rml'
202--- stock/report/stock_inventory_move.rml 2011-12-21 09:08:11 +0000
203+++ stock/report/stock_inventory_move.rml 2012-12-03 09:43:21 +0000
204@@ -1,6 +1,6 @@
205 <?xml version="1.0"?>
206 <document filename="Stock Inventory.pdf">
207- <template title="Stock Inventory" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
208+ <template pageSize="(595.0,842.0)" title="Stock Inventory" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
209 <pageTemplate id="first">
210 <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
211 </pageTemplate>
212@@ -47,6 +47,7 @@
213 <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
214 <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
215 <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
216+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
217 </blockTableStyle>
218 <blockTableStyle id="Table8">
219 <blockAlignment value="LEFT"/>
220@@ -55,12 +56,14 @@
221 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
222 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
223 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
224+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
225 </blockTableStyle>
226 <blockTableStyle id="Table7">
227 <blockAlignment value="LEFT"/>
228 <blockValign value="TOP"/>
229 <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
230 <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
231+ <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
232 </blockTableStyle>
233 <initialize>
234 <paraStyle name="all" alignment="justify"/>
235@@ -104,25 +107,6 @@
236 <images/>
237 </stylesheet>
238 <story>
239- <pto>
240- <pto_header>
241- <blockTable colWidths="70.0,103.0,256.0,109.0" style="Table4">
242- <tr>
243- <td>
244- <para style="terp_tblheader_Details">Location</para>
245- </td>
246- <td>
247- <para style="terp_tblheader_Details_Centre">Production Lot</para>
248- </td>
249- <td>
250- <para style="terp_tblheader_Details">Product </para>
251- </td>
252- <td>
253- <para style="terp_tblheader_Details_Right">Quantity</para>
254- </td>
255- </tr>
256- </blockTable>
257- </pto_header>
258 <para style="terp_default_8">[[ repeatIn(objects,'o') ]] </para>
259 <blockTable colWidths="539.0" style="Table3">
260 <tr>
261@@ -163,7 +147,7 @@
262 <para style="terp_default_8">
263 <font color="white"> </font>
264 </para>
265- <blockTable colWidths="70.0,103.0,256.0,109.0" style="Table4">
266+ <blockTable colWidths="59.0,86.0,213.0,91.0,91.0" style="Table4">
267 <tr>
268 <td>
269 <para style="terp_tblheader_Details">Location</para>
270@@ -177,11 +161,14 @@
271 <td>
272 <para style="terp_tblheader_Details_Right">Quantity</para>
273 </td>
274+ <td>
275+ <para style="terp_tblheader_Details_Centre">Manual Quantity</para>
276+ </td>
277 </tr>
278 </blockTable>
279 <section>
280 <para style="terp_default_2">[[ repeatIn(o.inventory_line_id, 'p') ]]</para>
281- <blockTable colWidths="70.0,105.0,255.0,109.0" style="Table8">
282+ <blockTable colWidths="58.0,87.0,212.0,91.0,91.0" style="Table8">
283 <tr>
284 <td>
285 <para style="terp_default_9">[[ p.location_id.name ]]</para>
286@@ -195,10 +182,15 @@
287 <td>
288 <para style="terp_default_Right_9">[[ formatLang(p.product_qty) ]] [[ p.product_uom.name ]]</para>
289 </td>
290+ <td>
291+ <para style="terp_default_Right_9">
292+ <font color="white"> </font>
293+ </para>
294+ </td>
295 </tr>
296 </blockTable>
297 </section>
298- <blockTable colWidths="383.0,47.0,109.0" style="Table7">
299+ <blockTable colWidths="318.0,39.0,91.0,91.0" style="Table7">
300 <tr>
301 <td>
302 <para style="terp_default_Bold_9">
303@@ -211,11 +203,16 @@
304 <td>
305 <para style="terp_default_Bold_Right_9">[[ formatLang(qty_total(o.inventory_line_id)['quantity']) ]] [[ qty_total(o.inventory_line_id)['uom'] ]]</para>
306 </td>
307+ <td>
308+ <para style="terp_default_Bold_Right_9">
309+ <font color="white"> </font>
310+ </para>
311+ </td>
312 </tr>
313 </blockTable>
314 <para style="terp_default_8">
315 <font color="white"> </font>
316 </para>
317- </pto>
318 </story>
319-</document>
320\ No newline at end of file
321+</document>
322+
323
324=== modified file 'stock/report/stock_inventory_move.sxw'
325Binary files stock/report/stock_inventory_move.sxw 2011-01-14 00:11:01 +0000 and stock/report/stock_inventory_move.sxw 2012-12-03 09:43:21 +0000 differ
326=== modified file 'stock/stock.py'
327--- stock/stock.py 2012-11-30 10:05:16 +0000
328+++ stock/stock.py 2012-12-03 09:43:21 +0000
329@@ -243,7 +243,7 @@
330 elif location.chained_location_type == 'fixed':
331 result = location.chained_location_id
332 if result:
333- return result, location.chained_auto_packing, location.chained_delay, location.chained_journal_id and location.chained_journal_id.id or False, location.chained_company_id and location.chained_company_id.id or False, location.chained_picking_type
334+ return result, location.chained_auto_packing, location.chained_delay, location.chained_journal_id and location.chained_journal_id.id or False, location.chained_company_id and location.chained_company_id.id or False, location.chained_picking_type, False
335 return result
336
337 def picking_type_get(self, cr, uid, from_location, to_location, context=None):
338@@ -2126,7 +2126,7 @@
339 self.pool.get('stock.picking').write(cr, uid, [picking.id], {'name': old_pick_name, 'type': old_ptype}, context=context)
340 else:
341 pickid = False
342- for move, (loc, dummy, delay, dummy, company_id, ptype) in todo:
343+ for move, (loc, dummy, delay, dummy, company_id, ptype, invoice_state) in todo:
344 new_id = move_obj.copy(cr, uid, move.id, {
345 'location_id': move.location_dest_id.id,
346 'location_dest_id': loc.id,
347@@ -2135,7 +2135,7 @@
348 'state': 'waiting',
349 'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context) ,
350 'move_history_ids': [],
351- 'date': (datetime.strptime(move.date, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
352+ 'date_expected': (datetime.strptime(move.date, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
353 'move_history_ids2': []}
354 )
355 move_obj.write(cr, uid, [move.id], {
356@@ -3014,6 +3014,7 @@
357 _inherit = "stock.picking"
358 _table = "stock_picking"
359 _description = "Incoming Shipments"
360+ _order = 'date desc'
361
362 def check_access_rights(self, cr, uid, operation, raise_exception=True):
363 #override in order to redirect the check of acces rights on the stock.picking object
364
365=== modified file 'stock/stock_view.xml'
366--- stock/stock_view.xml 2012-11-28 04:23:11 +0000
367+++ stock/stock_view.xml 2012-12-03 09:43:21 +0000
368@@ -65,7 +65,7 @@
369 <field domain="[('usage','=','internal')]" name="location_id"/>
370 <button name="%(stock.action_view_stock_inventory_line_split)d"
371 string="Split Inventory Line" groups="stock.group_inventory_valuation"
372- type="action" icon="terp-stock_effects-object-colorize"/>
373+ type="action" icon="gtk-justify-fill"/>
374 </group>
375 </form>
376 </field>
377@@ -136,7 +136,7 @@
378 <field name="prod_lot_id" groups="stock.group_production_lot"/>
379 <button name="%(stock.action_view_stock_inventory_line_split)d"
380 string="Split inventory lines" groups="stock.group_inventory_valuation"
381- type="action" icon="terp-stock_effects-object-colorize" states="draft,confirm"/>
382+ type="action" icon="gtk-justify-fill" states="draft,confirm"/>
383 <field name="state" invisible="True"/>
384 </tree>
385 <form string="Products" version="7.0">
386@@ -154,7 +154,7 @@
387 <field name="prod_lot_id" groups="stock.group_production_lot"/>
388 <button name="%(stock.action_view_stock_inventory_line_split)d"
389 string="Split inventory lines" groups="stock.group_inventory_valuation"
390- type="action" icon="terp-stock_effects-object-colorize"/>
391+ type="action" icon="gtk-justify-fill"/>
392 </group>
393 </group>
394 </form>
395@@ -168,7 +168,7 @@
396 <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
397 <field name="prodlot_id" groups="stock.group_production_lot"/>
398 <button name="%(track_line)d" string="Split in serial numbers" type="action"
399- icon="terp-stock_effects-object-colorize"
400+ icon="gtk-justify-fill"
401 attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
402 states="draft,done,cancel"
403 context="{'inventory_id':parent.id}"
404@@ -176,7 +176,7 @@
405 <field groups="stock.group_tracking_lot" name="tracking_id"/>
406 <button name="%(split_into)d" string="Put in a new pack" type="action"
407 groups="stock.group_tracking_lot"
408- icon="terp-stock_effects-object-colorize"
409+ icon="terp-accessories-archiver+"
410 context="{'inventory_id':parent.id}"
411 states="draft,done,cancel"/>
412 <field name="location_id" groups="stock.group_locations"/>
413@@ -1130,21 +1130,21 @@
414 <field name="product_uos" groups="product.group_uos"/>
415 <button name="%(stock.move_scrap)d"
416 string="Scrap Products" type="action"
417- icon="gtk-convert" context="{'scrap': True}"
418+ icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
419 states="draft,waiting,confirmed,assigned"/>
420 <field name="prodlot_id" groups="stock.group_production_lot"/>
421 <button name="%(track_line)d" string="Split in Serial Numbers" type="action"
422- icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
423+ icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
424 states="draft,waiting,confirmed,assigned,done"
425 groups="stock.group_tracking_lot"/>
426 <field name="tracking_id" groups="stock.group_tracking_lot"/>
427 <button name="setlast_tracking" string="Put in current pack" type="object"
428 groups="product.group_stock_packaging"
429- icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
430+ icon="terp-accessories-archiver" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
431 states="draft,assigned,confirmed,done"/>
432 <button name="%(split_into)d" string="Put in a new pack" type="action"
433 groups="product.group_stock_packaging"
434- icon="terp-stock_effects-object-colorize"
435+ icon="terp-accessories-archiver+"
436 states="draft,assigned,confirmed,done"/>
437 <field name="location_id" groups="stock.group_locations"/>
438 <field name="location_dest_id" groups="stock.group_locations"/>
439@@ -1168,7 +1168,7 @@
440 <field name="product_uos" groups="product.group_uos"/>
441 <button name="%(stock.move_scrap)d"
442 string="Scrap Products" type="action"
443- icon="gtk-convert" context="{'scrap': True}"
444+ icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
445 states="draft,waiting,confirmed,assigned"
446 groups="base.group_user"/>
447 <field name="scrapped" invisible="1"/>
448@@ -1177,17 +1177,17 @@
449 name="%(stock.track_line)d"
450 string="Split in Serial Number"
451 groups="stock.group_production_lot"
452- type="action" icon="terp-stock_effects-object-colorize"
453+ type="action" icon="gtk-justify-fill"
454 states="draft,waiting,confirmed,assigned"/>
455 <field groups="stock.group_tracking_lot" name="tracking_id"/>
456 <button name="setlast_tracking" string="Put in current pack" type="object"
457 attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
458- icon="terp-stock_effects-object-colorize"
459+ icon="terp-accessories-archiver"
460 groups="stock.group_tracking_lot"
461 states="draft,assigned,confirmed"/>
462 <button name="%(split_into)d" string="Put in a new pack" type="action"
463 groups="product.group_stock_packaging"
464- icon="terp-stock_effects-object-colorize"
465+ icon="terp-accessories-archiver+"
466 states="draft,assigned,confirmed"/>
467 <field name="location_dest_id" groups="stock.group_locations"/>
468 <field name="state"/>
469@@ -1221,7 +1221,7 @@
470 <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
471 <button name="%(stock.move_scrap)d"
472 string="Scrap" type="action"
473- icon="gtk-convert" context="{'scrap': True}"
474+ icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
475 states="draft,waiting,confirmed,assigned" colspan="1"/>
476 </div>
477 <label for="product_uos_qty" groups="product.group_uos"/>
478@@ -1254,7 +1254,7 @@
479 <field name="tracking_id" class="oe_inline"/>
480 <button name="%(split_into)d" string="New Pack" type="action"
481 groups="product.group_stock_packaging"
482- icon="terp-stock_effects-object-colorize"
483+ icon="terp-accessories-archiver+"
484 states="draft,assigned,confirmed"/>
485 </div>
486 <label for="prodlot_id" groups="stock.group_production_lot"/>
487@@ -1265,7 +1265,7 @@
488 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
489 <button name="%(track_line)d"
490 states="draft,waiting,confirmed,assigned"
491- string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
492+ string="Split" type="action" icon="gtk-justify-fill"/>
493 </div>
494 </group>
495 </group>
496@@ -1297,7 +1297,7 @@
497 <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
498 <button name="%(stock.move_scrap)d"
499 string="Scrap" type="action"
500- icon="gtk-convert" context="{'scrap': True}"
501+ icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
502 states="draft,waiting,confirmed,assigned"
503 groups="base.group_user"/>
504 </div>
505@@ -1327,7 +1327,7 @@
506 <button name="%(split_into)d"
507 string="New Pack" type="action"
508 groups="product.group_stock_packaging"
509- icon="terp-stock_effects-object-colorize"
510+ icon="terp-accessories-archiver+"
511 states="draft,assigned,confirmed"/>
512 </div>
513
514@@ -1340,7 +1340,7 @@
515 <button name="%(track_line)d"
516 groups="stock.group_tracking_lot"
517 states="draft,waiting,confirmed,assigned"
518- string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
519+ string="Split" type="action" icon="gtk-justify-fill"/>
520 </div>
521 </group>
522 </group>
523@@ -1435,22 +1435,22 @@
524 <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
525 <button name="%(stock.move_scrap)d"
526 string="Scrap Products" type="action"
527- icon="gtk-convert" context="{'scrap': True}"
528+ icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
529 states="draft,waiting,confirmed,assigned"/>
530 <field name="prodlot_id" groups="stock.group_production_lot"/>
531 <button name="%(track_line)d" string="Split in Serial Numbers" type="action"
532- icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
533+ icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
534 states="draft,waiting,confirmed,assigned,done"
535 groups="stock.group_tracking_lot"/>
536 <field name="tracking_id" groups="stock.group_tracking_lot"/>
537 <button name="setlast_tracking" string="Put in current pack" type="object"
538 attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
539 groups="product.group_stock_packaging"
540- icon="terp-stock_effects-object-colorize"
541+ icon="terp-accessories-archiver"
542 states="draft,assigned,confirmed,done"/>
543 <button name="%(split_into)d" string="Put in a new pack" type="action"
544 groups="product.group_stock_packaging"
545- icon="terp-stock_effects-object-colorize"
546+ icon="terp-accessories-archiver+"
547 states="draft,assigned,confirmed,done"/>
548 <field name="state"/>
549 <button name="%(action_partial_move_server)d"
550
551=== modified file 'stock_location/stock_location.py'
552--- stock_location/stock_location.py 2012-07-13 10:17:51 +0000
553+++ stock_location/stock_location.py 2012-12-03 09:43:21 +0000
554@@ -109,6 +109,11 @@
555 self.action_cancel(cr, uid, [m.move_dest_id.id], context=context)
556 res = super(stock_move,self).action_cancel(cr,uid,ids,context)
557 return res
558+
559+ def _prepare_chained_picking(self, cr, uid, picking_name, picking, picking_type, moves_todo, context=None):
560+ res = super(stock_move, self)._prepare_chained_picking(cr, uid, picking_name, picking, picking_type, moves_todo, context=context)
561+ res.update({'invoice_state': moves_todo[0][1][6] or 'none'})
562+ return res
563 stock_move()
564
565 class stock_location(osv.osv):
566@@ -117,7 +122,7 @@
567 if product:
568 for path in product.path_ids:
569 if path.location_from_id.id == location.id:
570- return path.location_dest_id, path.auto, path.delay, path.journal_id and path.journal_id.id or False, path.company_id and path.company_id.id or False, path.picking_type
571+ return path.location_dest_id, path.auto, path.delay, path.journal_id and path.journal_id.id or False, path.company_id and path.company_id.id or False, path.picking_type, path.invoice_state
572 return super(stock_location, self).chained_location_get(cr, uid, location, partner, product, context)
573 stock_location()
574 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
575
576=== modified file 'stock_location/stock_location_view.xml'
577--- stock_location/stock_location_view.xml 2012-09-28 17:41:24 +0000
578+++ stock_location/stock_location_view.xml 2012-12-03 09:43:21 +0000
579@@ -39,57 +39,61 @@
580 <field name="inherit_id" ref="product.product_normal_form_view"/>
581 <field name="arch" type="xml">
582 <group name="inventory" position="after">
583- <field name="flow_pull_ids" colspan="4" nolabel="1">
584- <tree string="Pulled flows">
585- <field name="name"/>
586- <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
587- <field name="type_proc"/>
588- <field name="journal_id"/>
589- <field name="company_id" groups="base.group_multi_company"/>
590- </tree>
591- <form string="Pulled Paths">
592- <group>
593- <group string="Conditions">
594- <field name="name" placeholder="Fulfill needs on location X from location Y "/>
595- <field name="location_id"/>
596- </group>
597- <group string="Action Type">
598- <field name="type_proc"/>
599- <field name="company_id"/>
600- </group>
601- </group>
602- <group attrs="{'invisible':[('type_proc','!=','move')]}">
603- <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
604+ <group string="Pull Flow">
605+ <field name="flow_pull_ids" colspan="4" nolabel="1">
606+ <tree string="Pulled flows">
607+ <field name="name"/>
608+ <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
609+ <field name="type_proc"/>
610+ <field name="journal_id"/>
611+ <field name="company_id" groups="base.group_multi_company"/>
612+ </tree>
613+ <form string="Pulled Paths">
614+ <group>
615+ <group string="Conditions">
616+ <field name="name" placeholder="Fulfill needs on location X from location Y "/>
617+ <field name="location_id"/>
618+ </group>
619+ <group string="Action Type">
620+ <field name="type_proc"/>
621+ <field name="company_id"/>
622+ </group>
623+ </group>
624+ <group attrs="{'invisible':[('type_proc','!=','move')]}">
625+ <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
626+ <field name="picking_type"/>
627+ <field name="partner_address_id"/>
628+ <field name="procure_method"/>
629+ <field name="cancel_cascade"/>
630+ <field name="invoice_state"/>
631+ <field name="journal_id"/>
632+ </group>
633+ </form>
634+ </field>
635+ </group>
636+ <group string="Push Flow">
637+ <field name="path_ids" nolabel="1">
638+ <tree string="Pushed flows">
639+ <field name="location_from_id"/>
640+ <field name="location_dest_id"/>
641+ <field name="auto"/>
642+ <field name="name"/>
643+ <field name="invoice_state"/>
644+ <field name="company_id" groups="base.group_multi_company"/>
645+ </tree>
646+ <form string="Pushed flows">
647+ <field name="name" placeholder="When receiving at location X, move to location Y"/>
648+ <field name="location_from_id"/>
649+ <field name="location_dest_id"/>
650+ <field name="auto"/>
651+ <field name="delay"/>
652+ <field name="journal_id"/>
653 <field name="picking_type"/>
654- <field name="partner_address_id"/>
655- <field name="procure_method"/>
656- <field name="cancel_cascade"/>
657 <field name="invoice_state"/>
658- <field name="journal_id"/>
659- </group>
660- </form>
661- </field>
662- <field name="path_ids">
663- <tree string="Pushed flows">
664- <field name="location_from_id"/>
665- <field name="location_dest_id"/>
666- <field name="auto"/>
667- <field name="name"/>
668- <field name="invoice_state"/>
669- <field name="company_id" groups="base.group_multi_company"/>
670- </tree>
671- <form string="Pushed flows">
672- <field name="name" placeholder="When receiving at location X, move to location Y"/>
673- <field name="location_from_id"/>
674- <field name="location_dest_id"/>
675- <field name="auto"/>
676- <field name="delay"/>
677- <field name="journal_id"/>
678- <field name="picking_type"/>
679- <field name="invoice_state"/>
680- <field name="company_id" groups="base.group_multi_company"/>
681- </form>
682- </field>
683+ <field name="company_id" groups="base.group_multi_company"/>
684+ </form>
685+ </field>
686+ </group>
687 </group>
688 </field>
689 </record>
690
691=== modified file 'web_analytics/__openerp__.py'
692--- web_analytics/__openerp__.py 2012-10-26 14:02:39 +0000
693+++ web_analytics/__openerp__.py 2012-12-03 09:43:21 +0000
694@@ -25,7 +25,7 @@
695 'complexity': "easy",
696 'description': """
697 Google Analytics.
698-==============================
699+=================
700
701 Collects web application usage with Google Analytics.
702 """,

Subscribers

People subscribed via source and target branches

to all changes: