1
=== added directory 'account_prepayment/static'
2
=== added directory 'account_prepayment/static/description'
3
=== added file 'account_prepayment/static/description/account_invoice_line1.png'
4
0
Binary files account_prepayment/static/description/account_invoice_line1.png	1970-01-01 00:00:00 +0000 and account_prepayment/static/description/account_invoice_line1.png	2013-09-09 08:37:27 +0000 differ
0
Binary files account_prepayment/static/description/account_invoice_line1.png	1970-01-01 00:00:00 +0000 and account_prepayment/static/description/account_invoice_line1.png	2013-09-09 08:37:27 +0000 differ
5
=== added file 'account_prepayment/static/description/account_invoice_line2.png'
6
1
Binary files account_prepayment/static/description/account_invoice_line2.png	1970-01-01 00:00:00 +0000 and account_prepayment/static/description/account_invoice_line2.png	2013-09-09 08:37:27 +0000 differ
1
Binary files account_prepayment/static/description/account_invoice_line2.png	1970-01-01 00:00:00 +0000 and account_prepayment/static/description/account_invoice_line2.png	2013-09-09 08:37:27 +0000 differ
7
=== added file 'account_prepayment/static/description/index.html'
8
--- account_prepayment/static/description/index.html	1970-01-01 00:00:00 +0000
9
+++ account_prepayment/static/description/index.html	2013-09-09 08:37:27 +0000
10
@@ -0,0 +1,16 @@
11
1
<section class="oe_container">
12
2
    <div class="oe_row">
13
3
    <h2 class="oe_slogan">account_prepayment Module</h2> 
14
4
    <h3 class="oe_slogan">Prepayment Account for Customers and <br>Usage of Prepayment Account for Payments in Purchase Order</h3>
15
5
    <h4 class="oe_slogan"><a href="http://www.openerp.com.cn">By Elico Corp</a></h4>
16
6
       <p>This module allows for creation of prepayment accounts for Customers. This module also allows for payment to Suppliers in Purchase Orders to be deducted from the Prepayment Accounts instead of just other normal payment accounts. </p>
17
7
        <div class="oe_row_img oe_centered oe_mt32">
18
8
            <img class="oe_picture oe_screenshot" src="account_invoice_line1.png">
19
9
            <img class="oe_picture oe_screenshot" src="account_invoice_line2.png">
20
10
        </div>
21
11
    </div>
22
12
     <div class="oe_row oe_centeralign oe_more_space">
23
13
            <a href="http://www.elico-corp.com" class="oe_button oe_big">Start your <span class="oe_emph">free</span> trial</a>
24
14
        </div>
25
15
        <h4 class="oe_slogan">or</h4>
26
16
</section>
27
0
\ No newline at end of file
17
\ No newline at end of file
28
1
18
29
=== added directory 'delivery_plan'
30
=== added file 'delivery_plan/__init__.py'
31
--- delivery_plan/__init__.py	1970-01-01 00:00:00 +0000
32
+++ delivery_plan/__init__.py	2013-09-09 08:37:27 +0000
33
@@ -0,0 +1,27 @@
34
1
# -*- coding: utf-8 -*-
35
2
##############################################################################
36
3
#
37
4
#    OpenERP, Open Source Management Solution
38
5
#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
39
6
#    Author: Yannick Gouin <yannick.gouin@elico-corp.com>
40
7
#
41
8
#    This program is free software: you can redistribute it and/or modify
42
9
#    it under the terms of the GNU Affero General Public License as
43
10
#    published by the Free Software Foundation, either version 3 of the
44
11
#    License, or (at your option) any later version.
45
12
#
46
13
#    This program is distributed in the hope that it will be useful,
47
14
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
48
15
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
49
16
#    GNU Affero General Public License for more details.
50
17
#
51
18
#    You should have received a copy of the GNU Affero General Public License
52
19
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
53
20
#
54
21
##############################################################################
55
22
56
23
import sale
57
24
import wizard
58
25
import partner
59
26
60
27
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
61
0
28
62
=== added file 'delivery_plan/__openerp__.py'
63
--- delivery_plan/__openerp__.py	1970-01-01 00:00:00 +0000
64
+++ delivery_plan/__openerp__.py	2013-09-09 08:37:27 +0000
65
@@ -0,0 +1,58 @@
66
1
# -*- coding: utf-8 -*-
67
2
##############################################################################
68
3
#
69
4
#    OpenERP, Open Source Management Solution
70
5
#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
71
6
#    Author: Yannick Gouin <yannick.gouin@elico-corp.com>
72
7
#
73
8
#    This program is free software: you can redistribute it and/or modify
74
9
#    it under the terms of the GNU Affero General Public License as
75
10
#    published by the Free Software Foundation, either version 3 of the
76
11
#    License, or (at your option) any later version.
77
12
#
78
13
#    This program is distributed in the hope that it will be useful,
79
14
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
80
15
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
81
16
#    GNU Affero General Public License for more details.
82
17
#
83
18
#    You should have received a copy of the GNU Affero General Public License
84
19
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
85
20
#
86
21
##############################################################################
87
22
88
23
{
89
24
    'name': 'Delivery Time Plan',
90
25
    'version': '1',
91
26
    'category': 'Delivery',
92
27
    'sequence': 19,
93
28
    'summary': 'Plan delivery time for sale order',
94
29
    'description': """
95
30
Delivery Time Plan
96
31
=================================
97
32
* Plan delivery time for sale order
98
33
* Add delivery return reason,
99
34
* Calculate sale order dts, pts based on order start_date, enddate,
100
35
* Compute dts,pts of delivery order based on start_date and end date of sale order, delivery zone of partner.
101
36
    """,
102
37
    'author': 'Elico Corp',
103
38
    'website': 'http://www.elico-corp.com',
104
39
    'images' : [],
105
40
    'depends': ['sale_stock', 'delivery_routes',
106
41
            'mrp',
107
42
            "report_webkit", 'stock_extra'],
108
43
    'data': [
109
44
        #'security/security.xml',
110
45
        'security/ir.model.access.csv',
111
46
        'stock_view.xml',
112
47
        "delivery_report.xml",
113
48
        'wizard/stock_view.xml',
114
49
        'sequence.xml',
115
50
    ],
116
51
    'test': [],
117
52
    'demo': [],
118
53
    'installable': True,
119
54
    'auto_install': False,
120
55
    'application': False,
121
56
}
122
57
123
58
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
124
0
59
125
=== added file 'delivery_plan/delivery_report.xml'
126
--- delivery_plan/delivery_report.xml	1970-01-01 00:00:00 +0000
127
+++ delivery_plan/delivery_report.xml	2013-09-09 08:37:27 +0000
128
@@ -0,0 +1,73 @@
129
1
<?xml version="1.0"?>
130
2
<openerp>
131
3
    <data>
132
4
        <record id="ir_header_webkit_delivery_routes" model="ir.header_webkit">
133
5
            <field eval="&quot;&quot;&quot;Portrait&quot;&quot;&quot;" name="orientation"/>
134
6
            <field eval="&quot;&quot;&quot;A4&quot;&quot;&quot;" name="format"/>
135
7
            <field eval="&quot;&quot;&quot;DeliveryRoutes&quot;&quot;&quot;" name="name"/>
136
8
            <field eval="15.0" name="margin_top"/>
137
9
            <field name="footer_html"><![CDATA[<html>
138
10
    <head>
139
11
        <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
140
12
        <script>
141
13
            function subst() {
142
14
            var vars={};
143
15
            var x=document.location.search.substring(1).split('&');
144
16
            for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
145
17
            var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
146
18
            for(var i in x) {
147
19
            var y = document.getElementsByClassName(x[i]);
148
20
            for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
149
21
                }
150
22
            }
151
23
        </script>
152
24
    </head>
153
25
    <body style="border:0; margin: 0;" onload="subst()">
154
26
        <table style="border-top: 1px solid black; font-size:8px; width: 100%; position:absolute;">
155
27
            <tr>
156
28
		    <td width="10%"><b>备注</b></td><td width="80%">1.拿货前请先确认是否有以下货物并勾选(干货蔬果，冰冻货物，熟食，饼房).     2.支付方式简写 现金 C，刷卡 P，不收钱 NC，券 Q（配送结束时填写）</td>
157
29
		</tr>
158
30
		<tr>
159
31
		    <td width="10%"></td><td width="80%">3.配送结果有以下几种：1：配送成功。2：没有收钱。3：部分退货.4：改时间送。（配送结束时填写）</td>
160
32
		</tr>
161
33
        </table>
162
34
    </body>
163
35
</html>]]></field>
164
36
                        <field name="html"><![CDATA[<html>
165
37
    <head>
166
38
        <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
167
39
        <script>
168
40
            function subst() {
169
41
            var vars={};
170
42
            var x=document.location.search.substring(1).split('&');
171
43
            for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
172
44
            var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
173
45
            for(var i in x) {
174
46
            var y = document.getElementsByClassName(x[i]);
175
47
            for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
176
48
                }
177
49
            }
178
50
        </script>
179
51
        <style type="text/css">
180
52
            ${css}
181
53
        </style>
182
54
    </head>
183
55
    <body style="border:0; margin: 0;" onload="subst()">
184
56
    ${_debug or ''|n} </body>        
185
57
</html>]]>
186
58
</field>
187
59
188
60
                        <field name="css" ><![CDATA[
189
61
body { font-family:Helvetica; font-size:12px; }
190
62
.title { font-size:16px; font-weight: bold; text-align: center; }
191
63
.basic_table{ text-align:center; border-collapse: collapse; }
192
64
.basic_table td { border:1px solid lightGrey; font-size:12px; }
193
65
td { padding: 0 3px; text-align:left; font-size: 12px; }
194
66
table.noborder, table.noborder tr, table.noborder tr td, tr.noborder, tr.noborder td, td.noborder { border: none; }
195
67
.dontcutme { page-break-inside: avoid; }]]> </field>
196
68
        </record>
197
69
198
70
        <report id="report_delivery_route_print" name="delivery.route.print" string="Delivery Route" model="delivery.route" 
199
71
            file="fc_delivery_plan/report/delivery_route_print.mako" report_type="webkit" auto="False" header = "True" menu="True" webkit_header="ir_header_webkit_delivery_routes"/>
200
72
    </data>
201
73
</openerp>
202
0
\ No newline at end of file
74
\ No newline at end of file
203
1
75
204
=== added directory 'delivery_plan/i18n'
205
=== added file 'delivery_plan/i18n/zh_CN.po'
206
--- delivery_plan/i18n/zh_CN.po	1970-01-01 00:00:00 +0000
207
+++ delivery_plan/i18n/zh_CN.po	2013-09-09 08:37:27 +0000
208
@@ -0,0 +1,703 @@
209
1
# Translation of OpenERP Server.
210
2
# This file contains the translation of the following modules:
211
3
#	* fc_delivery_plan
212
4
#
213
5
msgid ""
214
6
msgstr ""
215
7
"Project-Id-Version: OpenERP Server 7.0\n"
216
8
"Report-Msgid-Bugs-To: \n"
217
9
"POT-Creation-Date: 2013-03-11 10:05+0000\n"
218
10
"PO-Revision-Date: 2013-03-11 10:05+0000\n"
219
11
"Last-Translator: <>\n"
220
12
"Language-Team: \n"
221
13
"MIME-Version: 1.0\n"
222
14
"Content-Type: text/plain; charset=UTF-8\n"
223
15
"Content-Transfer-Encoding: \n"
224
16
"Plural-Forms: \n"
225
17
226
18
#. module: fc_delivery_plan
227
19
#: field:delivery.route.line,to_be_received:0
228
20
msgid "To be Received"
229
21
msgstr "待收"
230
22
231
23
#. module: fc_delivery_plan
232
24
#: field:delivery.route.line,account_checked:0
233
25
msgid "Checked"
234
26
msgstr "已检查"
235
27
236
28
#. module: fc_delivery_plan
237
29
#: code:addons/fc_delivery_plan/sale.py:648
238
30
#: code:addons/fc_delivery_plan/sale.py:657
239
31
#, python-format
240
32
msgid "Error"
241
33
msgstr "错误"
242
34
243
35
#. module: fc_delivery_plan
244
36
#: view:stock.picking:0
245
37
msgid "Orders planned for the Past"
246
38
msgstr "已安排订单"
247
39
248
40
#. module: fc_delivery_plan
249
41
#: view:delivery.route:0
250
42
#: view:delivery.route.line:0
251
43
#: view:stock.picking:0
252
44
msgid "Group By..."
253
45
msgstr "分组..."
254
46
255
47
#. module: fc_delivery_plan
256
48
#: view:delivery.route:0
257
49
#: view:delivery.route.line:0
258
50
#: view:stock.picking:0
259
51
msgid "Today"
260
52
msgstr "今天"
261
53
262
54
#. module: fc_delivery_plan
263
55
#: code:addons/fc_delivery_plan/sale.py:799
264
56
#: field:delivery.route.line,customer_date:0
265
57
#, python-format
266
58
msgid "Customer Delivery Time"
267
59
msgstr "客户发货时间"
268
60
269
61
#. module: fc_delivery_plan
270
62
#: view:delivery.route.line:0
271
63
msgid "Delivery for Today"
272
64
msgstr "今日配送"
273
65
274
66
#. module: fc_delivery_plan
275
67
#: view:delivery.change.dts:0
276
68
msgid "Update"
277
69
msgstr "更新"
278
70
279
71
#. module: fc_delivery_plan
280
72
#: field:delivery.route.line,cs_remark:0
281
73
msgid "CS Remark"
282
74
msgstr "CS备注"
283
75
284
76
#. module: fc_delivery_plan
285
77
#: view:stock.picking:0
286
78
msgid "Picking without batch"
287
79
msgstr "未设分拣批次"
288
80
289
81
#. module: fc_delivery_plan
290
82
#: view:stock.picking:0
291
83
msgid "Picking list"
292
84
msgstr "发货单"
293
85
294
86
#. module: fc_delivery_plan
295
87
#: code:addons/fc_delivery_plan/sale.py:546
296
88
#, python-format
297
89
msgid "Latest error"
298
90
msgstr "上次错误"
299
91
300
92
#. module: fc_delivery_plan
301
93
#: field:delivery.route.line,picking_note:0
302
94
msgid "DO Notes"
303
95
msgstr "发货单备注"
304
96
305
97
#. module: fc_delivery_plan
306
98
#: field:delivery.route.line,delivered_cpt:0
307
99
msgid "Delivered x times"
308
100
msgstr "已发货 x 次"
309
101
310
102
#. module: fc_delivery_plan
311
103
#: selection:delivery.change.dts,action:0
312
104
msgid "Blank DTS/PTS"
313
105
msgstr "未设DTS/PTS"
314
106
315
107
#. module: fc_delivery_plan
316
108
#: view:stock.picking:0
317
109
msgid "Batch"
318
110
msgstr "批次"
319
111
320
112
#. module: fc_delivery_plan
321
113
#: code:addons/fc_delivery_plan/sale.py:657
322
114
#, python-format
323
115
msgid "The Route Line %s (origin: %s) is confirmed. You can not change it."
324
116
msgstr "路线 %s (来源: %s) 已经确认. 不可修改."
325
117
326
118
#. module: fc_delivery_plan
327
119
#: field:stock.tracking,ul_id:0
328
120
msgid "Picking Box"
329
121
msgstr "移库单Box"
330
122
331
123
#. module: fc_delivery_plan
332
124
#: field:delivery.route.line,origin:0
333
125
#: view:stock.picking:0
334
126
msgid "Origin"
335
127
msgstr "来源"
336
128
337
129
#. module: fc_delivery_plan
338
130
#: help:stock.picking.in,dts_id:0
339
131
msgid "Delivery time or turn to receive"
340
132
msgstr "配送时间(收货)"
341
133
342
134
#. module: fc_delivery_plan
343
135
#: field:delivery.route.line,exceptions:0
344
136
msgid "Received with exceptions"
345
137
msgstr "收货例外"
346
138
347
139
#. module: fc_delivery_plan
348
140
#: model:ir.model,name:fc_delivery_plan.model_stock_move
349
141
msgid "Stock Move"
350
142
msgstr "库存调拨"
351
143
352
144
#. module: fc_delivery_plan
353
145
#: model:ir.model,name:fc_delivery_plan.model_delivery_dts_to_vans
354
146
msgid "delivery.dts_to_vans"
355
147
msgstr "delivery.dts_to_vans"
356
148
357
149
#. module: fc_delivery_plan
358
150
#: field:delivery.change.dts,dts_id:0
359
151
#: field:delivery.driver_for_routes,dts_id:0
360
152
#: field:delivery.dts_to_routes,dts_id:0
361
153
#: field:delivery.dts_to_vans,dts_id:0
362
154
#: view:delivery.route:0
363
155
#: view:delivery.route.line:0
364
156
#: field:delivery.route.line,dts_id:0
365
157
#: view:sale.order:0
366
158
#: field:sale.order,dts_id:0
367
159
#: field:stock.move,dts_id:0
368
160
#: view:stock.picking:0
369
161
#: field:stock.picking.in,dts_id:0
370
162
#: field:stock.picking.in,route_line_id:0
371
163
#: field:stock.picking.out,route_line_id:0
372
164
msgid "Delivery Time"
373
165
msgstr "发货时间"
374
166
375
167
#. module: fc_delivery_plan
376
168
#: view:stock.picking:0
377
169
msgid "Ready"
378
170
msgstr "就绪"
379
171
380
172
#. module: fc_delivery_plan
381
173
#: view:delivery.driver:0
382
174
#: view:delivery.route:0
383
175
#: view:delivery.route.line:0
384
176
msgid "Edit..."
385
177
msgstr "编辑..."
386
178
387
179
#. module: fc_delivery_plan
388
180
#: field:delivery.route.line,adjustment:0
389
181
msgid "Adjustment"
390
182
msgstr "调整"
391
183
392
184
#. module: fc_delivery_plan
393
185
#: model:ir.model,name:fc_delivery_plan.model_stock_picking_out
394
186
msgid "Delivery Orders"
395
187
msgstr "送货单"
396
188
397
189
#. module: fc_delivery_plan
398
190
#: field:delivery.change.dts,pts_id:0
399
191
#: field:mrp.production,pts_id:0
400
192
#: field:procurement.order,pts_id:0
401
193
#: view:sale.order:0
402
194
#: view:stock.picking:0
403
195
#: field:stock.picking.in,pts_id:0
404
196
msgid "Preparation Time"
405
197
msgstr "拣货时间"
406
198
407
199
#. module: fc_delivery_plan
408
200
#: model:ir.ui.menu,name:fc_delivery_plan.menu_delivery_delivery_payment
409
201
msgid "Delivery Payments"
410
202
msgstr "发货支付"
411
203
412
204
#. module: fc_delivery_plan
413
205
#: field:delivery.route.line,vip:0
414
206
msgid "is VIP ?"
415
207
msgstr "是否 VIP ?"
416
208
417
209
#. module: fc_delivery_plan
418
210
#: view:delivery.driver_for_routes:0
419
211
#: view:delivery.dts_to_routes:0
420
212
#: view:delivery.dts_to_vans:0
421
213
msgid "Confirm"
422
214
msgstr "确认"
423
215
424
216
#. module: fc_delivery_plan
425
217
#: view:stock.picking:0
426
218
msgid "Internal Picking List"
427
219
msgstr "内部分拣单"
428
220
429
221
#. module: fc_delivery_plan
430
222
#: view:delivery.route.line:0
431
223
msgid "State"
432
224
msgstr "状态"
433
225
434
226
#. module: fc_delivery_plan
435
227
#: model:ir.model,name:fc_delivery_plan.model_stock_picking
436
228
msgid "Picking List"
437
229
msgstr "发货单"
438
230
439
231
#. module: fc_delivery_plan
440
232
#: model:ir.model,name:fc_delivery_plan.model_delivery_dts_to_routes
441
233
msgid "delivery.dts_to_routes"
442
234
msgstr "delivery.dts_to_routes"
443
235
444
236
#. module: fc_delivery_plan
445
237
#: field:delivery.return.reason,type:0
446
238
#: field:delivery.time,type:0
447
239
msgid "Type"
448
240
msgstr "类型"
449
241
450
242
#. module: fc_delivery_plan
451
243
#: view:stock.picking:0
452
244
msgid "Expected Date"
453
245
msgstr "预计日期"
454
246
455
247
#. module: fc_delivery_plan
456
248
#: selection:stock.picking.in,delivery_state:0
457
249
msgid "Delivered with exception"
458
250
msgstr "发货例外"
459
251
460
252
#. module: fc_delivery_plan
461
253
#: model:ir.model,name:fc_delivery_plan.model_delivery_route_line
462
254
msgid "delivery.route.line"
463
255
msgstr "delivery.route.line"
464
256
465
257
#. module: fc_delivery_plan
466
258
#: selection:delivery.route.line,complete_state:0
467
259
msgid "Not planned"
468
260
msgstr "未计划"
469
261
470
262
#. module: fc_delivery_plan
471
263
#: field:delivery.route.line,partner_phone:0
472
264
msgid "Partner Phone"
473
265
msgstr "客户电话"
474
266
475
267
#. module: fc_delivery_plan
476
268
#: view:stock.picking:0
477
269
msgid "Related Order"
478
270
msgstr "相关单据"
479
271
480
272
#. module: fc_delivery_plan
481
273
#: view:stock.picking:0
482
274
msgid "Confirmed Internal Moves"
483
275
msgstr "确认内部调拨"
484
276
485
277
#. module: fc_delivery_plan
486
278
#: selection:delivery.route.line,complete_state:0
487
279
msgid "No redelivery"
488
280
msgstr "未重新发货"
489
281
490
282
#. module: fc_delivery_plan
491
283
#: view:stock.picking:0
492
284
msgid "Order Date"
493
285
msgstr "订单日期"
494
286
495
287
#. module: fc_delivery_plan
496
288
#: model:ir.model,name:fc_delivery_plan.model_procurement_order
497
289
msgid "Procurement"
498
290
msgstr "需求单"
499
291
500
292
#. module: fc_delivery_plan
501
293
#: view:stock.picking:0
502
294
msgid "Orders planned for the Future"
503
295
msgstr "已计划订单"
504
296
505
297
#. module: fc_delivery_plan
506
298
#: selection:delivery.route.line,complete_state:0
507
299
msgid "Planned"
508
300
msgstr "已计划"
509
301
510
302
#. module: fc_delivery_plan
511
303
#: view:delivery.route:0
512
304
msgid "Delivery Routes"
513
305
msgstr "配送车次"
514
306
515
307
#. module: fc_delivery_plan
516
308
#: view:delivery.driver:0
517
309
#: view:delivery.route:0
518
310
#: view:delivery.route.line:0
519
311
msgid "Delete"
520
312
msgstr "删除"
521
313
522
314
#. module: fc_delivery_plan
523
315
#: field:delivery.route.line,return_reasons:0
524
316
msgid "Return Reasons"
525
317
msgstr "退货原因"
526
318
527
319
#. module: fc_delivery_plan
528
320
#: code:addons/fc_delivery_plan/sale.py:800
529
321
#: field:delivery.route.line,neighborhood:0
530
322
#, python-format
531
323
msgid "Neighborhood"
532
324
msgstr "邻居"
533
325
534
326
#. module: fc_delivery_plan
535
327
#: model:ir.actions.act_window,name:fc_delivery_plan.action_delivery_route_form_cs
536
328
#: model:ir.ui.menu,name:fc_delivery_plan.menu_action_delivery_route_form_cs
537
329
msgid "Delivery Route CS"
538
330
msgstr "发送路线 CS"
539
331
540
332
#. module: fc_delivery_plan
541
333
#: model:ir.model,name:fc_delivery_plan.model_delivery_time
542
334
msgid "delivery.time"
543
335
msgstr "delivery.time"
544
336
545
337
#. module: fc_delivery_plan
546
338
#: view:stock.picking:0
547
339
msgid "Past"
548
340
msgstr "过去"
549
341
550
342
#. module: fc_delivery_plan
551
343
#: view:stock.picking:0
552
344
msgid "Future"
553
345
msgstr "未来"
554
346
555
347
#. module: fc_delivery_plan
556
348
#: selection:stock.picking.in,delivery_state:0
557
349
msgid "Returned, no delivery"
558
350
msgstr "退回, 未发货"
559
351
560
352
#. module: fc_delivery_plan
561
353
#: field:delivery.route.line,amount_received:0
562
354
msgid "Received"
563
355
msgstr "已收"
564
356
565
357
#. module: fc_delivery_plan
566
358
#: view:delivery.route:0
567
359
#: view:delivery.route.line:0
568
360
#: model:ir.actions.report.xml,name:fc_delivery_plan.report_delivery_route_print
569
361
msgid "Delivery Route"
570
362
msgstr "配送车次"
571
363
572
364
#. module: fc_delivery_plan
573
365
#: view:delivery.change.dts:0
574
366
#: view:delivery.driver_for_routes:0
575
367
#: view:delivery.dts_to_routes:0
576
368
#: view:delivery.dts_to_vans:0
577
369
msgid "or"
578
370
msgstr "或者"
579
371
580
372
#. module: fc_delivery_plan
581
373
#: view:stock.picking:0
582
374
msgid "Picking already processed"
583
375
msgstr "分拣已处理"
584
376
585
377
#. module: fc_delivery_plan
586
378
#: field:res.users,dts_id:0
587
379
msgid "Last Used Delivery Time"
588
380
msgstr "上次配送时间"
589
381
590
382
#. module: fc_delivery_plan
591
383
#: code:addons/fc_delivery_plan/sale.py:648
592
384
#, python-format
593
385
msgid "The Route %s is confirmed, you can not add lines to it."
594
386
msgstr "路线 %s 已经确认, 不可增加新的明细."
595
387
596
388
#. module: fc_delivery_plan
597
389
#: model:ir.model,name:fc_delivery_plan.model_mrp_production
598
390
msgid "Manufacturing Order"
599
391
msgstr "生产订单"
600
392
601
393
#. module: fc_delivery_plan
602
394
#: model:ir.ui.menu,name:fc_delivery_plan.menu_delivery_wizard
603
395
msgid "Prepare Delivery Routes"
604
396
msgstr "准备配送路线"
605
397
606
398
#. module: fc_delivery_plan
607
399
#: view:stock.picking:0
608
400
msgid "Status"
609
401
msgstr "状态"
610
402
611
403
#. module: fc_delivery_plan
612
404
#: model:ir.model,name:fc_delivery_plan.model_sale_order
613
405
msgid "Sales Order"
614
406
msgstr "销售订单"
615
407
616
408
#. module: fc_delivery_plan
617
409
#: view:delivery.driver:0
618
410
#: view:delivery.route:0
619
411
#: view:delivery.route.line:0
620
412
msgid "í"
621
413
msgstr "í"
622
414
623
415
#. module: fc_delivery_plan
624
416
#: model:ir.model,name:fc_delivery_plan.model_stock_tracking
625
417
msgid "Packs"
626
418
msgstr "包装"
627
419
628
420
#. module: fc_delivery_plan
629
421
#: model:ir.actions.act_window,name:fc_delivery_plan.action_delivery_line_form_cs
630
422
#: model:ir.ui.menu,name:fc_delivery_plan.menu_action_delivery_line_form_cs
631
423
msgid "Delivery Route Line CS"
632
424
msgstr "路线明细 CS"
633
425
634
426
#. module: fc_delivery_plan
635
427
#: code:addons/fc_delivery_plan/sale.py:824
636
428
#: view:delivery.dts_to_vans:0
637
429
#: model:ir.actions.act_window,name:fc_delivery_plan.action_dts_to_vans
638
430
#: model:ir.ui.menu,name:fc_delivery_plan.menu_action_dts_to_vans
639
431
#, python-format
640
432
msgid "Prepare Vans for DTS"
641
433
msgstr "根据配送时间 Vans拣货"
642
434
643
435
#. module: fc_delivery_plan
644
436
#: selection:delivery.route.line,complete_state:0
645
437
#: view:stock.picking:0
646
438
#: selection:stock.picking.in,delivery_state:0
647
439
msgid "In delivery"
648
440
msgstr "配送中"
649
441
650
442
#. module: fc_delivery_plan
651
443
#: field:picking.batch,active:0
652
444
msgid "Active"
653
445
msgstr "可用"
654
446
655
447
#. module: fc_delivery_plan
656
448
#: model:ir.actions.act_window,name:fc_delivery_plan.action_picking_batch
657
449
#: view:picking.batch:0
658
450
#: field:stock.picking,batch_id:0
659
451
#: field:stock.picking.in,batch_id:0
660
452
#: field:stock.picking.out,batch_id:0
661
453
msgid "Picking Batch"
662
454
msgstr "拣货批次"
663
455
664
456
#. module: fc_delivery_plan
665
457
#: selection:stock.picking.in,delivery_state:0
666
458
msgid "Not yet planned for delivery"
667
459
msgstr "还未计划配送"
668
460
669
461
#. module: fc_delivery_plan
670
462
#: selection:delivery.route.line,complete_state:0
671
463
msgid "Exception"
672
464
msgstr "例外"
673
465
674
466
#. module: fc_delivery_plan
675
467
#: view:delivery.route.line:0
676
468
msgid "Delivery Route Lines"
677
469
msgstr "配送车次清单"
678
470
679
471
#. module: fc_delivery_plan
680
472
#: selection:delivery.time,type:0
681
473
msgid "Preparation"
682
474
msgstr "拣货"
683
475
684
476
#. module: fc_delivery_plan
685
477
#: field:delivery.route.line,amount_unpaid:0
686
478
msgid "Unpaid"
687
479
msgstr "未付"
688
480
689
481
#. module: fc_delivery_plan
690
482
#: field:stock.tracking,picking_id:0
691
483
msgid "Picking Related"
692
484
msgstr "相关分拣"
693
485
694
486
#. module: fc_delivery_plan
695
487
#: field:delivery.change.dts,action:0
696
488
msgid "Action"
697
489
msgstr "动作"
698
490
699
491
#. module: fc_delivery_plan
700
492
#: field:delivery.route.line,box_type:0
701
493
msgid "Box Type"
702
494
msgstr "Box 类型"
703
495
704
496
#. module: fc_delivery_plan
705
497
#: view:delivery.route:0
706
498
#: view:delivery.route.line:0
707
499
msgid "Delivery Route for Today"
708
500
msgstr "今日配送路线"
709
501
710
502
#. module: fc_delivery_plan
711
503
#: code:addons/fc_delivery_plan/sale.py:840
712
504
#: view:delivery.dts_to_routes:0
713
505
#: model:ir.actions.act_window,name:fc_delivery_plan.action_dts_to_routes
714
506
#: model:ir.ui.menu,name:fc_delivery_plan.menu_action_dts_to_routes
715
507
#, python-format
716
508
msgid "Prepare Routes for DTS"
717
509
msgstr "根据配送时间 预备路线"
718
510
719
511
#. module: fc_delivery_plan
720
512
#: field:delivery.route.line,driver_phone:0
721
513
msgid "Driver Phone"
722
514
msgstr "司机电话"
723
515
724
516
#. module: fc_delivery_plan
725
517
#: view:stock.picking:0
726
518
msgid "Orders planned for Today"
727
519
msgstr "今日安排订单"
728
520
729
521
#. module: fc_delivery_plan
730
522
#: view:delivery.route:0
731
523
#: view:stock.picking:0
732
524
msgid "Done"
733
525
msgstr "完成"
734
526
735
527
#. module: fc_delivery_plan
736
528
#: view:delivery.change.dts:0
737
529
#: view:delivery.driver_for_routes:0
738
530
#: view:delivery.dts_to_routes:0
739
531
#: view:delivery.dts_to_vans:0
740
532
#: selection:delivery.route.line,complete_state:0
741
533
msgid "Cancel"
742
534
msgstr "取消"
743
535
744
536
#. module: fc_delivery_plan
745
537
#: selection:stock.picking.in,delivery_state:0
746
538
msgid "Planned for delivery"
747
539
msgstr "配送计划"
748
540
749
541
#. module: fc_delivery_plan
750
542
#: selection:delivery.route.line,complete_state:0
751
543
#: view:stock.picking:0
752
544
#: selection:stock.picking.in,delivery_state:0
753
545
msgid "Delivered"
754
546
msgstr "已配送"
755
547
756
548
#. module: fc_delivery_plan
757
549
#: code:addons/fc_delivery_plan/sale.py:856
758
550
#: view:delivery.driver_for_routes:0
759
551
#: model:ir.actions.act_window,name:fc_delivery_plan.action_driver_for_routes
760
552
#: model:ir.ui.menu,name:fc_delivery_plan.menu_action_driver_for_routes
761
553
#, python-format
762
554
msgid "Choose Driver / Deliver for DTS"
763
555
msgstr "根据配送时间 选择司机 / 送货"
764
556
765
557
#. module: fc_delivery_plan
766
558
#: model:ir.actions.act_window,name:fc_delivery_plan.action_delivery_return_type
767
559
#: model:ir.ui.menu,name:fc_delivery_plan.menu_action_delivery_return_type
768
560
msgid "Return Reason Type"
769
561
msgstr "退货原因类型"
770
562
771
563
#. module: fc_delivery_plan
772
564
#: model:ir.model,name:fc_delivery_plan.model_stock_picking_in
773
565
msgid "Incoming Shipments"
774
566
msgstr "入库"
775
567
776
568
#. module: fc_delivery_plan
777
569
#: field:picking.batch,picking_ids:0
778
570
msgid "Contains"
779
571
msgstr "包含"
780
572
781
573
#. module: fc_delivery_plan
782
574
#: field:delivery.route.line,complete_state:0
783
575
#: view:stock.picking:0
784
576
#: field:stock.picking.in,delivery_state:0
785
577
msgid "Delivery State"
786
578
msgstr "配送状态"
787
579
788
580
#. module: fc_delivery_plan
789
581
#: model:ir.model,name:fc_delivery_plan.model_picking_batch
790
582
msgid "picking.batch"
791
583
msgstr "拣货批次"
792
584
793
585
#. module: fc_delivery_plan
794
586
#: field:delivery.route.line,so_payment_method:0
795
587
msgid "Payment Method"
796
588
msgstr "付款方式"
797
589
798
590
#. module: fc_delivery_plan
799
591
#: selection:delivery.route.line,complete_state:0
800
592
msgid "Returned"
801
593
msgstr "已退货"
802
594
803
595
#. module: fc_delivery_plan
804
596
#: view:stock.picking:0
805
597
msgid "Assigned Internal Moves"
806
598
msgstr "指定的内部调拨"
807
599
808
600
#. module: fc_delivery_plan
809
601
#: view:stock.picking:0
810
602
msgid "Journal"
811
603
msgstr "账簿"
812
604
813
605
#. module: fc_delivery_plan
814
606
#: model:ir.actions.act_window,name:fc_delivery_plan.action_delivery_route_driver_kanban
815
607
msgid "Delivery Route Driver Kanban"
816
608
msgstr "配送路线司机看板"
817
609
818
610
#. module: fc_delivery_plan
819
611
#: selection:delivery.time,type:0
820
612
msgid "Delivery"
821
613
msgstr "配送"
822
614
823
615
#. module: fc_delivery_plan
824
616
#: model:ir.model,name:fc_delivery_plan.model_delivery_driver_for_routes
825
617
msgid "delivery.driver_for_routes"
826
618
msgstr "delivery.driver_for_routes"
827
619
828
620
#. module: fc_delivery_plan
829
621
#: view:stock.picking:0
830
622
msgid "Waiting"
831
623
msgstr "正在等待"
832
624
833
625
#. module: fc_delivery_plan
834
626
#: selection:delivery.change.dts,action:0
835
627
msgid "Change DTS/PTS"
836
628
msgstr "变更 DTS/PTS"
837
629
838
630
#. module: fc_delivery_plan
839
631
#: field:delivery.return.reason,reason:0
840
632
#: field:delivery.return.type,name:0
841
633
#: field:picking.batch,name:0
842
634
msgid "Name"
843
635
msgstr "名称"
844
636
845
637
#. module: fc_delivery_plan
846
638
#: view:stock.picking:0
847
639
msgid "Not Planned"
848
640
msgstr "未计划"
849
641
850
642
#. module: fc_delivery_plan
851
643
#: view:delivery.route.line:0
852
644
msgid "Route"
853
645
msgstr "路线"
854
646
855
647
#. module: fc_delivery_plan
856
648
#: selection:stock.picking.in,delivery_state:0
857
649
msgid "Delivered and returned"
858
650
msgstr "已配送和已退回"
859
651
860
652
#. module: fc_delivery_plan
861
653
#: field:stock.picking.in,carrier_id:0
862
654
msgid "Carrier"
863
655
msgstr "运输工具"
864
656
865
657
#. module: fc_delivery_plan
866
658
#: view:delivery.change.dts:0
867
659
#: model:ir.actions.act_window,name:fc_delivery_plan.action_stock_change_dts_wizard
868
660
#: model:ir.model,name:fc_delivery_plan.model_delivery_change_dts
869
661
msgid "Change DTS / PTS"
870
662
msgstr "变更 DTS / PTS"
871
663
872
664
#. module: fc_delivery_plan
873
665
#: field:delivery.return.reason,route_line_id:0
874
666
msgid "Delivery Route Line"
875
667
msgstr "配送路线明细"
876
668
877
669
#. module: fc_delivery_plan
878
670
#: model:ir.model,name:fc_delivery_plan.model_res_users
879
671
msgid "Users"
880
672
msgstr "用户"
881
673
882
674
#. module: fc_delivery_plan
883
675
#: model:ir.model,name:fc_delivery_plan.model_delivery_return_reason
884
676
msgid "delivery.return.reason"
885
677
msgstr "delivery.return.reason"
886
678
887
679
#. module: fc_delivery_plan
888
680
#: field:delivery.return.type,sequence:0
889
681
msgid "Sequence"
890
682
msgstr "序号"
891
683
892
684
#. module: fc_delivery_plan
893
685
#: model:ir.model,name:fc_delivery_plan.model_delivery_return_type
894
686
msgid "delivery.return.type"
895
687
msgstr "delivery.return.type"
896
688
897
689
#. module: fc_delivery_plan
898
690
#: view:stock.picking:0
899
691
msgid "No batch"
900
692
msgstr "未设批次"
901
693
902
694
#. module: fc_delivery_plan
903
695
#: field:delivery.route.line,amount_total:0
904
696
msgid "Total"
905
697
msgstr "合计"
906
698
907
699
#. module: fc_delivery_plan
908
700
#: field:delivery.route.line,account_remark:0
909
701
msgid "Remark Accounting"
910
702
msgstr "财务备注"
911
703
912
0
704
913
=== added file 'delivery_plan/partner.py'
914
--- delivery_plan/partner.py	1970-01-01 00:00:00 +0000
915
+++ delivery_plan/partner.py	2013-09-09 08:37:27 +0000
916
@@ -0,0 +1,33 @@
917
1
# -*- coding: utf-8 -*-
918
2
##############################################################################
919
3
#
920
4
#    OpenERP, Open Source Management Solution
921
5
#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
922
6
#    Author: Yannick Gouin <yannick.gouin@elico-corp.com>
923
7
#
924
8
#    This program is free software: you can redistribute it and/or modify
925
9
#    it under the terms of the GNU Affero General Public License as
926
10
#    published by the Free Software Foundation, either version 3 of the
927
11
#    License, or (at your option) any later version.
928
12
#
929
13
#    This program is distributed in the hope that it will be useful,
930
14
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
931
15
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
932
16
#    GNU Affero General Public License for more details.
933
17
#
934
18
#    You should have received a copy of the GNU Affero General Public License
935
19
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
936
20
#
937
21
##############################################################################
938
22
939
23
from openerp.osv import osv, fields
940
24
941
25
942
26
class res_partner(osv.osv):
943
27
    _inherit = "res.partner"
944
28
    
945
29
    _columns = {
946
30
        'deliver_zone':   fields.char('Delivery Zone', size= 64),
947
31
    }
948
32
949
33
res_partner()
950
0
\ No newline at end of file
34
\ No newline at end of file
951
1
35
952
=== added directory 'delivery_plan/report'
953
=== added file 'delivery_plan/report/__init__.py'
954
--- delivery_plan/report/__init__.py	1970-01-01 00:00:00 +0000
955
+++ delivery_plan/report/__init__.py	2013-09-09 08:37:27 +0000
956
@@ -0,0 +1,32 @@
957
1
# -*- encoding: utf-8 -*-
958
2
##############################################################################
959
3
#
960
4
#    OpenERP, Open Source Management Solution
961
5
# Copyright (c) 2011 Cubic ERP - Teradata SAC. (http://cubicerp.com).
962
6
#
963
7
# WARNING: This program as such is intended to be used by professional
964
8
# programmers who take the whole responsability of assessing all potential
965
9
# consequences resulting from its eventual inadequacies and bugs
966
10
# End users who are looking for a ready-to-use solution with commercial
967
11
# garantees and support are strongly adviced to contract a Free Software
968
12
# Service Company
969
13
#
970
14
# This program is Free Software; you can redistribute it and/or
971
15
# modify it under the terms of the GNU General Public License
972
16
# as published by the Free Software Foundation; either version 2
973
17
# of the License, or (at your option) any later version.
974
18
#
975
19
# This program is distributed in the hope that it will be useful,
976
20
# but WITHOUT ANY WARRANTY; without even the implied warranty of
977
21
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
978
22
# GNU General Public License for more details.
979
23
#
980
24
# You should have received a copy of the GNU General Public License
981
25
# along with this program; if not, write to the Free Software
982
26
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
983
27
#
984
28
##############################################################################
985
29
986
30
import delivery_route_print
987
31
988
32
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
989
0
\ No newline at end of file
33
\ No newline at end of file
990
1
34
991
=== added file 'delivery_plan/report/delivery_route_print.mako'
992
--- delivery_plan/report/delivery_route_print.mako	1970-01-01 00:00:00 +0000
993
+++ delivery_plan/report/delivery_route_print.mako	2013-09-09 08:37:27 +0000
994
@@ -0,0 +1,110 @@
995
1
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
996
2
<html>
997
3
    <head>
998
4
        <meta content="text/html; charset=UTF-8" http-equiv="content-type"> 
999
5
        <style type="text/css">
1000
6
        	${css}
1001
7
        </style>
1002
8
    </head>
1003
9
    <body>
1004
10
    <% cpt = 0 %>
1005
11
        %for delivery_route in objects :
1006
12
%if cpt > 0:
1007
13
<div style="page-break-after: always;"><span style="display: none;"> </span></div>
1008
14
%endif
1009
15
		<div class="title">Delivery Distribution Control Sheet (配送交接控制表)</div>
1010
16
		<div style="font-size:12px;font-style:italic;text-align:center;">Ref / 编号 : ${delivery_route.name}</div>
1011
17
		<td><b></b></td><td></td>
1012
18
		<br />
1013
19
		<table class="basic_table" width="100%">
1014
20
		<tr>
1015
21
		    <td width="17%"><b>Date<br />日期</b></td><td width="33%">${delivery_route.date}</td>
1016
22
		    <td width="17%"><b>Time Slot<br />时间段</b></td><td>${delivery_route.dts_id.name or '&nbsp;'}</td>
1017
23
		</tr>
1018
24
		<tr>
1019
25
			<td><b>Driver<br />驾驶员</b></td><td>${delivery_route.driver_id.name or '&nbsp;'}</td>
1020
26
		    <td><b>Deliver<br />送货员</b></td><td>${delivery_route.picker_id.name or '&nbsp;'}</td>
1021
27
		</tr>
1022
28
		<tr>
1023
29
			<td><b>Departure Time<br />出发时间</b></td><td>${delivery_route.departure_date or '&nbsp;'}</td>
1024
30
		    <td><b>Operation Rep<br />运营人员</b></td><td></td>
1025
31
		</tr>
1026
32
		</table>
1027
33
		<br />
1028
34
        <div class="main">
1029
35
            <table width="100%" class="basic_table">
1030
36
                <tbody>
1031
37
                    <tr style="font-weight:bold;">
1032
38
                    	<td style="height:26px;" colspan="4">Reason for delayed/Early departure 延迟的原因</td>
1033
39
                    	<td colspan="2">出库公里数: </td>
1034
40
                    	<td colspan="2">回库公里数: </td>
1035
41
                    </tr>
1036
42
                    <tr style="font-weight:bold;">
1037
43
                    	<td style="vertical-align:top; height:30px;" colspan="8">&nbsp;</td>
1038
44
                    </tr>
1039
45
                    <tr style="font-weight:bold;">
1040
46
                    	<td style="text-align:center; height:16px;" colspan="8">List of deliveries / 交货清单</td>
1041
47
                    </tr>
1042
48
                    <tr style="font-weight:bold;">
1043
49
                    	<td style="vertical-align:top; width:15px;">No</td>
1044
50
                    	<td style="vertical-align:top; width:70px;">Order <br /> 单号</td>
1045
51
                    	<td style="vertical-align:top; width:48px;">T<br />装箱</td>
1046
52
                        <td style="vertical-align:top; width:175px;">Address<br />地址</td>
1047
53
                        <td style="vertical-align:top;">Time<br />时间要求</td>
1048
54
                        <td style="vertical-align:top;">Payment<br />支付方式</td>
1049
55
                        <td style="vertical-align:top; width:75px;">Arrive Time<br />到达时间</td>
1050
56
                        <td style="vertical-align:top; width:75px;">Observation<br />结果</td>
1051
57
                    </tr>
1052
58
                    <% cpt=0 %>
1053
59
                    %for line in delivery_route.line_ids:
1054
60
                    	<% cpt+=1 %>
1055
61
                    	<% iced  = False %>
1056
62
            			<% warm  = False %>
1057
63
            			<% other = False %>
1058
64
                    %if line.vip:
1059
65
                    <tr style="font-style:italic;">
1060
66
                    %else:
1061
67
                    <tr>
1062
68
					%endif
1063
69
                    	<td style="vertical-align: top;"><div class="dontcutme">${cpt}</div></td>
1064
70
                    	<td style="vertical-align: top;"><div class="dontcutme">${line.origin and line.origin or ''}<!--${line.picking_id.name and '('+ line.picking_id.name + ')' or ''}--></div></td>
1065
71
                    	<td style="vertical-align: top;"><div class="dontcutme"><%
1066
72
                        pack_set = set([ move.product_id.joomla_deliver_in for move in line.picking_id.move_lines ])
1067
73
                        %>
1068
74
                        % for pack in pack_set:
1069
75
                        	%if pack in ['warm', 'iced', 'iced_n_warm','cold']:
1070
76
                    			%if pack in ['iced', 'iced_n_warm'] and not iced:
1071
77
	                    			<input type="checkbox" /> 冻F<br />
1072
78
	                    			<% iced = True %>
1073
79
	                			%endif
1074
80
	                			%if pack in ['warm', 'iced_n_warm'] and not warm:
1075
81
	                    			<input type="checkbox" /> 热W<br />
1076
82
	                    			<% warm = True %>
1077
83
	                    		%endif
1078
84
	                    		%if pack in ['cold']:
1079
85
	                    			<input type="checkbox" /> 冷C<br />
1080
86
	                    			<% warm = True %>
1081
87
	                    		%endif
1082
88
                			%else:
1083
89
                				%if not other:
1084
90
                    				<input type="checkbox" /> 常温<br />
1085
91
                    				<% other = True %>
1086
92
                    			%endif
1087
93
                    		%endif
1088
94
                    	%endfor
1089
95
                        </div></td>
1090
96
                        <td style="vertical-align: top;"><div class="dontcutme">${line.address_id.name or  ''}<br />${line.street or line.address_id.street or  ''}</div></td>
1091
97
		                <td style="vertical-align: top;"><div class="dontcutme">${line.customer_date or ''}</div></td>
1092
98
		                <td style="vertical-align: top;"><div class="dontcutme">${line.so_payment_method or ''}</div></td>
1093
99
                        <td style="vertical-align: top;">&nbsp;</td>
1094
100
                        <td style="vertical-align: top;">&nbsp;</td>
1095
101
                    </tr>
1096
102
                    %endfor
1097
103
                </tbody>
1098
104
            </table>
1099
105
        </div>
1100
106
        <div style="page-break-after: auto;"><span style="display: none;"> </span></div>
1101
107
        <% cpt+=1 %>
1102
108
        %endfor
1103
109
    </body>
1104
110
</html>
1105
0
\ No newline at end of file
111
\ No newline at end of file
1106
1
112
1107
=== added file 'delivery_plan/report/delivery_route_print.mako.1'
1108
--- delivery_plan/report/delivery_route_print.mako.1	1970-01-01 00:00:00 +0000
1109
+++ delivery_plan/report/delivery_route_print.mako.1	2013-09-09 08:37:27 +0000
1110
@@ -0,0 +1,111 @@
1111
1
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
1112
2
<html>
1113
3
    <head>
1114
4
        <meta content="text/html; charset=UTF-8" http-equiv="content-type"> 
1115
5
        <style type="text/css">
1116
6
        	${css}
1117
7
        </style>
1118
8
    </head>
1119
9
    <body>
1120
10
    <% cpt = 0 %>
1121
11
        %for delivery_route in objects :
1122
12
%if cpt > 0:
1123
13
<div style="page-break-after: always;"><span style="display: none;"> </span></div>
1124
14
%endif
1125
15
		<div class="title">Delivery Distribution Control Sheet (配送交接控制表)</div>
1126
16
		<div style="font-size:12px;font-style:italic;text-align:center;">Ref / 编号 : ${delivery_route.name}</div>
1127
17
		<td><b></b></td><td></td>
1128
18
		<br />
1129
19
		<table class="basic_table" width="100%">
1130
20
		<tr>
1131
21
		    <td width="17%"><b>Date<br />日期</b></td><td width="33%">${delivery_route.date}</td>
1132
22
		    <td width="17%"><b>Time Slot<br />时间段</b></td><td>${delivery_route.dts_id.name or '&nbsp;'}</td>
1133
23
		</tr>
1134
24
		<tr>
1135
25
			<td><b>Driver<br />驾驶员</b></td><td>${delivery_route.driver_id.name or '&nbsp;'}</td>
1136
26
		    <td><b>Deliver<br />送货员</b></td><td>${delivery_route.picker_id.name or '&nbsp;'}</td>
1137
27
		</tr>
1138
28
		<tr>
1139
29
			<td><b>Departure Time<br />出发时间</b></td><td>${delivery_route.departure_date or '&nbsp;'}</td>
1140
30
		    <td><b>Operation Rep<br />运营人员</b></td><td></td>
1141
31
		</tr>
1142
32
		</table>
1143
33
		<br />
1144
34
        <div class="main">
1145
35
            <table width="100%" class="basic_table">
1146
36
                <tbody>
1147
37
                    <tr style="font-weight:bold;">
1148
38
                    	<td style="border:0; padding-left:15px;vertical-align:top; height:16px;" colspan="8">Reason for delayed/Early departure 延迟的原因
1149
39
                    	/&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
1150
40
                    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 出库公里数 <u>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;            </u>
1151
41
                    	/&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 回库公里数 <u>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;           </u></td>
1152
42
                    </tr>
1153
43
                    <tr style="font-weight:bold;">
1154
44
                    	<td style="vertical-align:top; height:30px;" colspan="8">&nbsp;</td>
1155
45
                    </tr>
1156
46
                    <tr style="font-weight:bold;">
1157
47
                    	<td style="text-align:center; height:16px;" colspan="8">List of deliveries / 交货清单</td>
1158
48
                    </tr>
1159
49
                    <tr style="font-weight:bold;">
1160
50
                    	<td style="vertical-align:top; width:15px;">No</td>
1161
51
                    	<td style="vertical-align:top; width:70px;">Order <br /> 单号</td>
1162
52
                    	<td style="vertical-align:top; width:48px;">T<br />装箱</td>
1163
53
                        <td style="vertical-align:top; width:175px;">Address<br />地址</td>
1164
54
                        <td style="vertical-align:top;">Time<br />时间要求</td>
1165
55
                        <td style="vertical-align:top;">Payment<br />支付方式</td>
1166
56
                        <td style="vertical-align:top; width:75px;">Arrive Time<br />到达时间</td>
1167
57
                        <td style="vertical-align:top; width:75px;">Observation<br />结果</td>
1168
58
                    </tr>
1169
59
                    <% cpt=0 %>
1170
60
                    %for line in delivery_route.line_ids:
1171
61
                    	<% cpt+=1 %>
1172
62
                    	<% iced  = False %>
1173
63
            			<% warm  = False %>
1174
64
            			<% other = False %>
1175
65
                    %if line.vip:
1176
66
                    <tr style="font-style:italic;">
1177
67
                    %else:
1178
68
                    <tr>
1179
69
					%endif
1180
70
                    	<td style="vertical-align: top;"><div class="dontcutme">${cpt}</div></td>
1181
71
                    	<td style="vertical-align: top;"><div class="dontcutme">${line.origin and line.origin or ''}<!--${line.picking_id.name and '('+ line.picking_id.name + ')' or ''}--></div></td>
1182
72
                    	<td style="vertical-align: top;"><div class="dontcutme"><%
1183
73
                        pack_set = set([ move.product_id.joomla_deliver_in for move in line.picking_id.move_lines ])
1184
74
                        %>
1185
75
                        % for pack in pack_set:
1186
76
                        	%if pack in ['warm', 'iced', 'iced_n_warm']:
1187
77
                    			%if pack in ['iced', 'iced_n_warm'] and not iced:
1188
78
	                    			<input type="checkbox" /> 冻F<br />
1189
79
	                    			<% iced = True %>
1190
80
	                			%endif
1191
81
	                			%if pack in ['warm', 'iced_n_warm'] and not warm:
1192
82
	                    			<input type="checkbox" /> 热W<br />
1193
83
	                    			<% warm = True %>
1194
84
	                    		%endif
1195
85
	                    		%if pack in ['cold']:
1196
86
	                    			<input type="checkbox" /> 冷C<br />
1197
87
	                    			<% warm = True %>
1198
88
	                    		%endif
1199
89
                			%else:
1200
90
                				%if not other:
1201
91
                    				<input type="checkbox" /> 常温<br />
1202
92
                    				<% other = True %>
1203
93
                    			%endif
1204
94
                    		%endif
1205
95
                    	%endfor
1206
96
                        </div></td>
1207
97
                        <td style="vertical-align: top;"><div class="dontcutme">${line.address_id.name or  ''}<br />${line.street or line.address_id.street or  ''}</div></td>
1208
98
		                <td style="vertical-align: top;"><div class="dontcutme">${line.customer_date or ''}</div></td>
1209
99
		                <td style="vertical-align: top;"><div class="dontcutme">${line.so_payment_method or ''}</div></td>
1210
100
                        <td style="vertical-align: top;">&nbsp;</td>
1211
101
                        <td style="vertical-align: top;">&nbsp;</td>
1212
102
                    </tr>
1213
103
                    %endfor
1214
104
                </tbody>
1215
105
            </table>
1216
106
        </div>
1217
107
        <div style="page-break-after: auto;"><span style="display: none;"> </span></div>
1218
108
        <% cpt+=1 %>
1219
109
        %endfor
1220
110
    </body>
1221
111
</html>
1222
0
\ No newline at end of file
112
\ No newline at end of file
1223
1
113
1224
=== added file 'delivery_plan/report/delivery_route_print.py'
1225
--- delivery_plan/report/delivery_route_print.py	1970-01-01 00:00:00 +0000
1226
+++ delivery_plan/report/delivery_route_print.py	2013-09-09 08:37:27 +0000
1227
@@ -0,0 +1,39 @@
1228
1
# -*- encoding: utf-8 -*-
1229
2
##############################################################################
1230
3
#
1231
4
#    OpenERP, Open Source Management Solution    
1232
5
#    Copyright (c) 2010-2012 Elico Corp. All Rights Reserved.
1233
6
#    Author: Yannick Gouin <yannick.gouin@elico-corp.com>
1234
7
#    $Id$
1235
8
#
1236
9
#    This program is free software: you can redistribute it and/or modify
1237
10
#    it under the terms of the GNU General Public License as published by
1238
11
#    the Free Software Foundation, either version 3 of the License, or
1239
12
#    (at your option) any later version.
1240
13
#
1241
14
#    This program is distributed in the hope that it will be useful,
1242
15
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
1243
16
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1244
17
#    GNU General Public License for more details.
1245
18
#
1246
19
#    You should have received a copy of the GNU General Public License
1247
20
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
1248
21
#
1249
22
##############################################################################
1250
23
1251
24
import time
1252
25
1253
26
from report import report_sxw
1254
27
import pooler
1255
28
1256
29
class report_delivery_route_print(report_sxw.rml_parse):
1257
30
    _name = 'report.delivery.route.print'
1258
31
    
1259
32
    def __init__(self, cr, uid, name, context):
1260
33
        super(report_delivery_route_print, self).__init__(cr, uid, name, context)
1261
34
1262
35
1263
36
report_sxw.report_sxw('delivery.route.print', 'delivery.route',
1264
37
        'addons/fc_delivery_plan/report/delivery_route_print.mako', parser=report_delivery_route_print)
1265
38
1266
39
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1267
0
40
1268
=== added file 'delivery_plan/report/delivery_route_print.py.bak'
1269
--- delivery_plan/report/delivery_route_print.py.bak	1970-01-01 00:00:00 +0000
1270
+++ delivery_plan/report/delivery_route_print.py.bak	2013-09-09 08:37:27 +0000
1271
@@ -0,0 +1,53 @@
1272
1
# -*- coding: utf-8 -*-
1273
2
##############################################################################
1274
3
#
1275
4
#    OpenERP, Open Source Management Solution
1276
5
#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
1277
6
#
1278
7
#    This program is free software: you can redistribute it and/or modify
1279
8
#    it under the terms of the GNU Affero General Public License as
1280
9
#    published by the Free Software Foundation, either version 3 of the
1281
10
#    License, or (at your option) any later version.
1282
11
#
1283
12
#    This program is distributed in the hope that it will be useful,
1284
13
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
1285
14
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1286
15
#    GNU Affero General Public License for more details.
1287
16
#
1288
17
#    You should have received a copy of the GNU Affero General Public License
1289
18
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
1290
19
#
1291
20
##############################################################################
1292
21
1293
22
import time
1294
23
from report import report_sxw
1295
24
import netsvc
1296
25
1297
26
class report_delivery_route_print(report_sxw.rml_parse):
1298
27
    _name = 'report.delivery.route.print'
1299
28
    def __init__(self, cr, uid, name, context):
1300
29
        super(report_delivery_route_print, self).__init__(cr, uid, name, context)
1301
30
        self.localcontext.update({
1302
31
            'time': time,
1303
32
            'convert': self.convert,
1304
33
            'day': self.day,
1305
34
            'month': self.month,
1306
35
            'year': self.year,
1307
36
        })
1308
37
1309
38
    def convert(self, amount, currency): return self.pool.get('ir.translation').amount_to_text(amount, 'zh_cn', currency or 'Nuevo Sol')
1310
39
    
1311
40
    def day(self, date): return self.pool.get('ir.translation').date_part(date, 'day', format='number' ,lang='zh_cn')
1312
41
    
1313
42
    def month(self, date): return self.pool.get('ir.translation').date_part(date, 'month', format='text' ,lang='zh_cn')
1314
43
    
1315
44
    def year(self, date): return self.pool.get('ir.translation').date_part(date, 'year', format='number' ,lang='zh_cn')
1316
45
    
1317
46
report_sxw.report_sxw(
1318
47
    'delivery.route.print',
1319
48
    'delivery.route',
1320
49
    'addons/delivery_routes/report/delivery_route_print.rml',
1321
50
    parser=report_delivery_route_print,header="external"
1322
51
)
1323
52
1324
53
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1325
0
54
1326
=== added file 'delivery_plan/report/delivery_route_print.rml'
1327
--- delivery_plan/report/delivery_route_print.rml	1970-01-01 00:00:00 +0000
1328
+++ delivery_plan/report/delivery_route_print.rml	2013-09-09 08:37:27 +0000
1329
@@ -0,0 +1,243 @@
1330
1
<?xml version="1.0"?>
1331
2
<document filename="test.pdf">
1332
3
  <template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
1333
4
    <pageTemplate id="first">
1334
5
      <frame id="first" x1="16.0" y1="20.0" width="808" height="545"/>
1335
6
    </pageTemplate>
1336
7
  </template>
1337
8
  <stylesheet>
1338
9
    <blockTableStyle id="Standard_Outline">
1339
10
      <blockAlignment value="LEFT"/>
1340
11
      <blockValign value="TOP"/>
1341
12
    </blockTableStyle>
1342
13
    <blockTableStyle id="Table1">
1343
14
      <blockAlignment value="LEFT"/>
1344
15
      <blockValign value="TOP"/>
1345
16
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
1346
17
      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
1347
18
      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
1348
19
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
1349
20
      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
1350
21
      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
1351
22
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
1352
23
      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
1353
24
      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
1354
25
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
1355
26
      <lineStyle kind="LINEAFTER" colorName="#000000" start="3,0" stop="3,-1"/>
1356
27
      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
1357
28
      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
1358
29
    </blockTableStyle>
1359
30
    <blockTableStyle id="Table2">
1360
31
      <blockAlignment value="LEFT"/>
1361
32
      <blockValign value="TOP"/>
1362
33
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
1363
34
      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
1364
35
      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
1365
36
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
1366
37
      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
1367
38
      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
1368
39
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
1369
40
      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
1370
41
      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
1371
42
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
1372
43
      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
1373
44
      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
1374
45
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
1375
46
      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
1376
47
      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
1377
48
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1"/>
1378
49
      <lineStyle kind="LINEAFTER" colorName="#000000" start="5,0" stop="5,-1"/>
1379
50
      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
1380
51
      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
1381
52
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
1382
53
      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
1383
54
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
1384
55
      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
1385
56
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
1386
57
      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
1387
58
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
1388
59
      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
1389
60
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
1390
61
      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
1391
62
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,1" stop="5,-1"/>
1392
63
      <lineStyle kind="LINEAFTER" colorName="#000000" start="5,1" stop="5,-1"/>
1393
64
      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
1394
65
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,2" stop="0,-1"/>
1395
66
      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
1396
67
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,2" stop="1,-1"/>
1397
68
      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
1398
69
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,2" stop="2,-1"/>
1399
70
      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
1400
71
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,2" stop="3,-1"/>
1401
72
      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
1402
73
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,2" stop="4,-1"/>
1403
74
      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
1404
75
      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,2" stop="5,-1"/>
1405
76
      <lineStyle kind="LINEAFTER" colorName="#000000" start="5,2" stop="5,-1"/>
1406
77
      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
1407
78
    </blockTableStyle>
1408
79
    <initialize>
1409
80
      <paraStyle name="all" alignment="justify"/>
1410
81
    </initialize>
1411
82
    <paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
1412
83
    <paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1413
84
    <paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1414
85
    <paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1415
86
    <paraStyle name="P5" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
1416
87
    <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
1417
88
    <paraStyle name="Standard" fontName="Helvetica"/>
1418
89
    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
1419
90
    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
1420
91
    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
1421
92
    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
1422
93
    <paraStyle name="Index" fontName="Helvetica"/>
1423
94
    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
1424
95
    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1425
96
    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
1426
97
    <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
1427
98
    <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
1428
99
    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1429
100
    <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1430
101
    <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1431
102
    <paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
1432
103
    <paraStyle name="terp_default_Right_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
1433
104
    <paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
1434
105
    <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1435
106
    <paraStyle name="terp_default_9_30" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1436
107
    <images/>
1437
108
  </stylesheet>
1438
109
  <story>
1439
110
    <para style="P3">
1440
111
      <font color="white"> </font>
1441
112
    </para>
1442
113
    <para style="P3">[[repeatIn(objects,'o')]]</para>
1443
114
    <para style="P3">[[ setLang(o.partner_id.lang) ]]</para>
1444
115
    <para style="P3">
1445
116
      <font color="white"> </font>
1446
117
    </para>
1447
118
    <para style="P3">Referencia : [[ o.name ]]</para>
1448
119
    <para style="P3">
1449
120
      <font color="white"> </font>
1450
121
    </para>
1451
122
    <para style="P3">Conductor: [[ o.driver_id.name ]]</para>
1452
123
    <para style="P3">
1453
124
      <font color="white"> </font>
1454
125
    </para>
1455
126
    <para style="P3">Fecha: [[ o.date ]] - Horario: [[ o.dts_id.name ]]</para>
1456
127
    <para style="P3">
1457
128
      <font color="white"> </font>
1458
129
    </para>
1459
130
    <blockTable colWidths="85.0,138.0,114.0,138.0" style="Table1">
1460
131
      <tr>
1461
132
        <td>
1462
133
          <para style="P1">Hora de Salida:</para>
1463
134
        </td>
1464
135
        <td>
1465
136
          <para style="P2">[[ (o.departure_date) ]]</para>
1466
137
        </td>
1467
138
        <td>
1468
139
          <para style="P1">Hora de Llegada:</para>
1469
140
        </td>
1470
141
        <td>
1471
142
          <para style="P2">
1472
143
            <font color="white"> </font>
1473
144
          </para>
1474
145
        </td>
1475
146
      </tr>
1476
147
    </blockTable>
1477
148
    <para style="P4">
1478
149
      <font color="white"> </font>
1479
150
    </para>
1480
151
    <blockTable colWidths="27.0,67.0,273.0,146.0,84.0,209.0" style="Table2">
1481
152
      <tr>
1482
153
        <td>
1483
154
          <para style="P6">Seq</para>
1484
155
        </td>
1485
156
        <td>
1486
157
          <para style="P6">POS Order</para>
1487
158
        </td>
1488
159
        <td>
1489
160
          <para style="P6">Dirección de Entrega</para>
1490
161
        </td>
1491
162
        <td>
1492
163
          <para style="P6">Destinatario</para>
1493
164
        </td>
1494
165
        <td>
1495
166
          <para style="P6">Hora de Visita</para>
1496
167
        </td>
1497
168
        <td>
1498
169
          <para style="P6">Detalle de Visita</para>
1499
170
        </td>
1500
171
      </tr>
1501
172
      <tr>
1502
173
        <td>
1503
174
          <para style="P2">[[repeatIn(o.line_ids,'line')]] [[line.sequence]]</para>
1504
175
        </td>
1505
176
        <td>
1506
177
          <para style="P5">[[line.pos_order_id.name]]</para>
1507
178
        </td>
1508
179
        <td>
1509
180
          <para style="P5">[[line.address_id.street]] [[line.address_id.street2]], [[line.address_id.district_id.name]] ([[line.address_id.address_ref]])</para>
1510
181
        </td>
1511
182
        <td>
1512
183
          <para style="P5">[[line.address_id.name]] ([[line.address_id.phone]] / [[line.address_id.mobile]])</para>
1513
184
        </td>
1514
185
        <td>
1515
186
          <para style="P5">
1516
187
            <font color="white"> </font>
1517
188
          </para>
1518
189
        </td>
1519
190
        <td>
1520
191
          <para style="P5">
1521
192
            <font color="white"> </font>
1522
193
          </para>
1523
194
        </td>
1524
195
      </tr>
1525
196
      <tr>
1526
197
        <td>
1527
198
          <para style="P2">
1528
199
            <font color="white"> </font>
1529
200
          </para>
1530
201
        </td>
1531
202
        <td>
1532
203
          <para style="P5">
1533
204
            <font color="white"> </font>
1534
205
          </para>
1535
206
        </td>
1536
207
        <td>
1537
208
          <para style="P5">
1538
209
            <font color="white"> </font>
1539
210
          </para>
1540
211
        </td>
1541
212
        <td>
1542
213
          <para style="P5">
1543
214
            <font color="white"> </font>
1544
215
          </para>
1545
216
        </td>
1546
217
        <td>
1547
218
          <para style="P5">
1548
219
            <font color="white"> </font>
1549
220
          </para>
1550
221
        </td>
1551
222
        <td>
1552
223
          <para style="P5">
1553
224
            <font color="white"> </font>
1554
225
          </para>
1555
226
        </td>
1556
227
      </tr>
1557
228
    </blockTable>
1558
229
    <para style="P3">
1559
230
      <font color="white"> </font>
1560
231
    </para>
1561
232
    <para style="P3">
1562
233
      <font color="white"> </font>
1563
234
    </para>
1564
235
    <para style="P3">
1565
236
      <font color="white"> </font>
1566
237
    </para>
1567
238
    <para style="P3">
1568
239
      <font color="white"> </font>
1569
240
    </para>
1570
241
  </story>
1571
242
</document>
1572
243
1573
0
244
1574
=== added file 'delivery_plan/report/delivery_route_print.rml.bk'
1575
--- delivery_plan/report/delivery_route_print.rml.bk	1970-01-01 00:00:00 +0000
1576
+++ delivery_plan/report/delivery_route_print.rml.bk	2013-09-09 08:37:27 +0000
1577
@@ -0,0 +1,266 @@
1578
1
<?xml version="1.0"?>
1579
2
<document filename="test.pdf">
1580
3
  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
1581
4
    <pageTemplate id="first">
1582
5
      <frame id="first" x1="1.0" y1="56.0" width="594" height="786"/>
1583
6
    </pageTemplate>
1584
7
  </template>
1585
8
  <stylesheet>
1586
9
    <blockTableStyle id="Standard_Outline">
1587
10
      <blockAlignment value="LEFT"/>
1588
11
      <blockValign value="TOP"/>
1589
12
    </blockTableStyle>
1590
13
    <blockTableStyle id="Table_Partner_Address">
1591
14
      <blockAlignment value="LEFT"/>
1592
15
      <blockValign value="TOP"/>
1593
16
    </blockTableStyle>
1594
17
    <blockTableStyle id="Tabla2">
1595
18
      <blockAlignment value="LEFT"/>
1596
19
      <blockValign value="TOP"/>
1597
20
    </blockTableStyle>
1598
21
    <blockTableStyle id="Tabla1">
1599
22
      <blockAlignment value="LEFT"/>
1600
23
      <blockValign value="TOP"/>
1601
24
    </blockTableStyle>
1602
25
    <blockTableStyle id="Tabla4">
1603
26
      <blockAlignment value="LEFT"/>
1604
27
      <blockValign value="TOP"/>
1605
28
    </blockTableStyle>
1606
29
    <blockTableStyle id="Tabla5">
1607
30
      <blockAlignment value="LEFT"/>
1608
31
      <blockValign value="TOP"/>
1609
32
    </blockTableStyle>
1610
33
    <blockTableStyle id="Tabla6">
1611
34
      <blockAlignment value="LEFT"/>
1612
35
      <blockValign value="TOP"/>
1613
36
    </blockTableStyle>
1614
37
    <initialize>
1615
38
      <paraStyle name="all" alignment="justify"/>
1616
39
    </initialize>
1617
40
    <paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1618
41
    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
1619
42
    <paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
1620
43
    <paraStyle name="P4" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1621
44
    <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1622
45
    <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1623
46
    <paraStyle name="P7" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1624
47
    <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1625
48
    <paraStyle name="P9" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
1626
49
    <paraStyle name="P10" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1627
50
    <paraStyle name="P11" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1628
51
    <paraStyle name="Standard" fontName="Helvetica"/>
1629
52
    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
1630
53
    <paraStyle name="Text_20_body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
1631
54
    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
1632
55
    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
1633
56
    <paraStyle name="Index" fontName="Helvetica"/>
1634
57
    <paraStyle name="terp_5f_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
1635
58
    <paraStyle name="terp_5f_default_5f_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1636
59
    <paraStyle name="Table_20_Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
1637
60
    <paraStyle name="terp_5f_default_5f_Centre_5f_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
1638
61
    <paraStyle name="terp_5f_default_5f_Centre_5f_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
1639
62
    <paraStyle name="terp_5f_default_5f_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1640
63
    <paraStyle name="terp_5f_default_5f_Bold_5f_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1641
64
    <paraStyle name="terp_5f_default_5f_Bold_5f_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1642
65
    <paraStyle name="terp_5f_default_5f_Bold_5f_Right_5f_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
1643
66
    <paraStyle name="terp_5f_default_5f_Right_5f_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
1644
67
    <paraStyle name="terp_5f_default_5f_Right_5f_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
1645
68
    <paraStyle name="terp_5f_default_5f_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1646
69
    <paraStyle name="terp_5f_default_5f_9_5f_30" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1647
70
    <images/>
1648
71
  </stylesheet>
1649
72
  <story>
1650
73
    <para style="terp_5f_default_5f_8">[[repeatIn(objects,'route')]]</para>
1651
74
    <para style="terp_5f_default_5f_8">[[ setLang(o.partner_id.lang) ]]</para>
1652
75
    <para style="terp_5f_default_5f_8">
1653
76
      <font color="white"> </font>
1654
77
    </para>
1655
78
    <blockTable colWidths="393.0,202.0" style="Table_Partner_Address">
1656
79
      <tr>
1657
80
        <td>
1658
81
          <blockTable colWidths="55.0,338.0" style="Tabla2">
1659
82
            <tr>
1660
83
              <td>
1661
84
                <para style="P2">
1662
85
                  <font color="white"> </font>
1663
86
                </para>
1664
87
              </td>
1665
88
              <td>
1666
89
                <para style="P1">
1667
90
                  <font color="white"> </font>
1668
91
                </para>
1669
92
                <para style="P1">[[ route.date ]]</para>
1670
93
              </td>
1671
94
            </tr>
1672
95
            <tr>
1673
96
              <td>
1674
97
                <para style="P2">
1675
98
                  <font color="white"> </font>
1676
99
                </para>
1677
100
              </td>
1678
101
              <td>
1679
102
                <para style="P10">Horario </para>
1680
103
              </td>
1681
104
            </tr>
1682
105
            <tr>
1683
106
              <td>
1684
107
                <para style="P2">
1685
108
                  <font color="white"> </font>
1686
109
                </para>
1687
110
              </td>
1688
111
              <td>
1689
112
                <para style="P10">Conductor</para>
1690
113
              </td>
1691
114
            </tr>
1692
115
            <tr>
1693
116
              <td>
1694
117
                <para style="P2">
1695
118
                  <font color="white"> </font>
1696
119
                </para>
1697
120
              </td>
1698
121
              <td>
1699
122
                <para style="P10">[[ route.dts_id.name ]]</para>
1700
123
              </td>
1701
124
            </tr>
1702
125
            <tr>
1703
126
              <td>
1704
127
                <para style="P2">
1705
128
                  <font color="white"> </font>
1706
129
                </para>
1707
130
              </td>
1708
131
              <td>
1709
132
                <para style="P9">[[ route.driver_id.name ]]</para>
1710
133
              </td>
1711
134
            </tr>
1712
135
          </blockTable>
1713
136
        </td>
1714
137
        <td>
1715
138
          <blockTable colWidths="202.0" style="Tabla1">
1716
139
            <tr>
1717
140
              <td>
1718
141
                <para style="P2">
1719
142
                  <font color="white"> </font>
1720
143
                </para>
1721
144
              </td>
1722
145
            </tr>
1723
146
            <tr>
1724
147
              <td>
1725
148
                <para style="terp_5f_default_5f_9">blabla 1</para>
1726
149
                <para style="terp_5f_default_5f_9">bla bla 2</para>
1727
150
                <para style="P8">
1728
151
                  <font color="white"> </font>
1729
152
                </para>
1730
153
              </td>
1731
154
            </tr>
1732
155
          </blockTable>
1733
156
          <para style="terp_5f_default_5f_8">
1734
157
            <font color="white"> </font>
1735
158
          </para>
1736
159
        </td>
1737
160
      </tr>
1738
161
      <tr>
1739
162
        <td>
1740
163
          <para style="terp_5f_default_5f_8">
1741
164
            <font color="white"> </font>
1742
165
          </para>
1743
166
          <blockTable colWidths="35.0,74.0,351.0,68.0,67.0" style="Tabla4">
1744
167
            <tr>
1745
168
              <td>
1746
169
                <para style="P5">
1747
170
                  <font color="white"> </font>
1748
171
                </para>
1749
172
              </td>
1750
173
              <td>
1751
174
                <para style="P8">[[repeatIn(o.line_ids,'lines')]][[ lines.pos_order_id.name]]</para>
1752
175
              </td>
1753
176
              <td>
1754
177
                <para style="P8">[[ lines.address_id.street]]</para>
1755
178
              </td>
1756
179
              <td>
1757
180
                <para style="P5">[[ lines.address_id.district_id.name]]</para>
1758
181
              </td>
1759
182
              <td>
1760
183
                <para style="P5">[[ day(lines.visit_day) month(lines.visit_day) year(lines.visit_day) ]]</para>
1761
184
              </td>
1762
185
            </tr>
1763
186
          </blockTable>
1764
187
          <blockTable colWidths="30.0,384.0,182.0" style="Tabla5">
1765
188
            <tr>
1766
189
              <td>
1767
190
                <para style="P2">
1768
191
                  <font color="white"> </font>
1769
192
                </para>
1770
193
              </td>
1771
194
              <td>
1772
195
                <para style="P4">
1773
196
                  <font color="white"> </font>
1774
197
                </para>
1775
198
              </td>
1776
199
              <td>
1777
200
                <para style="P2">
1778
201
                  <font color="white"> </font>
1779
202
                </para>
1780
203
              </td>
1781
204
            </tr>
1782
205
          </blockTable>
1783
206
          <blockTable colWidths="85.0,254.0,76.0,88.0,93.0" style="Tabla6">
1784
207
            <tr>
1785
208
              <td>
1786
209
                <para style="P2">
1787
210
                  <font color="white"> </font>
1788
211
                </para>
1789
212
              </td>
1790
213
              <td>
1791
214
                <para style="P2">
1792
215
                  <font color="white"> </font>
1793
216
                </para>
1794
217
              </td>
1795
218
              <td>
1796
219
                <para style="P2">
1797
220
                  <font color="white"> </font>
1798
221
                </para>
1799
222
              </td>
1800
223
              <td>
1801
224
                <para style="P2">
1802
225
                  <font color="white"> </font>
1803
226
                </para>
1804
227
              </td>
1805
228
              <td>
1806
229
                <para style="P2">
1807
230
                  <font color="white"> </font>
1808
231
                </para>
1809
232
              </td>
1810
233
            </tr>
1811
234
            <tr>
1812
235
              <td>
1813
236
                <para style="P2">
1814
237
                  <font color="white"> </font>
1815
238
                </para>
1816
239
              </td>
1817
240
              <td>
1818
241
                <para style="P2">
1819
242
                  <font color="white"> </font>
1820
243
                </para>
1821
244
              </td>
1822
245
              <td>
1823
246
                <para style="P6">
1824
247
                  <font color="white"> </font>
1825
248
                </para>
1826
249
              </td>
1827
250
              <td>
1828
251
                <para style="P6">
1829
252
                  <font color="white"> </font>
1830
253
                </para>
1831
254
              </td>
1832
255
              <td>
1833
256
                <para style="P7">
1834
257
                  <font color="white"> </font>
1835
258
                </para>
1836
259
              </td>
1837
260
            </tr>
1838
261
          </blockTable>
1839
262
        </td>
1840
263
      </tr>
1841
264
    </blockTable>
1842
265
  </story>
1843
266
</document>
1844
0
267
1845
=== added file 'delivery_plan/report/delivery_route_print.sxw'
1846
1
Binary files delivery_plan/report/delivery_route_print.sxw	1970-01-01 00:00:00 +0000 and delivery_plan/report/delivery_route_print.sxw	2013-09-09 08:37:27 +0000 differ
268
Binary files delivery_plan/report/delivery_route_print.sxw	1970-01-01 00:00:00 +0000 and delivery_plan/report/delivery_route_print.sxw	2013-09-09 08:37:27 +0000 differ
1847
=== added file 'delivery_plan/sale.py'
1848
--- delivery_plan/sale.py	1970-01-01 00:00:00 +0000
1849
+++ delivery_plan/sale.py	2013-09-09 08:37:27 +0000
1850
@@ -0,0 +1,1182 @@
1851
1
# -*- coding: utf-8 -*-
1852
2
##############################################################################
1853
3
#
1854
4
#    OpenERP, Open Source Management Solution
1855
5
#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
1856
6
#    Author: Yannick Gouin <yannick.gouin@elico-corp.com>
1857
7
#
1858
8
#    This program is free software: you can redistribute it and/or modify
1859
9
#    it under the terms of the GNU Affero General Public License as
1860
10
#    published by the Free Software Foundation, either version 3 of the
1861
11
#    License, or (at your option) any later version.
1862
12
#
1863
13
#    This program is distributed in the hope that it will be useful,
1864
14
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
1865
15
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1866
16
#    GNU Affero General Public License for more details.
1867
17
#
1868
18
#    You should have received a copy of the GNU Affero General Public License
1869
19
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
1870
20
#
1871
21
##############################################################################
1872
22
1873
23
from osv import osv, fields
1874
24
from datetime import datetime
1875
25
from dateutil.relativedelta import relativedelta
1876
26
import pytz
1877
27
from openerp import netsvc
1878
28
from openerp.tools.translate import _
1879
29
1880
30
1881
31
class sale_order(osv.osv):
1882
32
    _inherit = "sale.order"
1883
33
    
1884
34
    def _get_dts_id(self, cr, uid, ids, fields, args, context=None):
1885
35
        result = {}
1886
36
        for so in self.browse(cr, uid, ids, context=context):
1887
37
            result[so.id] = so.pts_id and so.pts_id.dts_id and so.pts_id.dts_id.id or False
1888
38
        return result
1889
39
        
1890
40
    def _so_to_update_after_dts_change(self, cr, uid, ids, fields=None, arg=None, context=None):
1891
41
        if type(ids) != type([]):
1892
42
            ids = [ids]
1893
43
        return self.pool.get('sale.order').search(cr, uid, [('pts_id', 'in', ids)]) or []
1894
44
    
1895
45
    _store_dts_id = {
1896
46
        'sale.order': (lambda self, cr, uid, ids, context: ids, ['pts_id'], 10),
1897
47
        'delivery.time': (_so_to_update_after_dts_change, ['dts_id'], 10),
1898
48
    }    
1899
49
    
1900
50
    _columns = {
1901
51
        'pts_id':   fields.many2one('delivery.time', 'Preparation Time', domain=[('type', '=', 'pts')]),
1902
52
        'dts_id':  fields.function(_get_dts_id, method=True, type='many2one', relation='delivery.time', string='Delivery Time', store=_store_dts_id, readonly=True, domain=[('type', '=', 'dts')]),
1903
53
        'batch_id': fields.many2one('picking.batch', 'Picking Batch', change_default=True),
1904
54
        'start_date': fields.datetime('Delivery Start Date'),
1905
55
        'end_date': fields.datetime(' Delivery End Date'),
1906
56
        # 'so_payment_method': fields.char('Payment Method', size=32),
1907
57
    }
1908
58
1909
59
    
1910
60
    def action_cancel_order_with_moves_not_delivered(self, cr, uid, ids, context=None):
1911
61
        wf_service = netsvc.LocalService("workflow")
1912
62
        if context is None:
1913
63
            context = {}
1914
64
        sale_order_line_obj = self.pool.get('sale.order.line')
1915
65
        drl_obj = self.pool.get('delivery.route.line')
1916
66
        #proc_obj = self.pool.get('procurement.order')
1917
67
        for sale in self.browse(cr, uid, ids, context=context):
1918
68
            try:
1919
69
                for pick in sale.picking_ids:
1920
70
                    for mov in pick.move_lines:
1921
71
                        if mov.state not in ('done','cancel'):
1922
72
                            mov.write({'state':'cancel'})
1923
73
                                    
1924
74
                for pick in sale.picking_ids:
1925
75
                    if pick.state != 'cancel':
1926
76
                        #wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
1927
77
                        pick.write({'state':'cancel'})
1928
78
                for inv in sale.invoice_ids:
1929
79
                    wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
1930
80
                for line in sale.order_line:
1931
81
                    if line.procurement_id:
1932
82
                        wf_service.trg_validate(uid, 'procurement.order', line.procurement_id.id, 'button_check', cr)
1933
83
                
1934
84
                #cancel delivery route line
1935
85
                drl_ids = drl_obj.search(cr, uid, [('sale_order_id','=',sale.id),('state','!=','cancel')])
1936
86
                drl_obj.action_cancel(cr,uid,drl_ids,context=context)
1937
87
                
1938
88
                order_ref = context.get('order_ref',False)
1939
89
                self.write(cr, uid, [sale.id], {'state':'shipping_except','client_order_ref':order_ref})
1940
90
                cr.commit()
1941
91
            except:
1942
92
                _logger.info('==== #LY action_cancel_order_with_moves_not_delivered fail %s===='%(sale.id))
1943
93
        return True
1944
94
    
1945
95
    def action_cancel_order_with_moves(self, cr, uid, ids, context=None):
1946
96
        wf_service = netsvc.LocalService("workflow")
1947
97
        if context is None:
1948
98
            context = {}
1949
99
        sale_order_line_obj = self.pool.get('sale.order.line')
1950
100
        drl_obj = self.pool.get('delivery.route.line')
1951
101
        #proc_obj = self.pool.get('procurement.order')
1952
102
        for sale in self.browse(cr, uid, ids, context=context):
1953
103
            try:
1954
104
                if sale.state == 'done':
1955
105
                        return False
1956
106
                for pick in sale.picking_ids:
1957
107
                    if pick.state == 'done':
1958
108
                        return False
1959
109
                    for mov in pick.move_lines:
1960
110
                        if mov.state == 'done':
1961
111
                            return False
1962
112
                for inv in sale.invoice_ids:
1963
113
                    if inv.state == 'paid':
1964
114
                        return False
1965
115
                    
1966
116
                for pick in sale.picking_ids:
1967
117
                    wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
1968
118
                for pick in sale.picking_ids:
1969
119
                    if pick.state != 'cancel':
1970
120
                        wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
1971
121
                                    
1972
122
                for inv in sale.invoice_ids:
1973
123
                    wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
1974
124
                for line in sale.order_line:
1975
125
                    if line.procurement_id:
1976
126
                        wf_service.trg_validate(uid, 'procurement.order', line.procurement_id.id, 'button_check', cr)
1977
127
                
1978
128
                #cancel delivery route line
1979
129
                drl_ids = drl_obj.search(cr, uid, [('sale_order_id','=',sale.id),('state','!=','cancel')])
1980
130
                drl_obj.action_cancel(cr,uid,drl_ids,context=context)
1981
131
                
1982
132
                sale_order_line_obj.write(cr, uid, [l.id for l in  sale.order_line], {'state': 'cancel'})
1983
133
                self.write(cr, uid, [sale.id], {'state': 'cancel'})
1984
134
                cr.commit()
1985
135
            except:
1986
136
                _logger.info('==== #LY action_cancel_order_with_moves fail %s===='%(sale.id))
1987
137
        return True
1988
138
1989
139
    def _prepare_order_line_procurement(self, cr, uid, order, pt_id, line, move_id, date_planned, context=None):
1990
140
        return {
1991
141
            'name': line.name,
1992
142
            'origin': order.name,
1993
143
            'date_planned': date_planned,
1994
144
            'product_id': line.product_id.id,
1995
145
            'product_qty': line.product_uom_qty,
1996
146
            'product_uom': line.product_uom.id,
1997
147
            'product_uos_qty': (line.product_uos and line.product_uos_qty) or line.product_uom_qty,
1998
148
            'product_uos': (line.product_uos and line.product_uos.id) or line.product_uom.id,
1999
149
            'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
2000
150
            'procure_method': line.type,
2001
151
            'move_id': move_id,
2002
152
            'company_id': order.company_id.id,
2003
153
            'note': line.name,
2004
154
            'pts_id': pt_id,
2005
155
        }
2006
156
    
2007
157
    def _prepare_order_line_move_fc(self, cr, uid, order, line, picking_id, pt_id, date_planned, context=None):
2008
158
        location_id = order.shop_id.warehouse_id.lot_stock_id.id
2009
159
        output_id = order.shop_id.warehouse_id.lot_output_id.id
2010
160
        return {
2011
161
            'name': line.name,
2012
162
            'picking_id': picking_id,
2013
163
            'product_id': line.product_id.id,
2014
164
            'date': date_planned,
2015
165
            'date_expected': date_planned,
2016
166
            'product_qty': line.product_uom_qty,
2017
167
            'product_uom': line.product_uom.id,
2018
168
            'product_uos_qty': (line.product_uos and line.product_uos_qty) or line.product_uom_qty,
2019
169
            'product_uos': (line.product_uos and line.product_uos.id) or line.product_uom.id,
2020
170
            'product_packaging': line.product_packaging.id,
2021
171
            'partner_id': line.address_allotment_id.id or order.partner_shipping_id.id,
2022
172
            'location_id': location_id,
2023
173
            'location_dest_id': output_id,
2024
174
            'sale_line_id': line.id,
2025
175
            'tracking_id': False,
2026
176
            'state': 'draft',
2027
177
            'company_id': order.company_id.id,
2028
178
            'price_unit': line.product_id.standard_price or 0.0,
2029
179
            'pts_id':pt_id,
2030
180
        }
2031
181
    
2032
182
    def _prepare_order_picking(self, cr, uid, order, dt_id, pt_id, context=None):
2033
183
        # SHOULD USE ir_sequence.next_by_code() or ir_sequence.next_by_id()
2034
184
        pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
2035
185
        return {
2036
186
            'name': pick_name,
2037
187
            'origin': order.name,
2038
188
            'date': order.date_order,
2039
189
            'type': 'out',
2040
190
            'state': 'auto',
2041
191
            'move_type': order.picking_policy,
2042
192
            'sale_id': order.id,
2043
193
            'partner_id': order.partner_shipping_id.id,
2044
194
            'note': order.note,
2045
195
            'invoice_state': (order.order_policy == 'picking' and '2binvoiced') or 'none',
2046
196
            'company_id': order.company_id.id,
2047
197
            'dts_id':dt_id,
2048
198
            'pts_id':pt_id,
2049
199
        }
2050
200
    
2051
201
    def _prepare_pts_dts(self, cr, uid, order, context=None):
2052
202
        if not context:
2053
203
            context = {}
2054
204
        tz = pytz.timezone('Asia/Shanghai')
2055
205
        tz2 = pytz.timezone('America/Anchorage')
2056
206
        delivery_time_obj = self.pool.get('delivery.time')
2057
207
        time_slot_obj = self.pool.get('delivery.time.slot')
2058
208
        val={}
2059
209
        
2060
210
        dts = False
2061
211
        pts = False
2062
212
        pt_id = False
2063
213
        dt_id = False
2064
214
        min_date = False
2065
215
        slot_id = False
2066
216
        now = datetime.now()
2067
217
        address = order.partner_shipping_id or order.partner_id or False
2068
218
        
2069
219
        if order.start_date:
2070
220
            min_date = order.start_date
2071
221
            dts = order.start_date
2072
222
            dts = datetime.strptime(dts, '%Y-%m-%d %H:%M:%S')            
2073
223
            dts = pytz.utc.localize(dts).astimezone(tz)
2074
224
        if order.date_order:
2075
225
            pts = datetime.strptime(order.date_order, '%Y-%m-%d')
2076
226
            pts = pytz.utc.localize(pts).astimezone(tz)
2077
227
        if not pts:
2078
228
            pts = dts
2079
229
        
2080
230
        if dts:
2081
231
            start_date = datetime.strftime(dts, '%Y-%m-%d')
2082
232
            from_time = datetime.strftime(dts, '%H:%M')
2083
233
            #LY remove the shanghai restrict out
2084
234
            # if address and (not address.city or address.city.lower() in ['shanghai']):
2085
235
            #     from_time = datetime.strftime(dts, '%H:%M')
2086
236
            # else:  # eg: in Nanjing
2087
237
            #     from_time = '09:30'
2088
238
            name = datetime.strftime(dts, '%y%m%d')
2089
239
            name_pts = name
2090
240
            start_date_pts = start_date
2091
241
            
2092
242
            slot_ids = time_slot_obj.search(cr, uid, [('max_time', '>=', from_time), ('type', '=', 'dts')], order='max_time')
2093
243
            if slot_ids:
2094
244
                slot = time_slot_obj.browse(cr, uid, slot_ids[0])
2095
245
                name += slot.name
2096
246
                end_date = start_date + ' ' + slot.end_time
2097
247
                start_date += ' ' + slot.start_time 
2098
248
                start_date = datetime.strptime(start_date, '%Y-%m-%d %H:%M')
2099
249
                start_date = pytz.utc.localize(start_date).astimezone(tz2)
2100
250
                start_date = datetime.strftime(start_date, '%Y-%m-%d %H:%M')
2101
251
                end_date = datetime.strptime(end_date, '%Y-%m-%d %H:%M')
2102
252
                end_date = pytz.utc.localize(end_date).astimezone(tz2)
2103
253
                end_date = datetime.strftime(end_date, '%Y-%m-%d %H:%M')
2104
254
                
2105
255
                dt_ids = delivery_time_obj.search(cr, uid, [('name', '=', name), ('type', '=', 'dts'), ('slot_id', '=', slot.id)])
2106
256
                if dt_ids:
2107
257
                    dt_id = dt_ids[0]
2108
258
                else:
2109
259
                    dt_id = delivery_time_obj.create(cr, uid, {
2110
260
                        'name':name,
2111
261
                        'start_date': start_date,
2112
262
                        'end_date': end_date,
2113
263
                        'active': True,
2114
264
                        'type': 'dts',
2115
265
                        'slot_id': slot.id,
2116
266
                        }, context)
2117
267
                    cr.commit()
2118
268
        
2119
269
        if pts and dt_id:
2120
270
            date_pts = datetime.strftime(pts, '%Y-%m-%d')
2121
271
            from_time = datetime.strftime(pts, '%H:%M')
2122
272
            if date_pts < datetime.strftime(dts, '%Y-%m-%d'):
2123
273
                date_pts = datetime.strftime(dts, '%Y-%m-%d')
2124
274
                from_time = '00:00'
2125
275
            
2126
276
            pts_slot_ids = time_slot_obj.search(cr, uid, [('max_time', '>=', from_time), ('type', '=', 'pts'), ('dts_id', '=', slot.id)], order='max_time')
2127
277
            if pts_slot_ids:
2128
278
                pts_slot = time_slot_obj.browse(cr, uid, pts_slot_ids[0])
2129
279
                name_pts += pts_slot.name
2130
280
                end_date_pts = start_date_pts + ' ' + pts_slot.end_time
2131
281
                start_date_pts += ' ' + pts_slot.start_time
2132
282
                start_date_pts = datetime.strptime(start_date_pts, '%Y-%m-%d %H:%M')
2133
283
                start_date_pts = pytz.utc.localize(start_date_pts).astimezone(tz2)
2134
284
                start_date_pts = datetime.strftime(start_date_pts, '%Y-%m-%d %H:%M')
2135
285
                end_date_pts = datetime.strptime(end_date_pts, '%Y-%m-%d %H:%M')
2136
286
                end_date_pts = pytz.utc.localize(end_date_pts).astimezone(tz2)
2137
287
                end_date_pts = datetime.strftime(end_date_pts, '%Y-%m-%d %H:%M')
2138
288
            
2139
289
                pt_ids = delivery_time_obj.search(cr, uid, [('name', '=', name_pts), ('type', '=', 'pts'), ('slot_id', '=', pts_slot.id)])
2140
290
                if pt_ids:
2141
291
                    pt_id = pt_ids[0]
2142
292
                else:
2143
293
                    pt_id = delivery_time_obj.create(cr, uid, {
2144
294
                        'name':name_pts,
2145
295
                        'start_date': start_date_pts,
2146
296
                        'end_date': end_date_pts,
2147
297
                        'active': True,
2148
298
                        'type': 'pts',
2149
299
                        'slot_id': pts_slot.id,
2150
300
                        'dts_id': dt_id,
2151
301
                        }, context)
2152
302
                    cr.commit()
2153
303
                val['pts_id'] = pt_id
2154
304
        if val:
2155
305
            order.write(val)
2156
306
        return min_date, dt_id, pt_id
2157
307
    
2158
308
    
2159
309
    def _create_pickings_and_procurements(self, cr, uid, order, order_lines, picking_id=False, context=None):
2160
310
        """Create the required procurements to supply sales order lines, also connecting
2161
311
        the procurements to appropriate stock moves in order to bring the goods to the
2162
312
        sales order's requested location.
2163
313
2164
314
        If ``picking_id`` is provided, the stock moves will be added to it, otherwise
2165
315
        a standard outgoing picking will be created to wrap the stock moves, as returned
2166
316
        by :meth:`~._prepare_order_picking`.
2167
317
2168
318
        Modules that wish to customize the procurements or partition the stock moves over
2169
319
        multiple stock pickings may override this method and call ``super()`` with
2170
320
        different subsets of ``order_lines`` and/or preset ``picking_id`` values.
2171
321
2172
322
        :param browse_record order: sales order to which the order lines belong
2173
323
        :param list(browse_record) order_lines: sales order line records to procure
2174
324
        :param int picking_id: optional ID of a stock picking to which the created stock moves
2175
325
                               will be added. A new picking will be created if ommitted.
2176
326
        :return: True
2177
327
        """
2178
328
        val = {}
2179
329
        move_obj = self.pool.get('stock.move')
2180
330
        picking_obj = self.pool.get('stock.picking')
2181
331
        procurement_obj = self.pool.get('procurement.order')
2182
332
        proc_ids = []
2183
333
        
2184
334
        min_date, dt_id, pt_id = self._prepare_pts_dts(cr, uid, order)
2185
335
        # min_date, dt_id, pt_id = order.date_order, order.dts_id.id, order.pts_id.id
2186
336
        print '<<<<<<<<<<<<<<  %s, %s, %s' % (min_date, dt_id, pt_id)
2187
337
        
2188
338
        for line in order_lines:
2189
339
            if line.state == 'done':
2190
340
                continue
2191
341
2192
342
            date_planned = min_date or self._get_date_planned(cr, uid, order, line, order.date_order, context=context)
2193
343
2194
344
            if line.product_id:
2195
345
                if line.product_id.type in ('product', 'consu'):
2196
346
                    if not picking_id:
2197
347
                        picking_id = picking_obj.create(cr, uid, self._prepare_order_picking(cr, uid, order, dt_id, pt_id, context=context))
2198
348
                    move_id = move_obj.create(cr, uid, self._prepare_order_line_move_fc(cr, uid, order, line, picking_id, pt_id, date_planned, context=context))
2199
349
                else:
2200
350
                    # a service has no stock move
2201
351
                    move_id = False
2202
352
2203
353
                proc_id = procurement_obj.create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, pt_id, line, move_id, date_planned, context=context))
2204
354
                proc_ids.append(proc_id)
2205
355
                line.write({'procurement_id': proc_id})
2206
356
                self.ship_recreate(cr, uid, order, line, move_id, proc_id)
2207
357
2208
358
        wf_service = netsvc.LocalService("workflow")
2209
359
        if picking_id:
2210
360
            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
2211
361
        for proc_id in proc_ids:
2212
362
            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
2213
363
        
2214
364
        if order.state == 'shipping_except':
2215
365
            val['state'] = 'progress'
2216
366
            val['shipped'] = False
2217
367
2218
368
            if (order.order_policy == 'manual'):
2219
369
                for line in order.order_line:
2220
370
                    if (not line.invoiced) and (line.state not in ('cancel', 'draft')):
2221
371
                        val['state'] = 'manual'
2222
372
                        break
2223
373
        order.write(val)
2224
374
        return True
2225
375
2226
376
sale_order()
2227
377
2228
378
2229
379
class picking_batch(osv.osv):
2230
380
    _name = "picking.batch"
2231
381
    _columns = {
2232
382
        'name': fields.char('Name', size=32, translate=True),
2233
383
        'picking_ids': fields.one2many('stock.picking', 'batch_id', 'Contains'),
2234
384
        'active': fields.boolean('Active'),
2235
385
    }
2236
386
2237
387
    _defaults = {
2238
388
        'active': True,
2239
389
    }
2240
390
2241
391
picking_batch()
2242
392
2243
393
2244
394
class stock_picking(osv.osv):
2245
395
    _name = "stock.picking"
2246
396
    _inherit = "stock.picking"
2247
397
    _columns = {
2248
398
        'batch_id': fields.many2one('picking.batch', 'Picking Batch', change_default=True),
2249
399
        'route_line_id': fields.one2many('delivery.route.line', 'picking_id', 'Delivery Time'),
2250
400
        'so_payment_method': fields.char('Payment Method', size=32),
2251
401
    }
2252
402
        
2253
403
    def write(self, cr, uid, ids, vals, context=None):
2254
404
        context = context or {}
2255
405
        pts_id = False
2256
406
        if type(ids) != type([]):
2257
407
            ids = [ids]
2258
408
        if 'dts_id' in vals:
2259
409
            move_pool = self.pool.get('stock.move')
2260
410
            proc_pool = self.pool.get('procurement.order')
2261
411
            pts_pool = self.pool.get('delivery.time')
2262
412
            drl_pool = self.pool.get('delivery.route.line')
2263
413
            
2264
414
            if 'pts_id' not in vals:
2265
415
                pts_id = pts_pool.search(cr, uid, [('active', '=', True), ('type', '=', 'pts'), ('dts_id', '=', vals['dts_id'])], order='start_date DESC')
2266
416
                if pts_id:
2267
417
                    pts_id = pts_id[0]
2268
418
                    vals.update({'pts_id':pts_id})
2269
419
            else:
2270
420
                pts_id = vals['pts_id']
2271
421
            
2272
422
            if pts_id:
2273
423
                move_ids = move_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('picking_id', 'in', ids)])
2274
424
                if move_ids:
2275
425
                    move_pool.write(cr, uid, move_ids, {'pts_id':pts_id})
2276
426
                    proc_ids = proc_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('move_id', 'in', move_ids)])
2277
427
                    if proc_ids:
2278
428
                        proc_pool.write(cr, uid, proc_ids, {'pts_id':pts_id})
2279
429
            
2280
430
#            Actually DONE in fields.function
2281
431
#            route_lines = drl_pool.search(cr, uid, [('state', 'in', ['draft']), ('picking_id', 'in', ids)])
2282
432
#            if route_lines:
2283
433
#                drl_pool.write(cr, uid, route_lines, {'dts_id': vals['dts_id']})
2284
434
        return super(stock_picking, self).write(cr, uid, ids, vals, context=context)
2285
435
    
2286
436
    
2287
437
    def pts_id_change(self, cr, uid, ids, pts_id, context=None):
2288
438
        res = {}
2289
439
        context = context or {}
2290
440
        if type(ids) != type([]):
2291
441
            ids = [ids]
2292
442
        move_pool = self.pool.get('stock.move')
2293
443
        proc_pool = self.pool.get('procurement.order')
2294
444
        pts_pool = self.pool.get('delivery.time')
2295
445
        drl_pool = self.pool.get('delivery.route.line')
2296
446
        
2297
447
        if pts_id:
2298
448
            pts = pts_pool.browse(cr, uid, [pts_id])[0]
2299
449
            #self.write(cr, uid, ids, {'dts_id':pts and pts.dts_id and pts.dts_id.id or False})
2300
450
            res['dts_id'] = pts and pts.dts_id and pts.dts_id.id or False
2301
451
        
2302
452
        move_ids = move_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('picking_id', 'in', ids)])
2303
453
        if move_ids:
2304
454
            vals = {'pts_id':pts_id}
2305
455
            if pts_id:
2306
456
                vals.update({'date_expected':pts.dts_id.start_date})
2307
457
            move_pool.write(cr, uid, move_ids, vals)
2308
458
            proc_ids = proc_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('move_id', 'in', move_ids)])
2309
459
            if proc_ids:
2310
460
                proc_pool.write(cr, uid, proc_ids, {'pts_id':pts_id})
2311
461
        
2312
462
#        Actually DONE in fields.function
2313
463
#        route_lines = drl_pool.search(cr, uid, [('state', 'in', ['draft']), ('picking_id', 'in', ids)])
2314
464
#        if route_lines and 'dts_id' in res:
2315
465
#            drl_pool.write(cr, uid, route_lines, {'dts_id': res['dts_id']})
2316
466
        return {'value': res}
2317
467
2318
468
2319
469
    def create(self, cr, uid, data, context=None):
2320
470
        """
2321
471
        create route line 
2322
472
        """
2323
473
        if not data.get('pts_id', False) and data.get('origin', False):
2324
474
            so_obj = self.pool.get('sale.order')
2325
475
            so_ids = so_obj.search(cr, uid, [('name', '=', data.get('origin'))]) or []
2326
476
            for so in so_obj.browse(cr, uid, so_ids):
2327
477
                data.update({'pts_id':so.pts_id and so.pts_id.id or False, 'dts_id':so.pts_id and so.pts_id.dts_id and so.pts_id.dts_id.id or False})
2328
478
        
2329
479
        return_type = data.get('return', 'none')
2330
480
        sp = super(stock_picking, self).create(cr, uid, data, context=context)
2331
481
        if data.get('type', 'internal') in ['in','out'] and data.get('pts_id', False) and return_type not in ['customer', 'supplier']:
2332
482
            self.pool.get('delivery.route.line').create(cr, uid, {'picking_id':sp, })
2333
483
        return sp
2334
484
2335
485
stock_picking()
2336
486
2337
487
2338
488
class stock_picking_out(osv.osv):
2339
489
    _inherit = "stock.picking.out"
2340
490
    _columns = {
2341
491
        'batch_id': fields.many2one('picking.batch', 'Picking Batch', change_default=True),
2342
492
        'route_line_id': fields.one2many('delivery.route.line', 'picking_id', 'Delivery Time'),
2343
493
        'so_payment_method': fields.char('Payment Method', size=32),
2344
494
    }
2345
495
        
2346
496
    def write(self, cr, uid, ids, vals, context=None):
2347
497
        context = context or {}
2348
498
        pts_id = False
2349
499
        if type(ids) != type([]):
2350
500
            ids = [ids]
2351
501
        if 'dts_id' in vals:
2352
502
            move_pool = self.pool.get('stock.move')
2353
503
            proc_pool = self.pool.get('procurement.order')
2354
504
            pts_pool = self.pool.get('delivery.time')
2355
505
            drl_pool = self.pool.get('delivery.route.line')
2356
506
            
2357
507
            if 'pts_id' not in vals:
2358
508
                pts_id = pts_pool.search(cr, uid, [('active', '=', True), ('type', '=', 'pts'), ('dts_id', '=', vals['dts_id'])], order='start_date DESC')
2359
509
                if pts_id:
2360
510
                    pts_id = pts_id[0]
2361
511
                    vals.update({'pts_id':pts_id})
2362
512
            else:
2363
513
                pts_id = vals['pts_id']
2364
514
            
2365
515
            if pts_id:
2366
516
                move_ids = move_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('picking_id', 'in', ids)])
2367
517
                if move_ids:
2368
518
                    move_pool.write(cr, uid, move_ids, {'pts_id':pts_id})
2369
519
                    proc_ids = proc_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('move_id', 'in', move_ids)])
2370
520
                    if proc_ids:
2371
521
                        proc_pool.write(cr, uid, proc_ids, {'pts_id':pts_id})
2372
522
            
2373
523
#            Actually DONE in fields.function
2374
524
#            route_lines = drl_pool.search(cr, uid, [('state', 'in', ['draft']), ('picking_id', 'in', ids)])
2375
525
#            if route_lines:
2376
526
#                drl_pool.write(cr, uid, route_lines, {'dts_id': vals['dts_id']})
2377
527
        return super(stock_picking_out, self).write(cr, uid, ids, vals, context=context)
2378
528
    
2379
529
    
2380
530
    def pts_id_change(self, cr, uid, ids, pts_id, context=None):
2381
531
        res = {}
2382
532
        context = context or {}
2383
533
        if type(ids) != type([]):
2384
534
            ids = [ids]
2385
535
        move_pool = self.pool.get('stock.move')
2386
536
        proc_pool = self.pool.get('procurement.order')
2387
537
        pts_pool = self.pool.get('delivery.time')
2388
538
        drl_pool = self.pool.get('delivery.route.line')
2389
539
        
2390
540
        if pts_id:
2391
541
            pts = pts_pool.browse(cr, uid, [pts_id])[0]
2392
542
            #self.write(cr, uid, ids, {'dts_id':pts and pts.dts_id and pts.dts_id.id or False})
2393
543
            res['dts_id'] = pts and pts.dts_id and pts.dts_id.id or False
2394
544
        
2395
545
        move_ids = move_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('picking_id', 'in', ids)])
2396
546
        if move_ids:
2397
547
            vals = {'pts_id':pts_id}
2398
548
            if pts_id:
2399
549
                vals.update({'date_expected':pts.dts_id.start_date})
2400
550
            move_pool.write(cr, uid, move_ids, vals)
2401
551
            proc_ids = proc_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('move_id', 'in', move_ids)])
2402
552
            if proc_ids:
2403
553
                proc_pool.write(cr, uid, proc_ids, {'pts_id':pts_id})
2404
554
        
2405
555
#        Actually DONE in fields.function
2406
556
#        route_lines = drl_pool.search(cr, uid, [('state', 'in', ['draft']), ('picking_id', 'in', ids)])
2407
557
#        if route_lines and 'dts_id' in res:
2408
558
#            drl_pool.write(cr, uid, route_lines, {'dts_id': res['dts_id']})
2409
559
        return {'value': res}
2410
560
    
2411
561
2412
562
    def create(self, cr, uid, data, context=None):
2413
563
        """
2414
564
        create route line 
2415
565
        """
2416
566
        if not data.get('pts_id', False) and data.get('origin', False):
2417
567
            so_obj = self.pool.get('sale.order')
2418
568
            so_ids = so_obj.search(cr, uid, [('name', '=', data.get('origin'))]) or []
2419
569
            for so in so_obj.browse(cr, uid, so_ids):
2420
570
                data.update({'pts_id':so.pts_id and so.pts_id.id or False, 'dts_id':so.pts_id and so.pts_id.dts_id and so.pts_id.dts_id.id or False})
2421
571
        
2422
572
        return_type = data.get('return', 'none')
2423
573
        sp = super(stock_picking_out, self).create(cr, uid, data, context=context)
2424
574
        if data.get('pts_id', False) and return_type not in ['customer', 'supplier']:
2425
575
            self.pool.get('delivery.route.line').create(cr, uid, {'picking_id':sp, })
2426
576
        return sp
2427
577
2428
578
stock_picking_out()
2429
579
2430
580
2431
581
class stock_picking_in(osv.osv):
2432
582
    _inherit = "stock.picking.in"
2433
583
    
2434
584
    _columns = {
2435
585
        'batch_id': fields.many2one('picking.batch', 'Picking Batch', change_default=True),
2436
586
        'route_line_id': fields.one2many('delivery.route.line', 'picking_id', 'Delivery Time'),
2437
587
    }
2438
588
    
2439
589
    def write(self, cr, uid, ids, vals, context=None):
2440
590
        context = context or {}
2441
591
        pts_id = False
2442
592
        if type(ids) != type([]):
2443
593
            ids = [ids]
2444
594
        if 'dts_id' in vals:
2445
595
            move_pool = self.pool.get('stock.move')
2446
596
            proc_pool = self.pool.get('procurement.order')
2447
597
            pts_pool = self.pool.get('delivery.time')
2448
598
            drl_pool = self.pool.get('delivery.route.line')
2449
599
            
2450
600
            if 'pts_id' not in vals:
2451
601
                pts_id = pts_pool.search(cr, uid, [('active', '=', True), ('type', '=', 'pts'), ('dts_id', '=', vals['dts_id'])], order='start_date DESC')
2452
602
                if pts_id:
2453
603
                    pts_id = pts_id[0]
2454
604
                    vals.update({'pts_id':pts_id})
2455
605
            else:
2456
606
                pts_id = vals['pts_id']
2457
607
            
2458
608
            if pts_id:
2459
609
                move_ids = move_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('picking_id', 'in', ids)])
2460
610
                if move_ids:
2461
611
                    move_pool.write(cr, uid, move_ids, {'pts_id':pts_id})
2462
612
                    proc_ids = proc_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('move_id', 'in', move_ids)])
2463
613
                    if proc_ids:
2464
614
                        proc_pool.write(cr, uid, proc_ids, {'pts_id':pts_id})
2465
615
                        
2466
616
#            Actually DONE in fields.function
2467
617
#            route_lines = drl_pool.search(cr, uid, [('state', 'in', ['draft']), ('picking_id', 'in', ids)])
2468
618
#            if route_lines:
2469
619
#                drl_pool.write(cr, uid, route_lines, {'dts_id': vals['dts_id']})
2470
620
        return super(stock_picking_in, self).write(cr, uid, ids, vals, context=context)
2471
621
    
2472
622
    
2473
623
    def pts_id_change(self, cr, uid, ids, pts_id, context=None):
2474
624
        res = {}
2475
625
        context = context or {}
2476
626
        if type(ids) != type([]):
2477
627
            ids = [ids]
2478
628
        move_pool = self.pool.get('stock.move')
2479
629
        proc_pool = self.pool.get('procurement.order')
2480
630
        pts_pool = self.pool.get('delivery.time')
2481
631
        drl_pool = self.pool.get('delivery.route.line')
2482
632
        
2483
633
        if pts_id:
2484
634
            pts = pts_pool.browse(cr, uid, [pts_id])[0]
2485
635
            #self.write(cr, uid, ids, {'dts_id':pts and pts.dts_id and pts.dts_id.id or False})
2486
636
            res['dts_id'] = pts and pts.dts_id and pts.dts_id.id or False
2487
637
        
2488
638
        move_ids = move_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('picking_id', 'in', ids)])
2489
639
        if move_ids:
2490
640
            vals = {'pts_id':pts_id}
2491
641
            if pts_id:
2492
642
                vals.update({'date_expected':pts.dts_id.start_date})
2493
643
            move_pool.write(cr, uid, move_ids, vals)
2494
644
            proc_ids = proc_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('move_id', 'in', move_ids)])
2495
645
            if proc_ids:
2496
646
                proc_pool.write(cr, uid, proc_ids, {'pts_id':pts_id})
2497
647
        
2498
648
#        Actually DONE in fields.function
2499
649
#        route_lines = drl_pool.search(cr, uid, [('state', 'in', ['draft']), ('picking_id', 'in', ids)])
2500
650
#        if route_lines and 'dts_id' in res:
2501
651
#            drl_pool.write(cr, uid, route_lines, {'dts_id': res['dts_id']})
2502
652
        return {'value': res}
2503
653
    
2504
654
2505
655
    def create(self, cr, uid, data, context=None):
2506
656
        """
2507
657
        create route line 
2508
658
        """
2509
659
        if not data.get('pts_id', False) and data.get('origin', False):
2510
660
            so_obj = self.pool.get('sale.order')
2511
661
            so_ids = so_obj.search(cr, uid, [('name', '=', data.get('origin'))]) or []
2512
662
            for so in so_obj.browse(cr, uid, so_ids):
2513
663
                data.update({'pts_id':so.pts_id and so.pts_id.id or False, 'dts_id':so.pts_id and so.pts_id.dts_id and so.pts_id.dts_id.id or False})
2514
664
        
2515
665
        purchase_id = data.get('purchase_id', False)
2516
666
        return_type = data.get('return', 'none')
2517
667
        if purchase_id:
2518
668
            po = self.pool.get('purchase.order').browse(cr, uid, purchase_id)
2519
669
            if not po.is_collected:
2520
670
                purchase_id = False
2521
671
        
2522
672
        sp = super(stock_picking_in, self).create(cr, uid, data, context=context)
2523
673
        if data.get('pts_id', False) and return_type not in ['customer', 'supplier'] and not purchase_id:
2524
674
            self.pool.get('delivery.route.line').create(cr, uid, {'picking_id':sp, })
2525
675
        return sp
2526
676
2527
677
stock_picking_in()
2528
678
2529
679
2530
680
class stock_tracking(osv.osv):
2531
681
    _inherit = "stock.tracking"
2532
682
    
2533
683
    _columns = {
2534
684
        'picking_id': fields.many2one('stock.picking', 'Picking Related', change_default=True),
2535
685
        'ul_id': fields.many2one('product.ul', 'Picking Box', change_default=True),
2536
686
    }
2537
687
stock_tracking()
2538
688
2539
689
2540
690
class mrp_production(osv.osv):
2541
691
    _inherit = 'mrp.production'
2542
692
2543
693
    _columns = {
2544
694
        'pts_id':  fields.many2one('delivery.time', 'Preparation Time', select=True, domain=[('type', '=', 'pts')]),
2545
695
    }
2546
696
    
2547
697
    def _make_production_internal_shipment_line(self, cr, uid, production_line, shipment_id, parent_move_id, destination_location_id=False, context=None):
2548
698
        stock_move = self.pool.get('stock.move')
2549
699
        production = production_line.production_id
2550
700
        date_planned = production.date_planned
2551
701
        # Internal shipment is created for Stockable and Consumer Products
2552
702
        if production_line.product_id.type not in ('product', 'consu'):
2553
703
            return False
2554
704
        source_location_id = production.location_src_id.id
2555
705
        if not destination_location_id:
2556
706
            destination_location_id = source_location_id
2557
707
        return stock_move.create(cr, uid, {
2558
708
                        'name': production.name,
2559
709
                        'picking_id': shipment_id,
2560
710
                        'product_id': production_line.product_id.id,
2561
711
                        'product_qty': production_line.product_qty,
2562
712
                        'product_uom': production_line.product_uom.id,
2563
713
                        'product_uos_qty': production_line.product_uos and production_line.product_uos_qty or False,
2564
714
                        'product_uos': production_line.product_uos and production_line.product_uos.id or False,
2565
715
                        'date': date_planned,
2566
716
                        'move_dest_id': parent_move_id,
2567
717
                        'location_id': source_location_id,
2568
718
                        'location_dest_id': destination_location_id,
2569
719
                        'state': 'waiting',
2570
720
                        'company_id': production.company_id.id,
2571
721
                        'pts_id': production.pts_id and production.pts_id.id or False,
2572
722
                })
2573
723
    
2574
724
    def _make_production_internal_shipment(self, cr, uid, production, context=None):
2575
725
        ir_sequence = self.pool.get('ir.sequence')
2576
726
        stock_picking = self.pool.get('stock.picking')
2577
727
        routing_loc = None
2578
728
        pick_type = 'internal'
2579
729
        partner_id = False
2580
730
2581
731
        # Take routing address as a Shipment Address.
2582
732
        # If usage of routing location is a internal, make outgoing shipment otherwise internal shipment
2583
733
        if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
2584
734
            routing_loc = production.bom_id.routing_id.location_id
2585
735
            if routing_loc.usage != 'internal':
2586
736
                pick_type = 'out'
2587
737
            partner_id = routing_loc.partner_id and routing_loc.partner_id.id or False
2588
738
2589
739
        # Take next Sequence number of shipment base on type
2590
740
        # SHOULD USE ir_sequence.next_by_code() or ir_sequence.next_by_id()
2591
741
        pick_name = ir_sequence.get(cr, uid, 'stock.picking.' + pick_type)
2592
742
2593
743
        picking_id = stock_picking.create(cr, uid, {
2594
744
            'name': pick_name,
2595
745
            'origin': (production.origin or '').split(':')[0] + ':' + production.name,
2596
746
            'type': pick_type,
2597
747
            'move_type': 'one',
2598
748
            'state': 'auto',
2599
749
            'partner_id': partner_id,
2600
750
            'auto_picking': self._get_auto_picking(cr, uid, production),
2601
751
            'company_id': production.company_id.id,
2602
752
            'pts_id': production.pts_id and production.pts_id.id or False,
2603
753
            'dts_id': production.pts_id and production.pts_id.dts_id and production.pts_id.dts_id.id or False,
2604
754
        })
2605
755
        production.write({'picking_id': picking_id}, context=context)
2606
756
        return picking_id
2607
757
2608
758
    def _make_production_produce_line(self, cr, uid, production, context=None):
2609
759
        stock_move = self.pool.get('stock.move')
2610
760
        source_location_id = production.product_id.property_stock_production.id
2611
761
        destination_location_id = production.location_dest_id.id
2612
762
        data = {
2613
763
            'name': production.name,
2614
764
            'date': production.date_planned,
2615
765
            'product_id': production.product_id.id,
2616
766
            'product_qty': production.product_qty,
2617
767
            'product_uom': production.product_uom.id,
2618
768
            'product_uos_qty': production.product_uos and production.product_uos_qty or False,
2619
769
            'product_uos': production.product_uos and production.product_uos.id or False,
2620
770
            'location_id': source_location_id,
2621
771
            'location_dest_id': destination_location_id,
2622
772
            'move_dest_id': production.move_prod_id.id,
2623
773
            'state': 'waiting',
2624
774
            'company_id': production.company_id.id,
2625
775
            'pts_id': production.pts_id and production.pts_id.id or False,
2626
776
        }
2627
777
        move_id = stock_move.create(cr, uid, data, context=context)
2628
778
        production.write({'move_created_ids': [(6, 0, [move_id])]}, context=context)
2629
779
        return move_id
2630
780
2631
781
    def _make_production_consume_line(self, cr, uid, production_line, parent_move_id, source_location_id=False, context=None):
2632
782
        stock_move = self.pool.get('stock.move')
2633
783
        production = production_line.production_id
2634
784
        # Internal shipment is created for Stockable and Consumer Products
2635
785
        if production_line.product_id.type not in ('product', 'consu'):
2636
786
            return False
2637
787
        destination_location_id = production.product_id.property_stock_production.id
2638
788
        if not source_location_id:
2639
789
            source_location_id = production.location_src_id.id
2640
790
        move_id = stock_move.create(cr, uid, {
2641
791
            'name': production.name,
2642
792
            'date': production.date_planned,
2643
793
            'product_id': production_line.product_id.id,
2644
794
            'product_qty': production_line.product_qty,
2645
795
            'product_uom': production_line.product_uom.id,
2646
796
            'product_uos_qty': production_line.product_uos and production_line.product_uos_qty or False,
2647
797
            'product_uos': production_line.product_uos and production_line.product_uos.id or False,
2648
798
            'location_id': source_location_id,
2649
799
            'location_dest_id': destination_location_id,
2650
800
            'move_dest_id': parent_move_id,
2651
801
            'state': 'waiting',
2652
802
            'company_id': production.company_id.id,
2653
803
            'pts_id': production.pts_id and production.pts_id.id or False,
2654
804
        })
2655
805
        production.write({'move_lines': [(4, move_id)]}, context=context)
2656
806
        return move_id
2657
807
    
2658
808
mrp_production()
2659
809
2660
810
2661
811
class procurement_order(osv.osv):
2662
812
    _inherit = 'procurement.order'
2663
813
2664
814
    _columns = {
2665
815
        'pts_id':  fields.many2one('delivery.time', 'Preparation Time', select=True, domain=[('type', '=', 'pts')]),
2666
816
        'message': fields.char(_('Latest error'), size=2048, help="Exception occurred while computing procurement orders."),
2667
817
    }
2668
818
2669
819
    def make_mo(self, cr, uid, ids, context=None):
2670
820
        """ Make Manufacturing(production) order from procurement
2671
821
        @return: New created Production Orders procurement wise 
2672
822
        """
2673
823
        res = {}
2674
824
        company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
2675
825
        production_obj = self.pool.get('mrp.production')
2676
826
        move_obj = self.pool.get('stock.move')
2677
827
        wf_service = netsvc.LocalService("workflow")
2678
828
        procurement_obj = self.pool.get('procurement.order')
2679
829
        for procurement in procurement_obj.browse(cr, uid, ids, context=context):
2680
830
            res_id = procurement.move_id.id
2681
831
            newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - relativedelta(days=procurement.product_id.produce_delay or 0.0)
2682
832
            newdate = newdate - relativedelta(days=company.manufacturing_lead)
2683
833
            produce_id = production_obj.create(cr, uid, {
2684
834
                'origin': procurement.origin,
2685
835
                'product_id': procurement.product_id.id,
2686
836
                'product_qty': procurement.product_qty,
2687
837
                'product_uom': procurement.product_uom.id,
2688
838
                'product_uos_qty': procurement.product_uos and procurement.product_uos_qty or False,
2689
839
                'product_uos': procurement.product_uos and procurement.product_uos.id or False,
2690
840
                'location_src_id': procurement.location_id.id,
2691
841
                'location_dest_id': procurement.location_id.id,
2692
842
                'bom_id': procurement.bom_id and procurement.bom_id.id or False,
2693
843
                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
2694
844
                'move_prod_id': res_id,
2695
845
                'company_id': procurement.company_id.id,
2696
846
                'pts_id': procurement.pts_id and procurement.pts_id.id or context and context.get('force_pts_id', False) or False,
2697
847
            })
2698
848
            
2699
849
            res[procurement.id] = produce_id
2700
850
            self.write(cr, uid, [procurement.id], {'state': 'running', 'production_id': produce_id})   
2701
851
            bom_result = production_obj.action_compute(cr, uid,
2702
852
                    [produce_id], properties=[x.id for x in procurement.property_ids])
2703
853
            wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
2704
854
            if res_id:
2705
855
                move_obj.write(cr, uid, [res_id], {'location_id': procurement.location_id.id})
2706
856
        self.production_order_create_note(cr, uid, ids, context=context)
2707
857
        return res
2708
858
2709
859
procurement_order()
2710
860
2711
861
2712
862
class delivery_time(osv.osv):
2713
863
    _inherit = 'delivery.time'
2714
864
    
2715
865
    def search(self, cr, uid, args, offset=0, limit=None, order='name', context=None, count=False):
2716
866
        # now = datetime.now()
2717
867
        # args.append(('name','>=',datetime.strftime(now,'%y%m%d')))
2718
868
        return super(delivery_time, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count)
2719
869
2720
870
delivery_time()
2721
871
2722
872
2723
873
class delivery_return_type(osv.osv):
2724
874
    _name = 'delivery.return.type'
2725
875
    
2726
876
    _columns = {
2727
877
        'name': fields.char('Name', size=64, required=True, select=True),
2728
878
        'sequence': fields.integer('Sequence'),
2729
879
    }
2730
880
    _order = 'sequence'
2731
881
delivery_return_type()
2732
882
    
2733
883
2734
884
class delivery_return_reason(osv.osv):
2735
885
    _name = 'delivery.return.reason'
2736
886
    
2737
887
    _columns = {
2738
888
        'type': fields.many2one('delivery.return.type', 'Type', required=True),
2739
889
        'reason': fields.char('Name', size=1024, required=False),
2740
890
        'route_line_id': fields.many2one('delivery.route.line', 'Delivery Route Line'),
2741
891
    }
2742
892
delivery_return_reason()
2743
893
2744
894
2745
895
class delivery_route(osv.osv):
2746
896
    _inherit = 'delivery.route'
2747
897
    
2748
898
    def _auto_init(self, cr, context=None):
2749
899
        super(delivery_route, self)._auto_init(cr, context=context)
2750
900
        cr.execute("SELECT table_name FROM information_schema.tables WHERE table_name = 'delivery_scheduler_running'")
2751
901
        if not cr.fetchone():
2752
902
            cr.execute('CREATE TABLE delivery_scheduler_running (running boolean)')
2753
903
            cr.commit()
2754
904
            cr.execute('INSERT INTO delivery_scheduler_running (running) VALUES (FALSE)')
2755
905
    
2756
906
    def set_confirm_cs(self, cr, uid, ids, context=None):
2757
907
        self.write(cr, uid, ids, {'confirm_cs': True}, context=context)
2758
908
        return True
2759
909
    
2760
910
delivery_route()
2761
911
2762
912
    
2763
913
class delivery_route_line(osv.osv):
2764
914
    _inherit = 'delivery.route.line'
2765
915
    
2766
916
    def search(self, cr, uid, args, offset=0, limit=None, order='dts_name', context=None, count=False):
2767
917
        context = context or {}
2768
918
        new_order = context.get('sorting', order)
2769
919
        return super(delivery_route_line, self).search(cr, uid, args, offset=offset, limit=limit, order=new_order, context=context, count=count)
2770
920
    
2771
921
    def set_not_vip(self, cr, uid, ids, context=None):
2772
922
        return self.write(cr, uid, ids, {'vip':False})
2773
923
2774
924
    def set_vip(self, cr, uid, ids, context=None):
2775
925
        return self.write(cr, uid, ids, {'vip':True})
2776
926
    
2777
927
    def write(self, cr, uid, ids, vals, context=None):
2778
928
        if type(ids) != type([]):
2779
929
            ids = [ids]
2780
930
        context = context or {}
2781
931
        if ('route_id' in vals or 'color' in vals or 'sequence' in vals) and not 'force_update' in context:
2782
932
            for line in self.browse(cr, uid, ids):
2783
933
                if line.state == 'draft':
2784
934
                    current_dts = context.get('force_dts_id_kanban', False) or False
2785
935
                    # if current_dts:
2786
936
                    #    vals.update({'dts_id':current_dts})
2787
937
                    if 'route_id' in vals and vals['route_id']:
2788
938
                        route_state = self.pool.get('delivery.route').read(cr, uid, [vals['route_id']], ['state', 'name'])
2789
939
                        if route_state[0]['state'] != 'draft': 
2790
940
                            print('The Route %s is confirmed, you can not add lines to it.' % (route_state[0]['name']))
2791
941
                            raise osv.except_osv(_('Error'), _('The Route %s is confirmed, you can not add lines to it.' % (route_state[0]['name'])))
2792
942
                        
2793
943
                        elif 'update_color' in context and context['update_color'] == 1:
2794
944
                            current_color = str(line.color)
2795
945
                            cr.execute("SELECT color FROM (select count(*) as cpt, color as color from delivery_route_line WHERE route_id=" + str(vals['route_id']) + " AND color != " + current_color + " AND color IS NOT null AND color > 0 GROUP BY color) t ORDER BY cpt DESC")
2796
946
                            color = cr.fetchone()
2797
947
                            if color and color[0]:
2798
948
                                vals.update({'color':color[0]})
2799
949
                            
2800
950
                            elif current_dts:
2801
951
                                cr.execute("SELECT DISTINCT color FROM delivery_route_line WHERE (dts_id=" + str(current_dts) + " OR id = " + str(line.id) + ") AND color IS NOT null AND color > 0")
2802
952
                                colors = map(lambda x: x[0], cr.fetchall())
2803
953
                                color = False
2804
954
                                
2805
955
                                for idx in range(1, 22):
2806
956
                                    if idx not in colors and not color and idx != current_color:
2807
957
                                        color = idx
2808
958
                                if color:
2809
959
                                    vals.update({'color':color})
2810
960
                                else:
2811
961
                                    print('No more Route available for the DTS %s.' % (line.dts_id.name))
2812
962
                                    raise osv.except_osv(_('Error'), _('No more Route available for the DTS %s.' % (line.dts_id.name)))
2813
963
                    
2814
964
                    elif 'check4color' in context and context['check4color'] and 'color' in vals:
2815
965
                        cr.execute("SELECT DISTINCT route_id FROM delivery_route_line WHERE dts_id=" + str(line.dts_id.id) + " AND color = " + str(vals['color']) + " AND color > 0 AND state not in ('draft','cancel')")
2816
966
                        route_line_ids = map(lambda x: x[0], cr.fetchall())
2817
967
                        if route_line_ids:
2818
968
                            print('The Route Line %s (origin: %s) can not be put in a confirmed Route (%s).' % (line.picking_id.name, line.picking_id.origin, route_line_ids))
2819
969
                            raise osv.except_osv(_('Error'), _('The Route Line %s (origin: %s) can not be put in a confirmed Route (%s).' % (line.picking_id.name, line.picking_id.origin, route_line_ids)))
2820
970
                else:
2821
971
                    print('The Route Line %s (origin: %s) is confirmed. You can not change it.' % (line.picking_id.name, line.picking_id.origin))
2822
972
                    raise osv.except_osv(_('Error'), _('The Route Line %s (origin: %s) is confirmed. You can not change it.' % (line.picking_id.name, line.picking_id.origin)))
2823
973
        return super(delivery_route_line, self).write(cr, uid, ids, vals, context=context)
2824
974
    
2825
975
    
2826
976
    def set_van(self, cr, uid, ids, van=0, context=None):
2827
977
        self.write(cr, uid, ids, {'color': van}, context=context)
2828
978
        return True
2829
979
    def set_van_0(self, cr, uid, ids, context=None):
2830
980
        return self.set_van(cr, uid, ids, 0, context)
2831
981
    def set_van_1(self, cr, uid, ids, context=None):
2832
982
        return self.set_van(cr, uid, ids, 1, context)
2833
983
    def set_van_2(self, cr, uid, ids, context=None):
2834
984
        return self.set_van(cr, uid, ids, 2, context)
2835
985
    def set_van_3(self, cr, uid, ids, context=None):
2836
986
        return self.set_van(cr, uid, ids, 3, context)
2837
987
    def set_van_4(self, cr, uid, ids, context=None):
2838
988
        return self.set_van(cr, uid, ids, 4, context)
2839
989
    def set_van_5(self, cr, uid, ids, context=None):
2840
990
        return self.set_van(cr, uid, ids, 5, context)
2841
991
    def set_van_6(self, cr, uid, ids, context=None):
2842
992
        return self.set_van(cr, uid, ids, 6, context)
2843
993
    def set_van_7(self, cr, uid, ids, context=None):
2844
994
        return self.set_van(cr, uid, ids, 7, context)
2845
995
    def set_van_8(self, cr, uid, ids, context=None):
2846
996
        return self.set_van(cr, uid, ids, 8, context)
2847
997
    def set_van_9(self, cr, uid, ids, context=None):
2848
998
        return self.set_van(cr, uid, ids, 9, context)
2849
999
    
2850
1000
    
2851
1001
    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
2852
1002
        context = context or {}
2853
1003
        if 'view_name' in context and view_type == 'kanban':
2854
1004
            view_ids = self.pool.get('ir.ui.view').search(cr, uid, [('model', '=', 'delivery.route.line'), ('name', '=', context['view_name'])], context=context)
2855
1005
            if view_ids:
2856
1006
                view_id = view_ids[0]
2857
1007
                del context['view_name']
2858
1008
        return super(delivery_route_line, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
2859
1009
    
2860
1010
    
2861
1011
    def _get_neighborhood(self, cr, uid, ids, fields, args, context=None):
2862
1012
        res = {}
2863
1013
        for route in self.browse(cr, uid, ids):
2864
1014
            # res[route.id] = route.picking_id and route.picking_id.sale_id and route.picking_id.sale_id.deliver_zone or route.picking_id and route.picking_id.partner_id and route.picking_id.partner_id.vm_district or False
2865
1015
            res[route.id] = route.picking_id and route.picking_id.partner_id and route.picking_id.partner_id.deliver_zone or False
2866
1016
        return res
2867
1017
    
2868
1018
    def _get_dts_id(self, cr, uid, ids, fields, args, context=None):
2869
1019
        context = context or {}
2870
1020
        res = {}
2871
1021
        for route in self.browse(cr, uid, ids):
2872
1022
            if route.state in ['draft'] and context.get('set_dts', True):
2873
1023
                res[route.id] = route.picking_id and route.picking_id.pts_id and route.picking_id.pts_id.dts_id and route.picking_id.pts_id.dts_id.id or False
2874
1024
            else:
2875
1025
                res[route.id] = route.dts_id and route.dts_id.id or False
2876
1026
        return res
2877
1027
    
2878
1028
    def _get_dts_name(self, cr, uid, ids, fields, args, context=None):
2879
1029
        context = context or {}
2880
1030
        res = {}
2881
1031
        for route in self.browse(cr, uid, ids):
2882
1032
            if route.state in ['draft'] and context.get('set_dts', True):
2883
1033
                res[route.id] = route.picking_id and route.picking_id.pts_id and route.picking_id.pts_id.dts_id and route.picking_id.pts_id.dts_id.name or 'n/a'
2884
1034
            else:
2885
1035
                res[route.id] = route.dts_name or 'n/a'
2886
1036
        return res
2887
1037
    
2888
1038
    def _get_special_time(self, cr, uid, ids, fields, args, context=None):
2889
1039
        tz = pytz.timezone('Asia/Shanghai')
2890
1040
        result = {}
2891
1041
        for route in self.browse(cr, uid, ids):
2892
1042
            res = {}
2893
1043
            customer_date = ''
2894
1044
            route_dts_id = route.dts_id and route.dts_id.id
2895
1045
            so_dts_id    = route.picking_id.sale_id.dts_id and route.picking_id.sale_id.dts_id.id
2896
1046
            
2897
1047
            if so_dts_id and route_dts_id != so_dts_id:
2898
1048
                customer_date = route.picking_id.sale_id.dts_id.name
2899
1049
            
2900
1050
            elif route.picking_id.sale_id:
2901
1051
                date_start = route.picking_id.sale_id.start_date or False
2902
1052
                date_end = route.picking_id.sale_id.end_date or False
2903
1053
                
2904
1054
                if date_start:
2905
1055
                    date_start = datetime.strptime(date_start, '%Y-%m-%d %H:%M:%S')            
2906
1056
                    date_start = pytz.utc.localize(date_start).astimezone(tz)
2907
1057
                    
2908
1058
                    customer_date = datetime.strftime(date_start, '%H:%M')
2909
1059
                    #LY if customer_date is 00:00, no special time. 
2910
1060
                    if customer_date != '00:00':    
2911
1061
                        if date_end:
2912
1062
                            date_end = datetime.strptime(date_end, '%Y-%m-%d %H:%M:%S')            
2913
1063
                            date_end = pytz.utc.localize(date_end).astimezone(tz)
2914
1064
                            customer_date += ' - '
2915
1065
                            customer_date += datetime.strftime(date_end, '%H:%M')
2916
1066
            res['customer_date'] = customer_date or ' '
2917
1067
            result[route.id] = res
2918
1068
        return result
2919
1069
    
2920
1070
    def _get_street(self, cr, uid, ids, fields, args, context=None):
2921
1071
        res = {}
2922
1072
        for route in self.browse(cr, uid, ids):
2923
1073
            res[route.id] = route.picking_id and route.picking_id.partner_id and route.picking_id.partner_id.street or ' n/a'
2924
1074
        return res
2925
1075
    
2926
1076
    def _route_to_update_after_picking_change(self, cr, uid, ids, fields=None, arg=None, context=None):
2927
1077
        if type(ids) != type([]):
2928
1078
            ids = [ids]
2929
1079
        return self.pool.get('delivery.route.line').search(cr, uid, [('picking_id', 'in', ids)]) or []
2930
1080
    
2931
1081
    def _route_to_update_after_dts_change(self, cr, uid, ids, fields=None, arg=None, context=None):
2932
1082
        if type(ids) != type([]):
2933
1083
            ids = [ids]
2934
1084
        picking_ids = self.pool.get('stock.picking').search(cr, uid, [('dts_id', 'in', ids)]) or []
2935
1085
        return self.pool.get('delivery.route.line')._route_to_update_after_picking_change(cr, uid, picking_ids, None, None, context=context)
2936
1086
    
2937
1087
    def _route_to_update_after_so_change(self, cr, uid, ids, fields=None, arg=None, context=None):
2938
1088
        if type(ids) != type([]):
2939
1089
            ids = [ids]
2940
1090
        return self.pool.get('delivery.route.line').search(cr, uid, [('sale_order_id', 'in', ids)]) or []
2941
1091
    
2942
1092
    def _route_to_update_after_po_change(self, cr, uid, ids, fields=None, arg=None, context=None):
2943
1093
        if type(ids) != type([]):
2944
1094
            ids = [ids]
2945
1095
        return self.pool.get('delivery.route.line').search(cr, uid, [('purchase_id', 'in', ids)]) or []
2946
1096
    
2947
1097
    def _route_to_update_after_partner_change(self, cr, uid, ids, fields=None, arg=None, context=None):
2948
1098
        if type(ids) != type([]):
2949
1099
            ids = [ids]
2950
1100
        picking_ids = self.pool.get('stock.picking').search(cr, uid, [('partner_id', 'in', ids)]) or []
2951
1101
        return self.pool.get('delivery.route.line')._route_to_update_after_picking_change(cr, uid, picking_ids, None, None, context=context)
2952
1102
    
2953
1103
    _store_dts = {
2954
1104
        'delivery.route.line': (lambda self, cr, uid, ids, context: ids, ['picking_id'], 10),
2955
1105
        'stock.picking': (_route_to_update_after_picking_change, ['pts_id'], 10),
2956
1106
    }
2957
1107
    _store_dts_name = {
2958
1108
        'delivery.route.line': (lambda self, cr, uid, ids, context: ids, ['picking_id'], 10),
2959
1109
        'stock.picking': (_route_to_update_after_picking_change, ['pts_id'], 10),
2960
1110
        'delivery.time': (_route_to_update_after_dts_change, ['name'], 10),
2961
1111
    }
2962
1112
    _store_special_time = {
2963
1113
        'delivery.route.line': (lambda self, cr, uid, ids, context: ids, ['picking_id'], 12),
2964
1114
        'stock.picking': (_route_to_update_after_picking_change, ['sale_id','dts_id'], 12),
2965
1115
        'sale.order': (_route_to_update_after_so_change, ['dts_id'], 12),
2966
1116
    }
2967
1117
    _store_neighborhood = {
2968
1118
        'delivery.route.line': (lambda self, cr, uid, ids, context: ids, ['picking_id'], 10),
2969
1119
        'stock.picking': (_route_to_update_after_picking_change, ['partner_id'], 10),
2970
1120
        'res.partner': (_route_to_update_after_partner_change, ['vm_district'], 10),
2971
1121
    }
2972
1122
    
2973
1123
    _store_amount = {
2974
1124
        'delivery.route.line': (lambda self, cr, uid, ids, context: ids, ['picking_id', 'adjustment'], 10),
2975
1125
        'stock.picking': (_route_to_update_after_picking_change, ['sale_id', 'purchase_id', 'origin'], 10),
2976
1126
        'purchase.order': (_route_to_update_after_po_change, ['amount_total'], 10),
2977
1127
    }
2978
1128
    
2979
1129
    _store_street = {
2980
1130
        'delivery.route.line': (lambda self,cr,uid,ids,context: ids,['picking_id'],10), 
2981
1131
        'stock.picking': (_route_to_update_after_picking_change, ['partner_id'], 10),
2982
1132
    }
2983
1133
    
2984
1134
    def _get_amount(self, cr, uid, ids, fields, args, context=None):
2985
1135
        result = {}
2986
1136
        for route in self.browse(cr, uid, ids):
2987
1137
            res = {}
2988
1138
            res['amount_total'] = 0.0
2989
1139
            res['amount_unpaid'] = 0.0
2990
1140
            res['to_be_received'] = 0.0
2991
1141
            
2992
1142
            if route.picking_id and route.picking_id.sale_id:
2993
1143
                res['amount_total'] = route.picking_id.sale_id.amount_total
2994
1144
                res['amount_unpaid'] = res['amount_total']
2995
1145
                res['to_be_received'] = res['amount_unpaid'] + route.adjustment
2996
1146
            elif route.picking_id and route.picking_id.purchase_id:
2997
1147
                res['amount_total'] = route.picking_id.purchase_id.amount_total
2998
1148
                res['amount_unpaid'] = 0.0
2999
1149
                res['to_be_received'] = res['amount_unpaid'] + route.adjustment
3000
1150
            result[route.id] = res
3001
1151
        return result
3002
1152
    
3003
1153
    _columns = {
3004
1154
        'dts_id': fields.function(_get_dts_id, type='many2one', obj='delivery.time', store=_store_dts, string='Delivery Time', _classic_read=True),
3005
1155
        'dts_name': fields.function(_get_dts_name, type='char', size=124, store=_store_dts_name, string='Delivery Time'),
3006
1156
        'return_reasons': fields.one2many('delivery.return.reason', 'route_line_id', 'Return Reasons', readonly=False),
3007
1157
        'delivered_cpt': fields.related('picking_id', 'delivered_cpt', type='integer', string='Delivered x times', readonly=True),
3008
1158
        'customer_date': fields.function(_get_special_time, type='char', size=64, store=_store_special_time, multi="special_time", string=_('Customer Delivery Time')),
3009
1159
        'neighborhood': fields.function(_get_neighborhood, type='char', size=255, store=_store_neighborhood, string=_('Neighborhood')),
3010
1160
        'street': fields.function(_get_street, type='char', size=128, store=_store_street, string='Street'),
3011
1161
        'vip': fields.boolean('is VIP ?'),
3012
1162
        'amount_total':  fields.function(_get_amount, type='float', multi="amount", store=_store_amount, string='Total'),
3013
1163
        'amount_unpaid': fields.function(_get_amount, type='float', multi="amount", store=_store_amount, string='Unpaid'),
3014
1164
        'adjustment': fields.float('Adjustment'),
3015
1165
        'cs_remark': fields.text('CS Remark'),
3016
1166
        'to_be_received': fields.function(_get_amount, type='float', multi="amount", store=_store_amount, string='To be Received'),
3017
1167
        'amount_received': fields.float('Received'),
3018
1168
        'account_checked': fields.boolean('Checked'),
3019
1169
        'account_remark': fields.text('Remark Accounting'),
3020
1170
    }
3021
1171
delivery_route_line()
3022
1172
3023
1173
3024
1174
class res_users(osv.osv):
3025
1175
    _inherit = 'res.users'
3026
1176
    
3027
1177
    _columns = {
3028
1178
        'dts_id': fields.many2one('delivery.time', 'Last Used Delivery Time'),
3029
1179
    }
3030
1180
res_users()
3031
1181
3032
1182
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3033
0
1183
3034
=== added directory 'delivery_plan/security'
3035
=== added file 'delivery_plan/security/ir.model.access.csv'
3036
--- delivery_plan/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
3037
+++ delivery_plan/security/ir.model.access.csv	2013-09-09 08:37:27 +0000
3038
@@ -0,0 +1,3 @@
3039
1
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
3040
2
access_delivery_return_reason_fc,delivery.return.reason.fc,delivery_plan.model_delivery_return_reason,delivery_routes.group_delivery_user,1,1,1,1
3041
3
access_delivery_return_reason_cs,delivery.return.reason.cs,delivery_plan.model_delivery_return_reason,delivery_routes.group_customer_service_user,1,1,0,0
3042
0
4
3043
=== added file 'delivery_plan/sequence.xml'
3044
--- delivery_plan/sequence.xml	1970-01-01 00:00:00 +0000
3045
+++ delivery_plan/sequence.xml	2013-09-09 08:37:27 +0000
3046
@@ -0,0 +1,18 @@
3047
1
<?xml version="1.0" encoding="utf-8"?>
3048
2
<openerp>
3049
3
    <data noupdate="1">
3050
4
        <!-- Sequences for sale.order -->
3051
5
        <record id="seq_type_picking_batch" model="ir.sequence.type">
3052
6
            <field name="name">Picking Batch</field>
3053
7
            <field name="code">picking.batch</field>
3054
8
        </record>
3055
9
3056
10
        <record id="seq_picking_batch" model="ir.sequence">
3057
11
            <field name="name">Picking Batch</field>
3058
12
            <field name="code">picking.batch</field>
3059
13
            <field name="prefix">PB%(year)s%(month)s%(day)s</field>
3060
14
            <field name="padding">3</field>
3061
15
            <field name="company_id" eval="False"/>
3062
16
        </record>
3063
17
    </data>
3064
18
</openerp>
3065
0
\ No newline at end of file
19
\ No newline at end of file
3066
1
20
3067
=== added directory 'delivery_plan/static'
3068
=== added directory 'delivery_plan/static/description'
3069
=== added file 'delivery_plan/static/description/delivery_plan1.png'
3070
2
Binary files delivery_plan/static/description/delivery_plan1.png	1970-01-01 00:00:00 +0000 and delivery_plan/static/description/delivery_plan1.png	2013-09-09 08:37:27 +0000 differ
21
Binary files delivery_plan/static/description/delivery_plan1.png	1970-01-01 00:00:00 +0000 and delivery_plan/static/description/delivery_plan1.png	2013-09-09 08:37:27 +0000 differ
3071
=== added file 'delivery_plan/static/description/delivery_plan2.png'
3072
3
Binary files delivery_plan/static/description/delivery_plan2.png	1970-01-01 00:00:00 +0000 and delivery_plan/static/description/delivery_plan2.png	2013-09-09 08:37:27 +0000 differ
22
Binary files delivery_plan/static/description/delivery_plan2.png	1970-01-01 00:00:00 +0000 and delivery_plan/static/description/delivery_plan2.png	2013-09-09 08:37:27 +0000 differ
3073
=== added file 'delivery_plan/static/description/delivery_plan3.png'
3074
4
Binary files delivery_plan/static/description/delivery_plan3.png	1970-01-01 00:00:00 +0000 and delivery_plan/static/description/delivery_plan3.png	2013-09-09 08:37:27 +0000 differ
23
Binary files delivery_plan/static/description/delivery_plan3.png	1970-01-01 00:00:00 +0000 and delivery_plan/static/description/delivery_plan3.png	2013-09-09 08:37:27 +0000 differ
3075
=== added file 'delivery_plan/static/description/delivery_plan4.png'
3076
5
Binary files delivery_plan/static/description/delivery_plan4.png	1970-01-01 00:00:00 +0000 and delivery_plan/static/description/delivery_plan4.png	2013-09-09 08:37:27 +0000 differ
24
Binary files delivery_plan/static/description/delivery_plan4.png	1970-01-01 00:00:00 +0000 and delivery_plan/static/description/delivery_plan4.png	2013-09-09 08:37:27 +0000 differ
3077
=== added file 'delivery_plan/static/description/index.html'
3078
--- delivery_plan/static/description/index.html	1970-01-01 00:00:00 +0000
3079
+++ delivery_plan/static/description/index.html	2013-09-09 08:37:27 +0000
3080
@@ -0,0 +1,40 @@
3081
1
    <section class="oe_container oe_website_only">
3082
2
3083
3
        <div class="oe_row oe_more_spaced">
3084
4
            <h2 class="oe_slogan">delivery_plan Module</h2> 
3085
5
            <h3 class="oe_slogan">Add and Edit Details of Delivery</h3>
3086
6
            <h4 class="oe_slogan"><a href="http://www.openerp.com.cn">By Elico Corp</a></h4>            
3087
7
            <div class="oe_span6">
3088
8
					<p>This modules adds the 2 new fields to the purchase and sales orders which are: Start Delivery Date and End Delivery Date.<br> Users will be able to edit delivery details with this module.</p>
3089
9
					<div class="oe_span6">
3090
10
                <img class="oe_picture" src="delivery_plan1.png">
3091
11
            	</div>
3092
12
				</div>
3093
13
            <div class="oe_span6">
3094
14
                <p>Features:</p> － Automatically assign Purchase / Sales Orders a Preparation Time Slot and  Delivery Time Slot to match Start and End Delivery Date<br> － Edit Delivery Time Slot and Assigned Transport and its Drivers for Orders<br> － Kanban View of All Deliveries categorized by Delivery Time Slot and Assigned Transport<br> － Input reason for returned goods<br> － Easier Confirmation for Delivery before Departure by Customer Service<br> － Adjust of payments of the received by Customers<br> － Input notes for special services for customers during delivery 
3095
15
            </div>
3096
16
        </div>
3097
17
        <div class="oe_span4 oe_centered">
3098
18
            <h3>Prepare Vans for DTS</h3>
3099
19
            <div class="oe_row_img oe_centered">
3100
20
                <img class="oe_picture" src="delivery_plan2.png">
3101
21
            </div>
3102
22
        </div>
3103
23
         <div class="oe_span4 oe_centered">
3104
24
            <h3>Prepare Routes for DTS</h3>
3105
25
            <div class="oe_row_img oe_centered">
3106
26
                <img class="oe_picture" src="delivery_plan3.png">
3107
27
            </div>
3108
28
        </div>
3109
29
         <div class="oe_span4 oe_centered">
3110
30
            <h3>Choose Driver for DTS</h3>
3111
31
            <div class="oe_row_img oe_centered">
3112
32
                <img class="oe_picture" src="delivery_plan4.png">
3113
33
            </div>
3114
34
        </div>
3115
35
        <div class="oe_row oe_centeralign oe_more_space" style="clear:both;">
3116
36
            <a href="http://www.elico-corp.com" class="oe_button oe_big"> Start your <span class="oe_emph">free</span> trial</a>
3117
37
        </div>
3118
38
        <h4 class="oe_slogan">or</h4> 
3119
39
3120
40
</section>  
3121
0
\ No newline at end of file
41
\ No newline at end of file
3122
1
42
3123
=== added file 'delivery_plan/stock_view.xml'
3124
--- delivery_plan/stock_view.xml	1970-01-01 00:00:00 +0000
3125
+++ delivery_plan/stock_view.xml	2013-09-09 08:37:27 +0000
3126
@@ -0,0 +1,694 @@
3127
1
<?xml version="1.0" encoding="utf-8"?>
3128
2
<openerp>
3129
3
    <data>
3130
4
3131
5
		<record id="procurement_form_view_pts_elico" model="ir.ui.view">
3132
6
			<field name="name">procurement_form_view_pts_elico</field>
3133
7
			<field name="model">procurement.order</field>
3134
8
			<field name="inherit_id" ref="procurement.procurement_form_view" />
3135
9
			<field name="arch" type="xml">
3136
10
				<xpath expr="//field[@name='origin']" position="after">
3137
11
				    <field name="pts_id" attrs="{'readonly': [('state','!=','draft')]}" domain="[('type','=','pts'),('active','=',True)]"/>
3138
12
				</xpath>
3139
13
			</field>
3140
14
		</record>
3141
15
		<record id="procurement_tree_view_pts_elico" model="ir.ui.view">
3142
16
			<field name="name">procurement_tree_view_pts_elico</field>
3143
17
			<field name="model">procurement.order</field>
3144
18
			<field name="inherit_id" ref="procurement.procurement_tree_view" />
3145
19
			<field name="arch" type="xml">
3146
20
				<xpath expr="//field[@name='origin']" position="before">
3147
21
				    <field name="pts_id" domain="[('type','=','pts')]"/>
3148
22
				</xpath>
3149
23
			</field>
3150
24
		</record>
3151
25
		
3152
26
		<record id="mrp_production_search_view_pts_elico" model="ir.ui.view">
3153
27
			<field name="name">mrp_production_search_view_pts_elico</field>
3154
28
			<field name="model">mrp.production</field>
3155
29
			<field name="inherit_id" ref="mrp.view_mrp_production_filter" />
3156
30
			<field name="arch" type="xml">
3157
31
				<xpath expr="//field[@string='Production']" position="after">
3158
32
                    <field name="pts_id" context="{'domain':[('type','=','pts')]}"/>
3159
33
                </xpath>
3160
34
                <xpath expr="//filter[@string='Date']" position="after">
3161
35
                    <filter string="Preparation Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'pts_id'}"/>
3162
36
                </xpath>
3163
37
			</field>
3164
38
		</record>
3165
39
		<record id="mrp_production_form_view_pts_elico" model="ir.ui.view">
3166
40
			<field name="name">mrp_production_form_view_pts_elico</field>
3167
41
			<field name="model">mrp.production</field>
3168
42
			<field name="inherit_id" ref="mrp.mrp_production_form_view" />
3169
43
			<field name="arch" type="xml">
3170
44
				<xpath expr="//field[@name='date_planned']" position="after">
3171
45
				    <field name="pts_id" readonly="1" domain="[('type','=','pts'),('active','=',True)]"/>
3172
46
				</xpath>
3173
47
			</field>
3174
48
		</record>
3175
49
		<record id="mrp_production_tree_view_pts_elico" model="ir.ui.view">
3176
50
			<field name="name">mrp_production_tree_view_pts_elico</field>
3177
51
			<field name="model">mrp.production</field>
3178
52
			<field name="inherit_id" ref="mrp.mrp_production_tree_view" />
3179
53
			<field name="arch" type="xml">
3180
54
				<xpath expr="//field[@name='date_planned']" position="after">
3181
55
				    <field name="pts_id" domain="[('type','=','pts')]"/>
3182
56
				</xpath>
3183
57
			</field>
3184
58
		</record>
3185
59
		
3186
60
        <record id="view_picking_out_pts_form_elico" model="ir.ui.view">
3187
61
            <field name="name">stock.picking.out.form_pts_elico</field>
3188
62
            <field name="model">stock.picking.out</field>
3189
63
            <field name="inherit_id" ref="stock.view_picking_out_form"/>
3190
64
            <field name="arch" type="xml">
3191
65
                <xpath expr="//field[@name='partner_id']" position="after">
3192
66
                    <field name="dts_id" readonly="1"/>
3193
67
                    <field name="pts_id" on_change="pts_id_change(pts_id, context)" attrs="{'readonly': [('state','in',['cancel','done'])]}" domain="[('type','=','pts'),('active','=',True)]"/>
3194
68
                    <field name="sale_id"/>
3195
69
                </xpath>
3196
70
            </field>
3197
71
        </record>
3198
72
        
3199
73
        <record id="view_picking_out_pts_tree_elico" model="ir.ui.view">
3200
74
            <field name="name">stock.picking.out.tree_pts_elico</field>
3201
75
            <field name="model">stock.picking.out</field>
3202
76
            <field name="inherit_id" ref="stock.view_picking_out_tree"/>
3203
77
            <field name="arch" type="xml">
3204
78
                <xpath expr="//field[@name='partner_id']" position="after">
3205
79
                    <field name="dts_id" domain="[('type','=','dts')]"/>
3206
80
                    <field name="pts_id" domain="[('type','=','pts')]"/>
3207
81
                </xpath>
3208
82
            </field>
3209
83
        </record>
3210
84
        <record id="view_picking_pts_form_elico" model="ir.ui.view">
3211
85
            <field name="name">stock.picking.form_pts_elico</field>
3212
86
            <field name="model">stock.picking</field>
3213
87
            <field name="inherit_id" ref="stock.view_picking_form"/>
3214
88
            <field name="arch" type="xml">
3215
89
                <xpath expr="//field[@name='partner_id']" position="after">
3216
90
                    <field name="dts_id" readonly="1"/>
3217
91
                    <field name="pts_id" on_change="pts_id_change(pts_id, context)" attrs="{'readonly': [('state','in',['cancel','done'])]}" domain="[('type','=','pts'),('active','=',True)]"/>
3218
92
               </xpath>
3219
93
            </field>
3220
94
        </record>
3221
95
        <record id="view_picking_pts_tree_elico" model="ir.ui.view">
3222
96
            <field name="name">stock.picking.tree_pts_elico</field>
3223
97
            <field name="model">stock.picking</field>
3224
98
            <field name="inherit_id" ref="stock.vpicktree"/>
3225
99
            <field name="arch" type="xml">
3226
100
                <xpath expr="//field[@name='min_date']" position="after">
3227
101
                    <field name="dts_id" domain="[('type','=','dts')]"/>
3228
102
                    <field name="pts_id" domain="[('type','=','pts')]"/>
3229
103
                </xpath>
3230
104
            </field>
3231
105
        </record>
3232
106
        <record id="view_picking_in_pts_form_elico" model="ir.ui.view">
3233
107
            <field name="name">stock.picking.in.form_pts_elico</field>
3234
108
            <field name="model">stock.picking.in</field>
3235
109
            <field name="inherit_id" ref="stock.view_picking_in_form"/>
3236
110
            <field name="arch" type="xml">
3237
111
                <xpath expr="//field[@name='partner_id']" position="after">
3238
112
                    <field name="dts_id" domain="[('type','=','dts'),('active','=',True)]" attrs="{'readonly': [('state','in',['cancel','done'])]}"/>
3239
113
                    <field name="pts_id" invisible="1" on_change="pts_id_change(pts_id, context)" attrs="{'readonly': [('state','in',['cancel','done'])]}" domain="[('type','=','pts'),('active','=',True)]"/>
3240
114
                </xpath>
3241
115
            </field>
3242
116
        </record>
3243
117
        <record id="view_picking_in_pts_tree_elico" model="ir.ui.view">
3244
118
            <field name="name">stock.picking.in.tree_pts_elico</field>
3245
119
            <field name="model">stock.picking.in</field>
3246
120
            <field name="inherit_id" ref="stock.view_picking_in_tree"/>
3247
121
            <field name="arch" type="xml">
3248
122
                <xpath expr="//field[@name='partner_id']" position="after">
3249
123
                    <field name="dts_id" domain="[('type','=','dts')]"/>
3250
124
                    <!--field name="pts_id" invisible="1"/-->
3251
125
                </xpath>
3252
126
            </field>
3253
127
        </record>
3254
128
        
3255
129
        <record id="view_order_pts_form_elico" model="ir.ui.view">
3256
130
            <field name="name">sale.order.form_pts_elico</field>
3257
131
            <field name="model">sale.order</field>
3258
132
            <field name="inherit_id" ref="sale.view_order_form"/>
3259
133
            <field name="arch" type="xml">
3260
134
                <xpath expr="//field[@name='date_order']" position="after">
3261
135
                    <field name="dts_id" domain="[('type','=','dts')]"/>
3262
136
                    <field name="pts_id" domain="[('type','=','pts')]"/>
3263
137
                    <field name="start_date" />
3264
138
                    <field name="end_date" />
3265
139
                    <field name="so_payment_method"/>
3266
140
                </xpath>
3267
141
            </field>
3268
142
        </record>
3269
143
        <record id="view_order_pts_tree_elico" model="ir.ui.view">
3270
144
            <field name="name">sale.order.tree_pts_elico</field>
3271
145
            <field name="model">sale.order</field>
3272
146
            <field name="inherit_id" ref="sale.view_order_tree"/>
3273
147
            <field name="arch" type="xml">
3274
148
                <xpath expr="//field[@name='date_order']" position="after">
3275
149
                    <field name="dts_id" domain="[('type','=','dts')]"/>
3276
150
                    <field name="pts_id" domain="[('type','=','pts')]"/>
3277
151
                </xpath>
3278
152
            </field>
3279
153
        </record>
3280
154
        <record id="view_quotation_pts_tree_elico" model="ir.ui.view">
3281
155
            <field name="name">sale.quotation.tree_pts_elico</field>
3282
156
            <field name="model">sale.order</field>
3283
157
            <field name="inherit_id" ref="sale.view_quotation_tree"/>
3284
158
            <field name="arch" type="xml">
3285
159
                <xpath expr="//field[@name='date_order']" position="after">
3286
160
                    <field name="dts_id" invisible="1"/>
3287
161
                    <field name="pts_id" invisible="1"/>
3288
162
                </xpath>
3289
163
            </field>
3290
164
        </record>
3291
165
        <record id="view_order_pts_search_elico" model="ir.ui.view">
3292
166
            <field name="name">sale.order.search_pts_elico</field>
3293
167
            <field name="model">sale.order</field>
3294
168
            <field name="inherit_id" ref="sale.view_sales_order_filter"/>
3295
169
            <field name="arch" type="xml">
3296
170
				<xpath expr="/search/group/filter[@string='Order Date']" position="after">
3297
171
                    <field name="pts_id" context="{'domain':[('type','=','pts')]}"/>
3298
172
                    <field name="dts_id" context="{'domain':[('type','=','dts')]}"/>
3299
173
                    <filter string="Preparation Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'pts_id'}"/>
3300
174
                    <filter string="Delivery Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'dts_id'}"/>
3301
175
                </xpath>
3302
176
            </field>
3303
177
        </record>
3304
178
        
3305
179
        <!-- Delivery Picking Tree -->
3306
180
        <record id="delivery_picking_tree" model="ir.ui.view">
3307
181
            <field name="name">stock.picking.tree</field>
3308
182
            <field name="model">stock.picking</field>
3309
183
            <field name="arch" type="xml">
3310
184
                <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Picking list">
3311
185
                    <field name="name"/>
3312
186
                    <field name="origin"/>
3313
187
                    <field name="partner_id"/>
3314
188
                    <field name="street"/>
3315
189
                    <field name="pts_id" invisible="1"/>
3316
190
                    <field name="purchase_id" invisible="1"/>
3317
191
                    <field name="sale_id" invisible="1"/>
3318
192
                    <field name="dts_id"/>
3319
193
                    <field name="min_date"/>
3320
194
                    <field name="type"/>
3321
195
                    <field name="state"/>
3322
196
                    <field name="delivery_state"/>
3323
197
                    <button name="%(delivery_routes.action_picking_get_order)d"
3324
198
                       string="Related Order" type="action"
3325
199
                       icon="terp-mail-forward"
3326
200
                       attrs="{'invisible': [('purchase_id','=',None),('sale_id','=',None)]}"
3327
201
                       groups="base.group_user"/>
3328
202
                </tree>
3329
203
            </field>
3330
204
        </record>
3331
205
3332
206
        <!-- Delivery Picking Search -->
3333
207
        <record id="view_picking_internal_search_extend" model="ir.ui.view">
3334
208
            <field name="name">stock.picking.internal.search.extend</field>
3335
209
            <field name="model">stock.picking</field>
3336
210
            <field name="arch" type="xml">
3337
211
                <search string="Internal Picking List">
3338
212
                    <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
3339
213
                    <filter icon="terp-go-today" name="for_past" string="Past" domain="[('min_date','&lt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for the Past"/>
3340
214
                    <filter icon="terp-go-today" name="for_today" string="Today" domain="[('min_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('min_date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for Today"/>
3341
215
                    <filter icon="terp-go-today" name="for_future" string="Future" domain="[('min_date','&gt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]" help="Orders planned for the Future"/>
3342
216
                    <separator/>
3343
217
                    <filter icon="terp-check" name="not_planned" string="Not Planned" domain="[('delivery_state','=','not_planned')]"/>
3344
218
                    <filter icon="terp-check" name="delivery" string="In delivery" domain="[('delivery_state','=',['del_rt','in_del','in_del','in_del','planned'])]"/>
3345
219
                    <filter icon="terp-check" name="delivered" string="Delivered" domain="[('delivery_state','=',['del_ok','del_ex','del_rt_exp'])]"/>
3346
220
                    <separator/>
3347
221
                    <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
3348
222
                    <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/>
3349
223
                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Picking already processed"/>
3350
224
                    <filter icon="terp-dialog-close" name="no_batch" string="No batch" domain="[('batch_id','=',None)]" help="Picking without batch"/>
3351
225
                    <field name="partner_id"/>
3352
226
                    <field name="batch_id"/>
3353
227
                    <field name="product_id"/>
3354
228
                    <field name="origin"/>
3355
229
                    <field name="stock_journal_id"/>
3356
230
                    <field name="pts_id" context="{'domain':[('type','=','pts')]}"/>
3357
231
                    <field name="dts_id" context="{'domain':[('type','=','dts')]}"/>
3358
232
                    <group expand="0" string="Group By...">
3359
233
                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
3360
234
                        <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
3361
235
                        <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
3362
236
                        <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
3363
237
                        <filter string="Batch" domain="[]" context="{'group_by':'batch_id'}"/>
3364
238
                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
3365
239
                        <filter string="Preparation Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'pts_id'}"/>
3366
240
                        <filter string="Delivery Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'dts_id'}"/>
3367
241
                        <filter string="Delivery State" icon="terp-folder-orange" domain="[]" context="{'group_by':'delivery_state'}"/>
3368
242
                    </group>
3369
243
                </search>
3370
244
            </field>
3371
245
        </record>
3372
246
3373
247
        <record id="delivery_routes.action_delivery_routes_picking" model="ir.actions.act_window">
3374
248
            <field name="name">Delivery Pickings</field>
3375
249
            <field name="res_model">stock.picking</field>
3376
250
            <field name="type">ir.actions.act_window</field>
3377
251
            <field name="view_type">form</field>
3378
252
            <field name="view_id" ref="delivery_picking_tree"/>
3379
253
            <field name="view_mode">tree,form,calendar</field>
3380
254
            <field name="domain">[('type','in',['out','in']),('return','=','none'),('state','!=','cancel')]</field>
3381
255
            <field name="context">{'default_type': 'out', 'search_default_for_today':1, 'contact_display': 'partner_address'}</field>
3382
256
            <field name="search_view_id" ref="view_picking_internal_search_extend"/>
3383
257
            <field name="help" type="html">
3384
258
              <p class="oe_view_nocontent_create"> 
3385
259
              </p><p>
3386
260
                Pack selected delivery notes
3387
261
              </p>
3388
262
            </field>
3389
263
        </record>
3390
264
3391
265
        <!-- picking batch Form view -->
3392
266
        <record id="picking_batch_view" model="ir.ui.view">
3393
267
            <field name="name">picking.batch.form</field>
3394
268
            <field name="model">picking.batch</field>
3395
269
            <field name="type">form</field>  
3396
270
            <field name="arch" type="xml">
3397
271
                <form string="Picking Batch" version="7.0">
3398
272
                    <group>
3399
273
                        <field name="name"/>
3400
274
                        <field name="active"/>
3401
275
                    </group>
3402
276
                    <field name="picking_ids"/>
3403
277
                </form>
3404
278
            </field>
3405
279
        </record>
3406
280
3407
281
        <!-- picking batch Tree view -->
3408
282
        <record id="picking_batch_tree_view" model="ir.ui.view">
3409
283
            <field name="name">picking.batch.tree</field>
3410
284
            <field name="model">picking.batch</field>
3411
285
            <field name="arch" type="xml">
3412
286
                <tree string="Picking Batch">
3413
287
                    <field name="name"/>
3414
288
                </tree>
3415
289
            </field>
3416
290
        </record>
3417
291
3418
292
        <!-- picking batch action -->
3419
293
        <record id="action_picking_batch" model="ir.actions.act_window">
3420
294
            <field name="name">Picking Batch</field>
3421
295
            <field name="res_model">picking.batch</field>
3422
296
            <field name="type">ir.actions.act_window</field>
3423
297
            <field name="view_type">form</field>
3424
298
            <field name="view_mode">tree,form</field>
3425
299
        </record>        
3426
300
        
3427
301
        <!-- Delivery route kanban view -->
3428
302
        <record model="ir.ui.view" id="delivery_routes.delivery_route_line_kanban_view">
3429
303
            <field name="name">delivery.route.line.kanban</field>
3430
304
            <field name="model">delivery.route.line</field>
3431
305
            <field name="arch" type="xml">
3432
306
                <kanban version="7.0" default_group_by="route_id" quick_creatable="false">
3433
307
                    <field name="dts_id"/>
3434
308
                    <field name="picking_id"/>
3435
309
                    <field name="route_id"/>
3436
310
                    <field name="address_id"/>
3437
311
                    <field name="customer_date"/>
3438
312
                    <field name="street"/>
3439
313
                    <field name="note"/>
3440
314
                    <field name="vip"/>
3441
315
                    <field name="sequence"/>
3442
316
                    <field name="color"/>
3443
317
                    <field name="state"/>
3444
318
                    <templates>
3445
319
                    <t t-name="kanban-box">                        
3446
320
                        <div t-if="record.state.raw_value != 'draft'" t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click not_dragable">
3447
321
                            <div class="oe_kanban_content">
3448
322
                                <div>
3449
323
                                    <b><field name="origin"/></b> (<field name="delivered_cpt"/>)
3450
324
                                    <a t-if="record.vip.raw_value == 1" type="object" name="set_not_vip" class="oe_e oe_star_on">7</a>
3451
325
                                    <a t-if="record.vip.raw_value != 1" type="object" name="set_vip" class="oe_e oe_star_off">7</a>
3452
326
                                </div>
3453
327
                                <div>
3454
328
                                    <field name="address_id"/><br/>
3455
329
                                    <field name="street"/><br/>
3456
330
                                    <field name="customer_date"/><br/>
3457
331
                                    <div class="oe_ellipsis"><t t-raw="record.note.value"/></div>
3458
332
                                </div>
3459
333
                            </div>
3460
334
                            <div class="oe_clear"></div>
3461
335
                        </div>
3462
336
                        <div t-if="record.state.raw_value == 'draft'" t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
3463
337
                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
3464
338
                                <span class="oe_e">í</span>
3465
339
                                <ul class="oe_dropdown_menu">
3466
340
                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
3467
341
                                </ul>
3468
342
                            </div>
3469
343
                            <div class="oe_kanban_content">
3470
344
                                <div>
3471
345
                                    <b><field name="origin"/></b> (<field name="delivered_cpt"/>)
3472
346
                                    <a t-if="record.vip.raw_value == 1" type="object" name="set_not_vip" class="oe_e oe_star_on">7</a>
3473
347
                                    <a t-if="record.vip.raw_value != 1" type="object" name="set_vip" class="oe_e oe_star_off">7</a>
3474
348
                                </div>
3475
349
                                <div>
3476
350
                                    <field name="address_id"/><br/>
3477
351
                                    <field name="street"/><br/>
3478
352
                                    <field name="customer_date"/>
3479
353
                                    <div class="oe_ellipsis"><t t-raw="record.note.value"/></div>
3480
354
                                </div>
3481
355
                            </div>
3482
356
                            <div class="oe_clear"></div>
3483
357
                        </div>
3484
358
                    </t>
3485
359
                </templates>
3486
360
            </kanban>
3487
361
        </field>
3488
362
    </record>     
3489
363
        
3490
364
        <record id="delivery_routes.view_delivery_route_line_form" model="ir.ui.view">
3491
365
            <field name="name">delivery.route.line.form</field>
3492
366
            <field name="model">delivery.route.line</field>
3493
367
            <field name="arch" type="xml">
3494
368
                <form string="Delivery Route Line" version="7.0">
3495
369
	                <header>
3496
370
	                    <!--button name="action_draft" string="Draft" type="object" states="cancel"/-->
3497
371
	                    <!--button name="action_confirm" string="Confirm" class="oe_highlight" type="object" states="draft"/-->
3498
372
	                    <!--button name="action_delivered" string="In delivery" type="object" class="oe_highlight" states="confirm"/-->
3499
373
	                    <button name="action_received" string="Received" type="object" class="oe_highlight" states="delivered" groups="delivery_routes.group_delivery_manager"/>
3500
374
	                    <button name="action_received_exp" string="Received with exception" type="object" states="delivered" groups="delivery_routes.group_delivery_manager"/>
3501
375
	                    <button name="action_returned" string="Returned" type="object" states="delivered" groups="delivery_routes.group_delivery_manager"/>
3502
376
	                    <button name="action_returned_exp" string="Returned, no Delivery" type="object" states="delivered" groups="delivery_routes.group_delivery_manager"/>
3503
377
	                    <button name="action_cancel" string="Cancel" type="object" states="confirm" groups="delivery_routes.group_delivery_user"/>
3504
378
	                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,delivered,received,returned,cancel" statusbar_colors='{"received":"green","returned":"red","delivered":"blue"}'/>
3505
379
	                </header>
3506
380
	                <sheet>
3507
381
	                    <group colspan="4" col="4">
3508
382
		                    <field name="sequence" attrs="{'readonly':[('state','not in',['draft'])]}"/>
3509
383
		                    <field name="route_id" attrs="{'readonly':[('state','not in',['draft'])]}"/>
3510
384
		                    <field name="address_id" readonly="1"/>
3511
385
		                    <field name="dts_id" domain="[('type','=','dts')]"/>
3512
386
		                    <!--field name="origin"/-->
3513
387
		                    <field name="street" readonly="1"/>
3514
388
		                    <field name="picking_id" domain="[('return','=','none'),('delivery_state','in',['not_planned','del_rt']),('type','in',['in','out']),('state','!=','cancel')]"/>
3515
389
		                    <field name="so_payment_method" readonly="1"/>
3516
390
		                    <field name="box_type"/>
3517
391
		                    <field name="visit_date"/>
3518
392
		                    <field name="driver" readonly="1"/>
3519
393
		                    <field name="purchase_id" attrs="{'invisible':[('purchase_id','=',False)]}"/>
3520
394
		                    <field name="sale_order_id" attrs="{'invisible':[('sale_order_id','=',False)]}"/>
3521
395
		                    <field name="exceptions" invisible="1"/>
3522
396
		                    <group colspan="4" col="1" attrs="{'invisible':[('exceptions','=',False),('state','not in',['returned'])]}">
3523
397
		                    	<separator string="Return Reasons"/>
3524
398
		                    	<field name="return_reasons" nolabel="1">
3525
399
	                                <tree editable="bottom">
3526
400
	                                    <field name="type"/>
3527
401
	                                    <field name="reason"/>                                    
3528
402
	                                </tree>
3529
403
	                            </field>
3530
404
		                    </group>
3531
405
		                    <group colspan="4" col="2">
3532
406
		                    	<separator string="Notes"/>
3533
407
		                    	<separator string="DO Notes"/>
3534
408
		                    </group>
3535
409
		                    <group colspan="4" col="2">
3536
410
		                    	<field name="note" nolabel="1"/>
3537
411
		                    	<field name="picking_note" nolabel="1" readonly="1"/>
3538
412
		                    </group>
3539
413
	                   </group>
3540
414
	                </sheet>
3541
415
                </form>
3542
416
            </field>
3543
417
        </record>
3544
418
        
3545
419
        <record id="view_delivery_route_line_tree_elico" model="ir.ui.view">
3546
420
            <field name="name">delivery.route.line.tree_elico</field>
3547
421
            <field name="model">delivery.route.line</field>
3548
422
        	<field name="inherit_id" ref="delivery_routes.view_delivery_route_line_tree"/>
3549
423
			<field name="arch" type="xml">
3550
424
				<xpath expr="//field[@name='origin']" position="after">
3551
425
                    <field name="dts_id"/>
3552
426
                    <field name="dts_name" invisible="1"/>
3553
427
                    <field name="customer_date"/>
3554
428
                </xpath>
3555
429
                <xpath expr="//field[@name='note']" position="after">
3556
430
                    <field name="amount_received" groups="account.group_account_user" sum="Total Received"/>
3557
431
                    <field name="account_checked" string="OK" groups="account.group_account_user"/>
3558
432
                   	<field name="account_remark"  string="Acc. Notes" groups="account.group_account_user"/>
3559
433
                </xpath>
3560
434
            </field>
3561
435
        </record>
3562
436
        <record id="delivery_routes.view_delivery_line_search" model="ir.ui.view">
3563
437
            <field name="name">delivery.route.line.search_elico</field>
3564
438
            <field name="model">delivery.route.line</field>
3565
439
			<field name="arch" type="xml">
3566
440
			    <search string="Delivery Line"> 
3567
441
                    <field name="picking_id" />
3568
442
                    <field name="address_id" />
3569
443
                    <field name="origin" />
3570
444
                    <filter name="no_route" string="no route" domain="[('route_id','=',None)]" help="line without route" />
3571
445
				    <filter icon="terp-go-today" string="Today" domain="[('route_id.date','=',time.strftime('%%Y-%%m-%%d'))]" help="Delivery for Today" name="today"/>
3572
446
                    <group expand="0" string="Group By...">
3573
447
	                    <filter string="Route" icon="terp-folder-orange" domain="[]" context="{'group_by':'route_id'}"/>
3574
448
	                    <filter string="Delivery Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'dts_name'}"/>
3575
449
	                    <filter string="State" icon="terp-folder-orange" domain="[]" context="{'group_by':'state'}"/>
3576
450
	                </group>
3577
451
                </search>
3578
452
            </field>
3579
453
        </record>
3580
454
        
3581
455
        <!--record model="ir.ui.view" id="delivery_route_address_kanban_view">
3582
456
            <field name="name">delivery.route.address.kanban</field>
3583
457
            <field name="model">delivery.route.line</field>
3584
458
            <field name="arch" type="xml">
3585
459
                <kanban version="7.0">
3586
460
                    <field name="dts_id"/>
3587
461
                    <field name="picking_id"/>
3588
462
                    <field name="route_id"/>
3589
463
                    <field name="address_id"/>
3590
464
                    <field name="note"/>
3591
465
                    <field name="sequence"/>
3592
466
                    <templates>
3593
467
                    <t t-name="kanban-box">
3594
468
                        <div t-attf-class="oe_kanban_card oe_kanban_global_click">
3595
469
                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
3596
470
                                <span class="oe_e">í</span>
3597
471
                                <ul class="oe_dropdown_menu">
3598
472
                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
3599
473
                                    <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
3600
474
                                </ul>
3601
475
                            </div>
3602
476
                            <div class="oe_kanban_content">
3603
477
                                <div><b><field name="street"/></b></div>
3604
478
                            </div>
3605
479
                            <div class="oe_clear"></div>
3606
480
                        </div>
3607
481
                    </t>
3608
482
                </templates>
3609
483
            </kanban>
3610
484
        </field>
3611
485
    </record-->
3612
486
        
3613
487
        
3614
488
    	<record id="action_delivery_return_type" model="ir.actions.act_window">
3615
489
            <field name="name">Return Reason Type</field>
3616
490
            <field name="type">ir.actions.act_window</field>
3617
491
            <field name="res_model">delivery.return.type</field>
3618
492
            <field name="view_type">form</field>
3619
493
            <field name="view_mode">tree,form</field>
3620
494
        </record>
3621
495
        <menuitem action="action_delivery_return_type" id="menu_action_delivery_return_type" parent="delivery_routes.menu_delivery_config" sequence="99"/>
3622
496
        
3623
497
        
3624
498
        <menuitem name="Delivery Payments"
3625
499
            id="menu_delivery_delivery_payment"
3626
500
            parent="delivery_routes.menu_delivery_root"
3627
501
            groups="delivery_routes.group_customer_service_user,account.group_account_user"
3628
502
            sequence="5"/>
3629
503
        
3630
504
        
3631
505
        <record id="view_delivery_route_form_cs" model="ir.ui.view">
3632
506
            <field name="name">delivery.route.form_CS</field>
3633
507
            <field name="model">delivery.route</field>
3634
508
            <field name="priority">17</field>
3635
509
            <field name="arch" type="xml">
3636
510
                <form string="Delivery Route" version="7.0">
3637
511
                <header>
3638
512
                    <button name="set_confirm_cs" string="Confirm CS" type="object" class="oe_highlight" groups="delivery_routes.group_customer_service_user" attrs="{'invisible':[('confirm_cs','=',True)]}"/>
3639
513
                    <button name="action_done" string="Done" type="object" class="oe_highlight" states="departure" groups="account.group_account_user"/>
3640
514
                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,departure,done,cancel" statusbar_colors='{"done":"green","cancel":"red","departure":"blue"}'/>
3641
515
                </header>
3642
516
                <sheet>
3643
517
                    <group colspan="4" col="4">
3644
518
	                    <field name="name" readonly="1"/>
3645
519
	                    <field name="date" readonly="1"/>
3646
520
	                    <field name="departure_date" readonly="1"/>
3647
521
	                    <field name="arrive_date"/>
3648
522
	                    <field name="dts_id" readonly="1"/>
3649
523
	                    <newline />
3650
524
	                    <field name="driver_id" readonly="1"/>
3651
525
	                    <field name="picker_id" readonly="1"/>
3652
526
	                    <field name="confirm_cs" groups="delivery_routes.group_customer_service_user" attrs="{'readonly':[('state','not in',['confirm','draft'])]}"/>
3653
527
	                    <newline />
3654
528
                    	<field name="line_ids" colspan="4" nolabel="1">
3655
529
                    		<tree editable="bottom" create="false" delete="false">
3656
530
                    		    <field name="origin"/>
3657
531
                    		    <field name="amount_total" sum="Total"/>
3658
532
                    		    <field name="amount_unpaid" sum="Total Unpaid"/>
3659
533
                    		    <field name="adjustment" groups="delivery_routes.group_customer_service_user" attrs="{'readonly':[('confirm_cs','=',True)]}" sum="Total Adjustment"/>
3660
534
                    		    <field name="cs_remark"  string="CS Notes" groups="delivery_routes.group_customer_service_user" attrs="{'readonly':[('confirm_cs','=',True)]}"/>
3661
535
                    		    <field name="to_be_received" sum="Total to be received" string="To be Rec."/>
3662
536
                    		    <field name="amount_received" groups="account.group_account_user" attrs="{'readonly':[('state','not in',['received','returned'])]}" sum="Total Received"/>
3663
537
                    		    <field name="account_checked" string="OK" groups="account.group_account_user" attrs="{'readonly':[('state','not in',['received','returned'])]}"/>
3664
538
                    		    <field name="account_remark"  string="Acc. Notes" groups="account.group_account_user" attrs="{'readonly':[('state','not in',['received','returned'])]}"/>
3665
539
                    		    <field name="complete_state"  string="State" readonly="1"/>
3666
540
                    		    <field name="state" invisible="1"/>
3667
541
                    		    <field name="confirm_cs" invisible="1"/>
3668
542
                    		</tree>
3669
543
                    	</field>
3670
544
                    </group>
3671
545
                </sheet>
3672
546
                </form>
3673
547
            </field>
3674
548
        </record>
3675
549
        <record id="view_delivery_route_tree_cs" model="ir.ui.view">
3676
550
            <field name="name">delivery.route.tree_cs</field>
3677
551
            <field name="model">delivery.route</field>
3678
552
            <field name="type">tree</field>
3679
553
            <field name="arch" type="xml">
3680
554
                <tree string="Delivery Routes">
3681
555
                    <field name="name"/>
3682
556
                    <field name="date"/>
3683
557
                    <field name="dts_id"/>
3684
558
                    <field name="departure_date"/>
3685
559
        			<field name="arrive_date"/>
3686
560
                    <field name="state"/>
3687
561
                </tree>
3688
562
            </field>
3689
563
        </record>
3690
564
        <record id="view_delivery_search_cs" model="ir.ui.view">
3691
565
            <field name="name">delivery.route.search_cs</field>
3692
566
            <field name="model">delivery.route</field>
3693
567
            <field name="arch" type="xml">
3694
568
                <search string="Delivery Route"> 
3695
569
                    <field name="dts_id" context="{'domain':[('type','=','dts')]}"/>
3696
570
                    <field name="date"/>
3697
571
                    <filter icon="terp-go-today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Delivery Route for Today" name="today"/>
3698
572
	                <group expand="0" string="Group By...">
3699
573
	                    <filter string="Delivery Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'dts_id'}"/>
3700
574
	                </group>
3701
575
                </search>
3702
576
            </field>
3703
577
        </record>
3704
578
        <record id="action_delivery_route_form_cs" model="ir.actions.act_window">
3705
579
            <field name="name">Delivery Route CS</field>
3706
580
            <field name="type">ir.actions.act_window</field>
3707
581
            <field name="res_model">delivery.route</field>
3708
582
            <field name="view_type">form</field>
3709
583
            <field name="view_mode">tree,form</field>
3710
584
            <field name="context">{'active_test':False,'search_default_today':True,'force_update':True}</field>
3711
585
            <field name="search_view_id" ref="view_delivery_search_cs"/>
3712
586
        </record>
3713
587
        <record id="action_delivery_route_form_form_cs" model="ir.actions.act_window.view">
3714
588
            <field name="view_mode">form</field>
3715
589
            <field name="sequence">2</field>
3716
590
            <field name="view_id" ref="view_delivery_route_form_cs"/>
3717
591
            <field name="act_window_id" ref="action_delivery_route_form_cs"/>
3718
592
        </record>
3719
593
        <record id="action_delivery_route_form_tree_cs" model="ir.actions.act_window.view">
3720
594
            <field name="view_mode">tree</field>
3721
595
            <field name="sequence">1</field>
3722
596
            <field name="view_id" ref="view_delivery_route_tree_cs"/>
3723
597
            <field name="act_window_id" ref="action_delivery_route_form_cs"/>
3724
598
        </record>
3725
599
        <menuitem action="action_delivery_route_form_cs" id="menu_action_delivery_route_form_cs" parent="menu_delivery_delivery_payment" sequence="1" groups="delivery_routes.group_customer_service_user,account.group_account_user"/>
3726
600
        
3727
601
        <record id="view_delivery_line_tree_cs" model="ir.ui.view">
3728
602
            <field name="name">delivery.route.line.tree_cs</field>
3729
603
            <field name="model">delivery.route.line</field>
3730
604
            <field name="type">tree</field>
3731
605
            <field name="arch" type="xml">
3732
606
                <tree string="Delivery Route Lines" editable="bottom" create="false" delete="false">
3733
607
                    <field name="origin" readonly="1"/>
3734
608
                    <field name="dts_id" readonly="1"/>
3735
609
                    <field name="dts_name" invisible="1"/>
3736
610
        			<field name="route_id" invisible="1"/>
3737
611
        			<field name="address_id" readonly="1"/>
3738
612
					<field name="amount_total" sum="Total"/>
3739
613
           		    <field name="amount_unpaid" sum="Total Unpaid"/>
3740
614
           		    <field name="adjustment" groups="delivery_routes.group_customer_service_user" attrs="{'readonly':[('confirm_cs','=',True)]}" sum="Total Adjustment"/>
3741
615
                    <field name="cs_remark" groups="delivery_routes.group_customer_service_user" attrs="{'readonly':[('confirm_cs','=',True)]}"/>
3742
616
           		    <field name="to_be_received" sum="Total to be received"/>
3743
617
           		    <field name="amount_received" groups="account.group_account_user" attrs="{'readonly':[('state','not in',['received','returned'])]}" sum="Total Received"/>
3744
618
           		    <field name="account_checked" groups="account.group_account_user" attrs="{'readonly':[('state','not in',['received','returned'])]}"/>
3745
619
           		    <field name="account_remark" groups="account.group_account_user" attrs="{'readonly':[('state','not in',['received','returned'])]}"/>
3746
620
                    <field name="complete_state" readonly="1"/>
3747
621
                    <field name="state" invisible="1"/>
3748
622
                    <field name="confirm_cs" invisible="1"/>
3749
623
                </tree>
3750
624
            </field>
3751
625
        </record>
3752
626
        <record id="view_delivery_line_search_cs" model="ir.ui.view">
3753
627
            <field name="name">delivery.route.search_cs</field>
3754
628
            <field name="model">delivery.route.line</field>
3755
629
            <field name="arch" type="xml">
3756
630
                <search string="Delivery Route"> 
3757
631
                    <field name="dts_id" context="{'domain':[('type','=','dts')]}"/>
3758
632
                    <field name="origin"/>
3759
633
                    <filter icon="terp-go-today" string="Today" domain="[('route_id.date','=',time.strftime('%%Y-%%m-%%d'))]" help="Delivery Route for Today" name="today"/>
3760
634
	                <group expand="0" string="Group By...">
3761
635
	                    <filter string="Delivery Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'dts_name'}"/>
3762
636
	                </group>
3763
637
                </search>
3764
638
            </field>
3765
639
        </record>
3766
640
        <record id="action_delivery_line_form_cs" model="ir.actions.act_window">
3767
641
            <field name="name">Delivery Route Line CS</field>
3768
642
            <field name="type">ir.actions.act_window</field>
3769
643
            <field name="res_model">delivery.route.line</field>
3770
644
            <field name="view_type">form</field>
3771
645
            <field name="view_mode">tree</field>
3772
646
            <field name="context">{'active_test':False,'search_default_today':True,'force_update':True}</field>
3773
647
            <field name="search_view_id" ref="view_delivery_line_search_cs"/>
3774
648
        </record>
3775
649
        <record id="action_delivery_line_form_tree_cs" model="ir.actions.act_window.view">
3776
650
            <field name="view_mode">tree</field>
3777
651
            <field name="sequence">1</field>
3778
652
            <field name="view_id" ref="view_delivery_line_tree_cs"/>
3779
653
            <field name="act_window_id" ref="action_delivery_line_form_cs"/>
3780
654
        </record>
3781
655
        <menuitem action="action_delivery_line_form_cs" id="menu_action_delivery_line_form_cs" parent="menu_delivery_delivery_payment" sequence="99" groups="delivery_routes.group_customer_service_user,account.group_account_user"/>
3782
656
        
3783
657
        
3784
658
        
3785
659
        
3786
660
        
3787
661
        
3788
662
        <!-- Menu -->
3789
663
        <!--
3790
664
        <menuitem action="action_picking_batch" name="Picking Batch" 
3791
665
            id="menu_action_picking_batch"
3792
666
            parent="delivery_routes.menu_delivery_delivery" sequence="9"/>
3793
667
            -->
3794
668
3795
669
        <!-- picking Form view -->
3796
670
                    <!--
3797
671
        <record model='ir.ui.view' id='picking_batch_form_view'>
3798
672
            <field name='name'>Delivery Routes Picking Form Inherit</field>
3799
673
            <field name='model'>stock.picking</field>
3800
674
            <field name='inherit_id' ref='stock.view_picking_form'/>
3801
675
            <field name='type'>form</field>
3802
676
            <field name="priority" eval="2"/>
3803
677
            <field name='arch' type='xml'>
3804
678
                <field name="move_type" position="after">
3805
679
                    <field name="batch_id" />
3806
680
                    <field name="pts_id" domain="[('type','=','pts'),('active','=',True)]"/>
3807
681
                    <field name="route_line_id"/>
3808
682
                    <field name="delivery_date"/>
3809
683
                    <field name="route_state"/>
3810
684
                    <field name="delivered"/>
3811
685
                </field>
3812
686
            </field>
3813
687
        </record>
3814
688
        <menuitem action="action_picking_pack_tree" name="Delivery Picking" 
3815
689
            id="menu_action_picking_pack"
3816
690
            parent="delivery_routes.menu_delivery_delivery" sequence="10"/>
3817
691
                    -->
3818
692
        <!-- Menu -->
3819
693
    </data>
3820
694
</openerp>
3821
0
695
3822
=== added directory 'delivery_plan/wizard'
3823
=== added file 'delivery_plan/wizard/__init__.py'
3824
--- delivery_plan/wizard/__init__.py	1970-01-01 00:00:00 +0000
3825
+++ delivery_plan/wizard/__init__.py	2013-09-09 08:37:27 +0000
3826
@@ -0,0 +1,25 @@
3827
1
# -*- coding: utf-8 -*-
3828
2
##############################################################################
3829
3
#
3830
4
#    OpenERP, Open Source Management Solution
3831
5
#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
3832
6
#    Author: Yannick Gouin <yannick.gouin@elico-corp.com>
3833
7
#
3834
8
#    This program is free software: you can redistribute it and/or modify
3835
9
#    it under the terms of the GNU Affero General Public License as
3836
10
#    published by the Free Software Foundation, either version 3 of the
3837
11
#    License, or (at your option) any later version.
3838
12
#
3839
13
#    This program is distributed in the hope that it will be useful,
3840
14
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
3841
15
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3842
16
#    GNU Affero General Public License for more details.
3843
17
#
3844
18
#    You should have received a copy of the GNU Affero General Public License
3845
19
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
3846
20
#
3847
21
##############################################################################
3848
22
3849
23
import stock
3850
24
3851
25
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3852
0
26
3853
=== added file 'delivery_plan/wizard/stock.py'
3854
--- delivery_plan/wizard/stock.py	1970-01-01 00:00:00 +0000
3855
+++ delivery_plan/wizard/stock.py	2013-09-09 08:37:27 +0000
3856
@@ -0,0 +1,503 @@
3857
1
# -*- coding: utf-8 -*-
3858
2
##############################################################################
3859
3
#
3860
4
#    OpenERP, Open Source Management Solution
3861
5
#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
3862
6
#    Author: Yannick Gouin <yannick.gouin@elico-corp.com>
3863
7
#
3864
8
#    This program is free software: you can redistribute it and/or modify
3865
9
#    it under the terms of the GNU Affero General Public License as
3866
10
#    published by the Free Software Foundation, either version 3 of the
3867
11
#    License, or (at your option) any later version.
3868
12
#
3869
13
#    This program is distributed in the hope that it will be useful,
3870
14
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
3871
15
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3872
16
#    GNU Affero General Public License for more details.
3873
17
#
3874
18
#    You should have received a copy of the GNU Affero General Public License
3875
19
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
3876
20
#
3877
21
##############################################################################
3878
22
3879
23
import threading
3880
24
from openerp import netsvc
3881
25
from openerp import pooler
3882
26
from openerp import tools
3883
27
from openerp.tools.translate import _
3884
28
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
3885
29
from osv import osv, fields
3886
30
from datetime import datetime
3887
31
from dateutil.relativedelta import relativedelta
3888
32
import math
3889
33
import pytz
3890
34
import logging
3891
35
logger = logging.getLogger(__name__)
3892
36
3893
37
3894
38
class delivery_dts_to_routes(osv.osv_memory):
3895
39
    _name = 'delivery.dts_to_routes'
3896
40
    
3897
41
    def _init_dts_id(self, cr, uid, context=None):
3898
42
        last_dts = self.pool.get('res.users').read(cr, 1, [uid], ['dts_id'])[0]['dts_id']
3899
43
        if last_dts:
3900
44
            ids = self.pool.get('delivery.time').search(cr, uid, [('id', '=', last_dts[0])])
3901
45
        else:
3902
46
            now = datetime.now()
3903
47
            ids = self.pool.get('delivery.time').search(cr, uid, [('type', '=', 'dts'), ('active', '=', True), ('name', 'ilike', datetime.strftime(now, '%y%m%d') + '%')])
3904
48
        return ids and ids[0] or False
3905
49
3906
50
    _columns = {
3907
51
        'dts_id': fields.many2one('delivery.time', 'Delivery Time', select=True, required=True, domain=[('type', '=', 'dts'), ('active', '=', True)]),
3908
52
    }
3909
53
    _defaults = {
3910
54
        'dts_id': lambda self, cr, uid, context: self._init_dts_id(cr, uid, context=context),
3911
55
    }
3912
56
    
3913
57
    def generate_routes(self, cr, uid, ids, context=None):
3914
58
        context = context or {}
3915
59
        route_obj = self.pool.get('delivery.route')
3916
60
        line_obj = self.pool.get('delivery.route.line')
3917
61
        
3918
62
        if ids:
3919
63
            data = self.browse(cr, uid, ids)[0]
3920
64
        else:
3921
65
            data = self.pool.get('delivery.time').browse(cr, 1, context['wiz_dts_id'])
3922
66
        self.pool.get('res.users').write(cr, 1, [uid], {'dts_id':data.dts_id.id})
3923
67
        
3924
68
        color2routes = {}
3925
69
        line_ids = line_obj.search(cr, uid, [("dts_id", "=", data.dts_id.id)], order="color")
3926
70
        for line in line_obj.browse(cr, uid, line_ids):
3927
71
            route_id = False
3928
72
            base_name = data.dts_id.name.split()[0]
3929
73
            if line.color > 0:
3930
74
                line_color = str(line.color).rjust(2, '0')
3931
75
                if line_color in color2routes:
3932
76
                    route_id = color2routes[line_color]
3933
77
                else:
3934
78
                    route_ids = route_obj.search(cr, uid, [('name', '=', base_name  + str(line_color))], context=context)
3935
79
                    route_id  = route_ids and route_ids[0] or False
3936
80
                    color2routes.update({line_color: route_id})
3937
81
                
3938
82
                if not route_id:
3939
83
                    route_id = route_obj.create(cr, uid, {
3940
84
                        'name': base_name + str(line_color),
3941
85
                        'date': data.dts_id.start_date and data.dts_id.start_date.split() and data.dts_id.start_date.split()[0] or False,
3942
86
                        'dts_id': data.dts_id.id,
3943
87
                        'departure_date': data.dts_id.start_date or False,
3944
88
                        'arrive_date': data.dts_id.end_date or False,
3945
89
                    })
3946
90
                    color2routes.update({line_color: route_id})
3947
91
                line_obj.write(cr, uid, [line.id], {'route_id':route_id}, context={'force_update':1})
3948
92
        
3949
93
        #domain = ['&','|','&',('picking_id.type','=','in'),'&',('picking_id.state','=','assigned'),("picking_id.is_collected","=",True),'&',('picking_id.type','=','out'),("picking_id.state","not in",["cancel"]),'|',("route_id","in",tuple(route_ids)),("route_id","=",None)]
3950
94
        domain = ['&','|','&',('picking_id.type','=','in'),'&',('picking_id.state','=','assigned'),("picking_id.is_collected","=",True),'&',('picking_id.type','=','out'),("picking_id.state","not in",["cancel"]),("dts_id","=",data.dts_id.id)]
3951
95
        
3952
96
        return {
3953
97
            'type': 'ir.actions.act_window',
3954
98
            'res_model':'delivery.route.line',
3955
99
            'view_type':'form',
3956
100
            'view_mode':'kanban,form',
3957
101
            'context':"{'update_color':1,'view_name':'delivery.route.line.kanban','force_dts_id_kanban': %s}" % data.dts_id.id,
3958
102
            'domain': domain,
3959
103
        }        
3960
104
delivery_dts_to_routes()
3961
105
3962
106
3963
107
class delivery_dts_to_vans(osv.osv_memory):
3964
108
    _name = 'delivery.dts_to_vans'
3965
109
    
3966
110
    def _init_dts_id(self, cr, uid, context=None):
3967
111
        last_dts = self.pool.get('res.users').read(cr, 1, [uid], ['dts_id'])[0]['dts_id']
3968
112
        if last_dts:
3969
113
            ids = self.pool.get('delivery.time').search(cr, uid, [('id', '=', last_dts[0])])
3970
114
        else:
3971
115
            now = datetime.now()
3972
116
            ids = self.pool.get('delivery.time').search(cr, uid, [('type', '=', 'dts'), ('active', '=', True), ('name', 'ilike', datetime.strftime(now, '%y%m%d') + '%')])
3973
117
        return ids and ids[0] or False
3974
118
3975
119
    _columns = {
3976
120
        'dts_id': fields.many2one('delivery.time', 'Delivery Time', select=True, required=True, domain=[('type', '=', 'dts'), ('active', '=', True)]),
3977
121
    }
3978
122
    _defaults = {
3979
123
        'dts_id': lambda self, cr, uid, context: self._init_dts_id(cr, uid, context=context),
3980
124
    }
3981
125
    
3982
126
    def open_kanban(self, cr, uid, ids, context=None):
3983
127
        if ids:
3984
128
            data = self.browse(cr, uid, ids)[0]
3985
129
        else:
3986
130
            data = self.pool.get('delivery.time').browse(cr, 1, context['wiz_dts_id'])
3987
131
        self.pool.get('res.users').write(cr, 1, [uid], {'dts_id':data.dts_id.id})
3988
132
        #domain = [("picking_id.state", "!=", "cancel"), ("picking_id.type", "in", ["in", "out"]), ("dts_id", "=", data.dts_id.id)]
3989
133
        domain = ['&','|','&',('picking_id.type','=','in'),'&',('picking_id.state','=','assigned'),("picking_id.is_collected","=",True),'&',('picking_id.type','=','out'),("picking_id.state","not in",["cancel"]),("dts_id","=",data.dts_id.id)]
3990
134
        
3991
135
        return {
3992
136
            'type': 'ir.actions.act_window',
3993
137
            'res_model':'delivery.route.line',
3994
138
            'view_type':'form',
3995
139
            'view_mode':'kanban,form',
3996
140
            'context':"{'view_name':'delivery.route.line.kanban_fc','sorting':'neighborhood,street,picking_id','check4color':" + str(data.dts_id.id) + "}",
3997
141
            'domain': domain,
3998
142
        }
3999
143
delivery_dts_to_vans()
4000
144
4001
145
4002
146
4003
147
class delivery_driver_for_routes(osv.osv_memory):
4004
148
    _name = 'delivery.driver_for_routes'
4005
149
    
4006
150
    def _init_dts_id(self, cr, uid, context=None):
4007
151
        last_dts = self.pool.get('res.users').read(cr, 1, [uid], ['dts_id'])[0]['dts_id']
4008
152
        if last_dts:
4009
153
            ids = self.pool.get('delivery.time').search(cr, uid, [('id', '=', last_dts[0])])
4010
154
        else:
4011
155
            now = datetime.now()
4012
156
            ids = self.pool.get('delivery.time').search(cr, uid, [('type', '=', 'dts'), ('active', '=', True), ('name', 'ilike', datetime.strftime(now, '%y%m%d') + '%')])
4013
157
        return ids and ids[0] or False
4014
158
4015
159
    _columns = {
4016
160
        'dts_id': fields.many2one('delivery.time', 'Delivery Time', select=True, required=True, domain=[('type', '=', 'dts'), ('active', '=', True)]),
4017
161
        #'action': fields.selection([('driver_id','Driver'),('picker_id','Deliver')], string="Choose", required=True),
4018
162
    }
4019
163
    _defaults = {
4020
164
        'dts_id': lambda self, cr, uid, context: self._init_dts_id(cr, uid, context=context),
4021
165
        #'action': lambda *a: 'driver_id',
4022
166
    }
4023
167
    
4024
168
    def open_kanban(self, cr, uid, ids, context=None):
4025
169
        if ids:        
4026
170
            data = self.browse(cr, uid, ids)[0]
4027
171
        else:
4028
172
            data = self.pool.get('delivery.time').browse(cr, 1, context['wiz_dts_id'])
4029
173
        self.pool.get('res.users').write(cr, 1, [uid], {'dts_id':data.dts_id.id})
4030
174
        driver_pool = self.pool.get('delivery.driver')
4031
175
        route_tmp_pool = self.pool.get('delivery.route_tmp')        
4032
176
        route_pool = self.pool.get('delivery.route')
4033
177
        
4034
178
        #cr.execute("DELETE FROM delivery_route_tmp WHERE dts_id=" + data.dts_id.id + " ")
4035
179
        cr.execute("DELETE FROM delivery_route_tmp")
4036
180
        cr.execute("UPDATE delivery_driver SET tmp_route_id = Null")
4037
181
        cr.commit()
4038
182
        
4039
183
        route_ids = route_pool.search(cr, uid, [('dts_id', '=', data.dts_id.id)]) or []
4040
184
        for route in route_pool.browse(cr, uid, route_ids):
4041
185
            route_tmp_id = route_tmp_pool.create(cr, uid, {'dts_id': data.dts_id.id, 'route_id': route.id, 'name': route.name})
4042
186
            if route.driver_id:
4043
187
                driver_pool.write(cr, uid, [route.driver_id.id], {'tmp_route_id': route_tmp_id})
4044
188
            if route.picker_id:
4045
189
                driver_pool.write(cr, uid, [route.picker_id.id], {'tmp_route_id': route_tmp_id})        
4046
190
        
4047
191
        return {
4048
192
            'type': 'ir.actions.act_window',
4049
193
            'res_model':'delivery.driver',
4050
194
            'view_type':'tree',
4051
195
            'view_mode':'kanban',
4052
196
            'context':"{'force_dts_id': %s}" % (data.dts_id.id),
4053
197
        }    
4054
198
delivery_driver_for_routes()
4055
199
4056
200
4057
201
class delivery_change_dts(osv.osv_memory):
4058
202
    _name = 'delivery.change.dts'
4059
203
    _description = 'Change DTS / PTS'
4060
204
    
4061
205
    _columns = {
4062
206
        'action': fields.selection([('cleanup', 'Blank DTS/PTS'), ('change', 'Change DTS/PTS')], string='Action', required=True),
4063
207
        'dts_id': fields.many2one('delivery.time', 'Delivery Time', domain=[('type', '=', 'dts')]),
4064
208
        'pts_id': fields.many2one('delivery.time', 'Preparation Time', domain=[('type', '=', 'pts')]),
4065
209
    }
4066
210
    _defaults = {
4067
211
        'action': 'change',
4068
212
    }
4069
213
    
4070
214
    
4071
215
    def dts_id_change(self, cr, uid, ids, dts_id, pts_id, context=None):
4072
216
        context = context or {}
4073
217
        new_pts_id = False
4074
218
        
4075
219
        if pts_id and dts_id:
4076
220
            pts_pool = self.pool.get('delivery.time')
4077
221
            pts = pts_pool.browse(cr, uid, [pts_id])[0]
4078
222
            if pts.dts_id.id == dts_id:
4079
223
                new_pts_id = pts_id           
4080
224
        return {'value': {'pts_id': new_pts_id}}
4081
225
    
4082
226
    
4083
227
    def change_dts(self, cr, uid, ids, context=None):
4084
228
        context = context or {}
4085
229
        context.update({'update_pts':1})
4086
230
        pick_ids = context.get('active_ids', False) or context.get('active_id', False) or []
4087
231
        if pick_ids and type(pick_ids) != type([]):
4088
232
            pick_ids = [pick_ids]
4089
233
        
4090
234
        if pick_ids:
4091
235
            move_pool = self.pool.get('stock.move')
4092
236
            pick_pool = self.pool.get('stock.picking')
4093
237
            this = self.browse(cr, uid, ids[0], context=context)
4094
238
            
4095
239
            if this.action == 'cleanup':
4096
240
                pts_id = False
4097
241
                dts_id = False
4098
242
            else:
4099
243
                dts_id = this.dts_id and this.dts_id.id or False
4100
244
                if dts_id:
4101
245
                    pts_id = this.pts_id and this.pts_id.id or False
4102
246
                else:
4103
247
                    pts_id = False
4104
248
            
4105
249
            for pick in pick_pool.browse(cr, uid, pick_ids):
4106
250
                if pick.state not in ['cancel'] and pick.delivery_state in ["not_planned", "del_rt", ""]:
4107
251
                    pick_pool.write(cr, uid, [pick.id], {'pts_id':pts_id, 'dts_id':dts_id}, context=context)
4108
252
        return {'type': 'ir.actions.act_window_close'}
4109
253
4110
254
delivery_change_dts()
4111
255
4112
256
4113
257
4114
258
########## TO BE DELETED ASAP ###############
4115
259
class dts_reset(osv.osv):
4116
260
    _name = 'dts.reset'
4117
261
    
4118
262
    def resetall(self, cursor, uid, context=None):
4119
263
        logger.warning('################ START ################')
4120
264
        picking_obj  = self.pool.get('stock.picking')
4121
265
        delivery_obj = self.pool.get('delivery.route.line')
4122
266
        
4123
267
        cr2 = pooler.get_db(cursor.dbname).cursor()
4124
268
        cr2.execute("SELECT DISTINCT picking_id FROM delivery_route_line WHERE picking_id is not null")
4125
269
        pick_ids    = map(lambda x: x[0], cr2.fetchall())
4126
270
        picking_ids =  picking_obj.search(cr2, uid, [('id','not in',pick_ids),('state','not in',['cancel']),('type','in',['in','out'])])
4127
271
        for sp in picking_ids:
4128
272
            delivery_obj.create(cr2, uid, {'picking_id':sp, })
4129
273
            cr2.commit()
4130
274
            logger.warning('####  %s done  #### '%sp)
4131
275
        #cancel picking canceled
4132
276
        logger.warning('################ DONE ################')
4133
277
        cr2.close()
4134
278
        
4135
279
        """
4136
280
        logger.warning('################ START ################')
4137
281
        tz = pytz.timezone('Asia/Shanghai')
4138
282
        tz2 = pytz.timezone('America/Anchorage')
4139
283
        move_obj = self.pool.get('stock.move')
4140
284
        picking_obj = self.pool.get('stock.picking')
4141
285
        procurement_obj = self.pool.get('procurement.order')
4142
286
        delivery_time_obj = self.pool.get('delivery.time')
4143
287
        time_slot_obj = self.pool.get('delivery.time.slot')
4144
288
        so_pool = self.pool.get('sale.order')
4145
289
        
4146
290
        use_new_cursor = cursor.dbname
4147
291
        cr = pooler.get_db(use_new_cursor).cursor()
4148
292
        cr2 = pooler.get_db(use_new_cursor).cursor()
4149
293
        cr3 = pooler.get_db(use_new_cursor).cursor()
4150
294
        
4151
295
        cr2.execute("SELECT DISTINCT sale_id FROM stock_picking WHERE sale_id is not null AND sale_id > 0")
4152
296
        ids_from_pick = map(lambda x: x[0], cr2.fetchall())
4153
297
        so_ids = so_pool.search(cr3, uid, [('id','not in',ids_from_pick)])
4154
298
        
4155
299
        cpt_commit = 1
4156
300
        for order in so_pool.browse(cr3, uid, so_ids):
4157
301
            val = {}
4158
302
            dts = False
4159
303
            pts = False
4160
304
            pt_id = False
4161
305
            dt_id = False
4162
306
            min_date = False
4163
307
            slot_id = False
4164
308
            
4165
309
            try:
4166
310
                now = datetime.now()
4167
311
                address = order.partner_shipping_id or order.partner_id or False
4168
312
                
4169
313
                if order.start_date:
4170
314
                    min_date = order.start_date
4171
315
                    dts = order.start_date
4172
316
                    dts = datetime.strptime(dts, '%Y-%m-%d %H:%M:%S')            
4173
317
                    dts = pytz.utc.localize(dts).astimezone(tz)
4174
318
                if order.cdate:
4175
319
                    pts = datetime.strptime(order.cdate, '%Y-%m-%d %H:%M:%S')
4176
320
                    pts = pytz.utc.localize(pts).astimezone(tz)
4177
321
                elif order.date_order:
4178
322
                    pts = datetime.strptime(order.date_order, '%Y-%m-%d')
4179
323
                    pts = pytz.utc.localize(pts).astimezone(tz)
4180
324
                if not pts:
4181
325
                    pts = dts
4182
326
                
4183
327
                if dts:
4184
328
                    start_date = datetime.strftime(dts, '%Y-%m-%d')
4185
329
                    if address and (not address.city or address.city.lower() in ['shanghai']):
4186
330
                        from_time = datetime.strftime(dts, '%H:%M')
4187
331
                    else:#eg: in Nanjing
4188
332
                        from_time = '09:30'
4189
333
                    name = datetime.strftime(dts, '%y%m%d')
4190
334
                    name_pts = name
4191
335
                    start_date_pts = start_date
4192
336
                    
4193
337
                    slot_ids = time_slot_obj.search(cr, uid, [('max_time', '>=', from_time), ('type', '=', 'dts')], order='max_time')
4194
338
                    if slot_ids:
4195
339
                        slot = time_slot_obj.browse(cr, uid, slot_ids[0])
4196
340
                        name += slot.name
4197
341
                        end_date = start_date + ' ' + slot.end_time
4198
342
                        start_date += ' ' + slot.start_time
4199
343
                        start_date = datetime.strptime(start_date, '%Y-%m-%d %H:%M')
4200
344
                        start_date = pytz.utc.localize(start_date).astimezone(tz2)
4201
345
                        start_date = datetime.strftime(start_date, '%Y-%m-%d %H:%M')
4202
346
                        end_date   = datetime.strptime(end_date, '%Y-%m-%d %H:%M')
4203
347
                        end_date   = pytz.utc.localize(end_date).astimezone(tz2)
4204
348
                        end_date   = datetime.strftime(end_date, '%Y-%m-%d %H:%M')
4205
349
                        
4206
350
                        cr2.execute("SELECT id FROM delivery_time WHERE name='" + name + "' AND type='dts' AND slot_id='" + str(slot.id) + "'")
4207
351
                        dt_ids = map(lambda x: x[0], cr2.fetchall())
4208
352
                        if dt_ids:
4209
353
                            dt_id = dt_ids[0]
4210
354
                        else:
4211
355
                            dt_id = delivery_time_obj.create(cr3, uid, {
4212
356
                                'name':name,
4213
357
                                'start_date': start_date,
4214
358
                                'end_date': end_date,
4215
359
                                'active': True,
4216
360
                                'type': 'dts',
4217
361
                                'slot_id': slot.id,
4218
362
                                }, context)
4219
363
                            cr3.commit()
4220
364
                            cr2.commit()
4221
365
                
4222
366
                if pts and dt_id:
4223
367
                    date_pts = datetime.strftime(pts, '%Y-%m-%d')
4224
368
                    from_time = datetime.strftime(pts, '%H:%M')
4225
369
                    if date_pts < datetime.strftime(dts, '%Y-%m-%d'):
4226
370
                        date_pts = datetime.strftime(dts, '%Y-%m-%d')
4227
371
                        from_time = '00:00'
4228
372
                    
4229
373
                    pts_slot_ids = time_slot_obj.search(cr, uid, [('max_time', '>=', from_time), ('type', '=', 'pts'), ('dts_id', '=', slot.id)], order='max_time')
4230
374
                    if pts_slot_ids:
4231
375
                        pts_slot = time_slot_obj.browse(cr, uid, pts_slot_ids[0])
4232
376
                        name_pts += pts_slot.name
4233
377
                        end_date_pts = start_date_pts + ' ' + pts_slot.end_time
4234
378
                        start_date_pts += ' ' + pts_slot.start_time
4235
379
                        start_date_pts = datetime.strptime(start_date_pts, '%Y-%m-%d %H:%M')
4236
380
                        start_date_pts = pytz.utc.localize(start_date_pts).astimezone(tz2)
4237
381
                        start_date_pts = datetime.strftime(start_date_pts, '%Y-%m-%d %H:%M')
4238
382
                        end_date_pts   = datetime.strptime(end_date_pts, '%Y-%m-%d %H:%M')
4239
383
                        end_date_pts   = pytz.utc.localize(end_date_pts).astimezone(tz2)
4240
384
                        end_date_pts   = datetime.strftime(end_date_pts, '%Y-%m-%d %H:%M')
4241
385
                    
4242
386
                        cr2.execute("SELECT id FROM delivery_time WHERE name='" + name_pts + "' AND type='pts' AND slot_id='" + str(pts_slot.id) + "'")
4243
387
                        pt_ids = map(lambda x: x[0], cr2.fetchall())
4244
388
                        if pt_ids:
4245
389
                            pt_id = pt_ids[0]
4246
390
                        else:
4247
391
                            pt_id = delivery_time_obj.create(cr3, uid, {
4248
392
                                'name':name_pts,
4249
393
                                'start_date': start_date_pts,
4250
394
                                'end_date': end_date_pts,
4251
395
                                'active': True,
4252
396
                                'type': 'pts',
4253
397
                                'slot_id': pts_slot.id,
4254
398
                                'dts_id': dt_id,
4255
399
                                }, context)
4256
400
                            cr3.commit()
4257
401
                            cr2.commit()
4258
402
                        val['pts_id'] = pt_id
4259
403
                if not pt_id:
4260
404
                    val['pts_id'] = False
4261
405
                if not dt_id:
4262
406
                    val['dts_id'] = False
4263
407
                
4264
408
                if val:
4265
409
                    so_pool.write(cr2, 1, [order.id], val)
4266
410
                
4267
411
                ##################################################
4268
412
                #cr2.execute("SELECT DISTINCT id FROM stock_picking WHERE sale_id = "+ str(order.id) +"")
4269
413
                #pick_ids = map(lambda x: x[0], cr2.fetchall()) or []
4270
414
                #if pick_ids and val:
4271
415
                #    picking_obj.write(cr2, uid, pick_ids, val)
4272
416
                ##################################################
4273
417
                
4274
418
                cpt_commit += 1
4275
419
                if cpt_commit >= 30:
4276
420
                    cr2.commit()
4277
421
                    cr3.commit()
4278
422
                    cr.commit()
4279
423
                    cpt_commit = 1
4280
424
            except Exception as err:
4281
425
                logger.warning('>>> Error during SO %s : %s' % (order.id, err))
4282
426
        ##################################################
4283
427
        # We update the old wrong start_date and end_date in delivery.time
4284
428
        #delivery_time_obj = self.pool.get('delivery.time')
4285
429
        #cr.execute("SELECT id FROM delivery_time WHERE id<16613 and start_date is not null and end_date is not null")
4286
430
        #delivery_ids = map(lambda x: x[0], cr.fetchall()) or []
4287
431
        #for delivery in delivery_time_obj.browse(cr, 1, delivery_ids):
4288
432
        #    delivery_start = datetime.strptime(delivery.start_date, '%Y-%m-%d %H:%M:%S')
4289
433
        #    delivery_start = pytz.utc.localize(delivery_start).astimezone(tz2)
4290
434
        #    
4291
435
        #    delivery_end   = datetime.strptime(delivery.end_date, '%Y-%m-%d %H:%M:%S')
4292
436
        #    delivery_end   = pytz.utc.localize(delivery_end).astimezone(tz2)
4293
437
        #
4294
438
        #    delivery_time_obj.write(cr2, 1, [delivery.id], {'start_date':delivery_start,'end_date':delivery_end})
4295
439
        #    cr2.commit()
4296
440
        ##################################################
4297
441
        cr.close()
4298
442
        cr2.close()
4299
443
        cr3.close()
4300
444
        logger.warning('################ DONE ################')
4301
445
        """
4302
446
        return
4303
447
dts_reset()
4304
448
4305
449
class delivery_reset(osv.osv_memory):
4306
450
    _name = 'delivery.reset'
4307
451
    
4308
452
    def go(self, cr, uid, ids, context=None):
4309
453
        context = context or {}
4310
454
        use_new_cursor = cr.dbname
4311
455
        threaded_calculation = threading.Thread(target=self.pool.get('dts.reset').resetall, args=(cr, uid, context))
4312
456
        threaded_calculation.start()
4313
457
        return {'type': 'ir.actions.act_window_close'}
4314
458
delivery_reset()
4315
459
4316
460
#class add_picking_pack(osv.osv_memory):
4317
461
#    _name='add.picking.pack'
4318
462
#
4319
463
#    _columns = {
4320
464
#            }
4321
465
#
4322
466
#    def confirm_add(self, cr, uid, ids, context=None):
4323
467
#        picking_ids = context['active_ids']
4324
468
#        
4325
469
#        sequence_obj = self.pool.get('ir.sequence')
4326
470
#        picking_obj = self.pool.get('stock.picking')
4327
471
#        move_obj = self.pool.get('stock.move')
4328
472
#        ul_obj = self.pool.get('product.ul')
4329
473
#        batch_obj = self.pool.get('picking.batch')
4330
474
#        tracking_obj = self.pool.get('stock.tracking')
4331
475
#
4332
476
#        batch_id = batch_obj.create(cr, uid, {
4333
477
#            'name': sequence_obj.get(cr, uid, 'picking.batch')
4334
478
#            },context=context)
4335
479
#
4336
480
#        for picking in picking_obj.browse(cr, uid, picking_ids, context):
4337
481
#            picking_obj.write(cr, uid, [picking.id,], {'batch_id':batch_id})
4338
482
#            for line in picking.move_lines :
4339
483
#                tracking_ids = tracking_obj.search(cr, uid, [
4340
484
#                    ('picking_id','=',picking.id),
4341
485
#                    ('ul_id','=',line.product_id.ul_id and line.product_id.ul_id.id or False)],context=context)
4342
486
#                if tracking_ids :
4343
487
#                    tracking_id = tracking_ids[0]
4344
488
#                else:
4345
489
#                    tracking_id = tracking_obj.create(cr, uid, {
4346
490
#                        'name':'%s_%s' % (picking.name,line.product_id.ul_id.name),
4347
491
#                        'picking_id':picking.id,
4348
492
#                        'ul_id':line.product_id.ul_id and line.product_id.ul_id.id or False,
4349
493
#                        },
4350
494
#                        context=context)
4351
495
#                move_obj.write(cr, uid,[line.id], {'tracking_id':tracking_id},context=context)
4352
496
#
4353
497
#        return {
4354
498
#                'type': 'ir.actions.act_window_close',
4355
499
#                }
4356
500
#
4357
501
#add_picking_pack()
4358
502
4359
503
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4360
0
\ No newline at end of file
504
\ No newline at end of file
4361
1
505
4362
=== added file 'delivery_plan/wizard/stock_view.xml'
4363
--- delivery_plan/wizard/stock_view.xml	1970-01-01 00:00:00 +0000
4364
+++ delivery_plan/wizard/stock_view.xml	2013-09-09 08:37:27 +0000
4365
@@ -0,0 +1,463 @@
4366
1
<?xml version="1.0" encoding="utf-8"?>
4367
2
<openerp>
4368
3
    <data>
4369
4
        <record id="view_dts_to_routes" model="ir.ui.view">
4370
5
            <field name="name">Prepare Routes for DTS</field>
4371
6
            <field name="model">delivery.dts_to_routes</field>
4372
7
            <field name="arch" type="xml">
4373
8
                <form string="Prepare Routes for DTS" version="7.0">
4374
9
                    <field name="dts_id"/>
4375
10
                    <footer>
4376
11
                        <button name="generate_routes" string="Confirm" type="object" class="oe_highlight"/>
4377
12
                        or
4378
13
                        <button string="Cancel" class="oe_link" special="cancel"/>
4379
14
                    </footer>
4380
15
                </form>
4381
16
            </field>
4382
17
        </record>
4383
18
        <record id="view_dts_to_vans" model="ir.ui.view">
4384
19
            <field name="name">Prepare Vans for DTS</field>
4385
20
            <field name="model">delivery.dts_to_vans</field>
4386
21
            <field name="arch" type="xml">
4387
22
                <form string="Prepare Vans for DTS" version="7.0">
4388
23
                    <field name="dts_id"/>
4389
24
                    <footer>
4390
25
                        <button name="open_kanban" string="Confirm" type="object" class="oe_highlight"/>
4391
26
                        or
4392
27
                        <button string="Cancel" class="oe_link" special="cancel"/>
4393
28
                    </footer>
4394
29
                </form>
4395
30
            </field>
4396
31
        </record>
4397
32
4398
33
		<act_window name="Prepare Routes for DTS"
4399
34
            res_model="delivery.dts_to_routes"
4400
35
            view_mode="form"
4401
36
            target="new"
4402
37
            id="action_dts_to_routes"/>
4403
38
		
4404
39
		<act_window name="Prepare Vans for DTS"
4405
40
            res_model="delivery.dts_to_vans"
4406
41
            view_mode="form"
4407
42
            target="new"
4408
43
            id="action_dts_to_vans"/>
4409
44
        
4410
45
		<menuitem name="Prepare Delivery Routes" id="menu_delivery_wizard" parent="delivery_routes.menu_delivery_root" sequence="0"/>
4411
46
		<menuitem action="action_dts_to_vans" name="Prepare Vans for DTS" id="menu_action_dts_to_vans" parent="menu_delivery_wizard" sequence="10"/>
4412
47
        <menuitem action="action_dts_to_routes" name="Prepare Routes for DTS" id="menu_action_dts_to_routes" parent="menu_delivery_wizard" sequence="15"/>
4413
48
        
4414
49
        
4415
50
        
4416
51
        <record id="view_driver_for_routes" model="ir.ui.view">
4417
52
            <field name="name">Choose Driver / Deliver for DTS</field>
4418
53
            <field name="model">delivery.driver_for_routes</field>
4419
54
            <field name="arch" type="xml">
4420
55
                <form string="Choose Driver / Deliver for DTS" version="7.0">
4421
56
                    <group colspan="2" col="4">
4422
57
                        <field name="dts_id"/>
4423
58
                        <!--field name="action"/-->
4424
59
                    </group>
4425
60
                    <footer>
4426
61
                        <button name="open_kanban" string="Confirm" type="object" class="oe_highlight"/>
4427
62
                        or
4428
63
                        <button string="Cancel" class="oe_link" special="cancel"/>
4429
64
                    </footer>
4430
65
                </form>
4431
66
            </field>
4432
67
        </record>
4433
68
        
4434
69
		<act_window name="Choose Driver / Deliver for DTS"
4435
70
            res_model="delivery.driver_for_routes"
4436
71
            view_mode="form"
4437
72
            target="new"
4438
73
            id="action_driver_for_routes"/>
4439
74
        <menuitem action="action_driver_for_routes" name="Choose Driver / Deliver for DTS" id="menu_action_driver_for_routes" parent="menu_delivery_wizard" sequence="25"/>
4440
75
        
4441
76
        
4442
77
        
4443
78
        <record model="ir.ui.view" id="delivery_route_driver_kanban_view">
4444
79
            <field name="name">delivery.route.driver.kanban</field>
4445
80
            <field name="model">delivery.route</field>
4446
81
            <field name="arch" type="xml">
4447
82
                <kanban version="7.0">
4448
83
                    <field name="dts_id"/>
4449
84
                    <field name="driver_id"/>
4450
85
                    <field name="picker_id"/>
4451
86
                    <field name="state"/>
4452
87
                    <templates>
4453
88
                    <t t-name="kanban-box">
4454
89
                        <div t-attf-class="oe_kanban_card oe_kanban_global_click">
4455
90
                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
4456
91
                                <span class="oe_e">í</span>
4457
92
                                <ul class="oe_dropdown_menu">
4458
93
                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
4459
94
                                </ul>
4460
95
                            </div>
4461
96
                            <div class="oe_kanban_content">
4462
97
                                <div><b><field name="name"/></b></div>
4463
98
                                <div>
4464
99
                                    <field name="date"/><br />
4465
100
                                    <field name="state"/>
4466
101
                                </div>
4467
102
                            </div>
4468
103
                            <div class="oe_clear"></div>
4469
104
                        </div>
4470
105
                    </t>
4471
106
                </templates>
4472
107
            </kanban>
4473
108
        </field>
4474
109
    </record>
4475
110
	<record id="action_delivery_route_driver_kanban" model="ir.actions.act_window">
4476
111
	    <field name="name">Delivery Route Driver Kanban</field>
4477
112
	    <field name="type">ir.actions.act_window</field>
4478
113
	    <field name="res_model">delivery.route</field>
4479
114
	    <field name="view_type">tree</field>
4480
115
	    <field name="view_mode">kanban,form</field>
4481
116
    </record>
4482
117
        
4483
118
        
4484
119
        <record model="ir.ui.view" id="delivery_route_line_kanban_view_fc">
4485
120
            <field name="name">delivery.route.line.kanban_fc</field>
4486
121
            <field name="model">delivery.route.line</field>
4487
122
            <field name="arch" type="xml">
4488
123
                <kanban version="7.0">
4489
124
                    <field name="picking_id"/>
4490
125
                    <field name="route_id"/>
4491
126
                    <field name="address_id"/>
4492
127
                    <field name="note"/>
4493
128
                    <field name="sequence"/>
4494
129
                    <field name="color"/>
4495
130
                    <field name="neighborhood"/>
4496
131
                    <field name="state"/>
4497
132
                    <field name="customer_date"/>
4498
133
                    <templates>
4499
134
                    <t t-name="kanban-box">
4500
135
                        <div style="width:175px;" t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_no_auto_height">
4501
136
                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
4502
137
                                <span class="oe_e">í</span>
4503
138
                                <ul class="oe_dropdown_menu">
4504
139
                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
4505
140
                                    <t t-if="record.state.raw_value == 'draft'"><li><ul class="oe_kanban_colorpicker" data-field="color"/></li></t>
4506
141
                                </ul>
4507
142
                            </div>
4508
143
                            <div class="oe_kanban_content">
4509
144
                                <div>
4510
145
                                    <field name="color"/> - 
4511
146
                                    <span t-if="record.neighborhood.raw_value != null"><field name="neighborhood"/> - </span>
4512
147
                                    <field name="street"/>
4513
148
                                    <div t-if="record.customer_date.raw_value != null"><field name="customer_date"/></div>
4514
149
                                </div>
4515
150
	                            <!--div class="oe_kanban_bottom_right">
4516
151
		                            <a name="set_van_0" type="object" class="oe_kanban_color_0 oe_kanban_button">No</a>
4517
152
		                            <a name="set_van_1" type="object" class="oe_kanban_color_1 oe_kanban_button">1</a>
4518
153
		                            <a name="set_van_2" type="object" class="oe_kanban_color_2 oe_kanban_button">2</a>
4519
154
		                            <a name="set_van_3" type="object" class="oe_kanban_color_3 oe_kanban_button">3</a>
4520
155
		                            <a name="set_van_4" type="object" class="oe_kanban_color_4 oe_kanban_button">4</a>
4521
156
		                            <a name="set_van_5" type="object" class="oe_kanban_color_5 oe_kanban_button">5</a>
4522
157
		                            <a name="set_van_6" type="object" class="oe_kanban_color_6 oe_kanban_button">6</a>
4523
158
		                            <a name="set_van_7" type="object" class="oe_kanban_color_7 oe_kanban_button">7</a>
4524
159
		                            <a name="set_van_8" type="object" class="oe_kanban_color_8 oe_kanban_button">8</a>
4525
160
		                            <a name="set_van_9" type="object" class="oe_kanban_color_9 oe_kanban_button">9</a>
4526
161
		                        </div-->
4527
162
		                        <div class="oe_clear"></div>
4528
163
                            </div>
4529
164
                            <div class="oe_clear"></div>
4530
165
                        </div>
4531
166
                    </t>
4532
167
                </templates>
4533
168
            </kanban>
4534
169
        </field>
4535
170
    </record>
4536
171
        
4537
172
        
4538
173
        <record id="view_stock_change_dts_wizard" model="ir.ui.view">
4539
174
            <field name="name">Change DTS / PTS</field>
4540
175
            <field name="model">delivery.change.dts</field>
4541
176
            <field name="arch" type="xml">
4542
177
                <form string="Change DTS / PTS" version="7.0">
4543
178
                    <group>
4544
179
                        <field name="action"/>
4545
180
                        <field name="dts_id" on_change="dts_id_change(dts_id, pts_id, context)" attrs="{'invisible':[('action','=','cleanup')]}"/>
4546
181
                        <field name="pts_id" domain="[('dts_id','=',dts_id)]" attrs="{'invisible':[('action','=','cleanup')]}"/>
4547
182
                    </group>
4548
183
                    <footer>
4549
184
                        <button name="change_dts" string="Update" type="object" class="oe_highlight"/>
4550
185
                        or
4551
186
                        <button string="Cancel" class="oe_link" special="cancel" />
4552
187
                    </footer>
4553
188
                </form>
4554
189
            </field>
4555
190
        </record>
4556
191
        
4557
192
        <act_window name="Change DTS / PTS"
4558
193
            res_model="delivery.change.dts"
4559
194
            src_model="stock.picking"
4560
195
            view_mode="form"
4561
196
            target="new"
4562
197
            key2="client_action_multi"
4563
198
            multi="True"
4564
199
            id="action_stock_change_dts_wizard"/>
4565
200
4566
201
4567
202
4568
203
		<record model="ir.ui.view" id="delivery_driver_kanban_view">
4569
204
            <field name="name">delivery.driver.kanban</field>
4570
205
            <field name="model">delivery.driver</field>
4571
206
            <field name="arch" type="xml">
4572
207
                <kanban version="7.0" default_group_by="tmp_route_id">
4573
208
                    <field name="tmp_route_id"/>
4574
209
                    <field name="is_driver"/>
4575
210
                    <field name="is_picker"/>
4576
211
                    <field name="color"/>
4577
212
                    <templates>
4578
213
                    <t t-name="kanban-box">
4579
214
                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_no_auto_height">
4580
215
                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
4581
216
                                <span class="oe_e">í</span>
4582
217
                                <ul class="oe_dropdown_menu">
4583
218
                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
4584
219
                                </ul>
4585
220
                            </div>
4586
221
                            <div class="oe_kanban_content">
4587
222
                                <div><b><field name="name"/></b></div>
4588
223
                            </div>
4589
224
                            <div class="oe_clear"></div>
4590
225
                        </div>
4591
226
                    </t>
4592
227
                </templates>
4593
228
            </kanban>
4594
229
        </field>
4595
230
    </record>
4596
231
        
4597
232
        <!--record id="view_add_picking_pack" model="ir.ui.view">
4598
233
            <field name="name">Add Picking to Pack</field>
4599
234
            <field name="model">add.picking.pack</field>
4600
235
            <field name="type">form</field>
4601
236
            <field name="arch" type="xml">
4602
237
                <form string="Pack Delivery notes">
4603
238
                    <separator string="Pack the selected Delivery notes ?"/>
4604
239
                    <newline/>
4605
240
                    <button special="cancel" string="Cancel"/>
4606
241
                    <button name="confirm_add" string="Confirm" type="object"/>
4607
242
                </form>
4608
243
            </field>
4609
244
        </record>
4610
245
4611
246
        <act_window name="Add Picking to Pack"
4612
247
            src_model="stock.picking"
4613
248
            res_model="add.picking.pack"
4614
249
            id="action_add_picking_pack_wizard"
4615
250
            view_mode="form"
4616
251
            multi="True"
4617
252
            key2="client_action_multi"
4618
253
            target="new"/-->
4619
254
           
4620
255
        <record id="view_to_be_deleted_soon" model="ir.ui.view">
4621
256
            <field name="name">TO BE DELETED SOON</field>
4622
257
            <field name="model">delivery.reset</field>
4623
258
            <field name="arch" type="xml">
4624
259
                <form string="RESET ALL DELIVERY" version="7.0">
4625
260
                    <footer>
4626
261
                        <button name="go" string="Confirm" type="object" class="oe_highlight"/>
4627
262
                        or
4628
263
                        <button string="Cancel" class="oe_link" special="cancel"/>
4629
264
                    </footer>
4630
265
                </form>
4631
266
            </field>
4632
267
        </record>
4633
268
		<act_window name="RESET ALL DELIVERY"
4634
269
            res_model="delivery.reset"
4635
270
            view_mode="form"
4636
271
            target="new"
4637
272
            id="action_resetall"/>
4638
273
        <menuitem action="action_resetall" name="RESET ALL DELIVERY" id="menu_action_resetall" parent="delivery_routes.menu_delivery_config" sequence="125"/>
4639
274
4640
275
4641
276
        
4642
277
        <!-- kanban view for stock picking with delivery-->
4643
278
        <record model="ir.ui.view" id="stock_picking_inout_kanban_elico">
4644
279
            <field name="name">stock.picking.out.kanban</field>
4645
280
            <field name="model">stock.picking</field>
4646
281
            <field name="arch" type="xml">
4647
282
                <kanban version="7.0" default_group_by="dts_id">
4648
283
                    <field name="dts_id"/>
4649
284
                    <field name="min_date"/>
4650
285
                    <field name="origin"/>
4651
286
                    <field name="partner_id"/>
4652
287
                    <templates>
4653
288
                        <t t-name="kanban-box">
4654
289
                            <div t-attf-class="oe_kanban_card oe_kanban_global_click">
4655
290
                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
4656
291
                                    <span class="oe_e">í</span>
4657
292
                                    <ul class="oe_dropdown_menu">
4658
293
                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
4659
294
                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
4660
295
                                    </ul>
4661
296
                                </div>
4662
297
                                <div class="oe_kanban_content">
4663
298
                                    <div><b><field name="origin"/></b></div>
4664
299
                                    <div>
4665
300
                                        <field name="street"/><br />
4666
301
                                        <field name="min_date"/>
4667
302
                                    </div>
4668
303
                                </div>
4669
304
                                <div class="oe_clear"></div>
4670
305
                            </div>
4671
306
                        </t>
4672
307
                    </templates>
4673
308
                </kanban>
4674
309
            </field>
4675
310
        </record>
4676
311
        
4677
312
        <record id="view_picking_search_kanban" model="ir.ui.view">
4678
313
            <field name="name">stock.picking.search.kanban</field>
4679
314
            <field name="model">stock.picking</field>
4680
315
            <field name="arch" type="xml">
4681
316
                <search string="PO + SO">
4682
317
                    <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
4683
318
                    <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
4684
319
                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
4685
320
                    <separator/>
4686
321
                    <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
4687
322
                    <separator/>
4688
323
                    <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
4689
324
                    <field name="stock_journal_id"/>
4690
325
                    <field name="product_id"/>
4691
326
                    <group expand="0" string="Group By...">
4692
327
                        <filter icon="terp-stock_effects-object-colorize" name="state" string="Status" domain="[]" context="{'group_by':'state'}"/>
4693
328
                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
4694
329
                        <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/>
4695
330
                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
4696
331
                        <filter icon="terp-go-today" string="DTS Today" name="dts_today" domain="[('dts_id.start_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('dts_id.start_date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="DTS planned for Today"/>
4697
332
                        <filter icon="terp-go-today" string="DTS Today+Past" name="dts_min_today" domain="['|',('dts_id.start_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('dts_id','=',None)]" help="DTS planned Today or before"/>
4698
333
                        <filter icon="terp-go-today" string="Today" domain="[('min_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('min_date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
4699
334
                    </group>
4700
335
                </search>
4701
336
            </field>
4702
337
        </record>
4703
338
        <record id="action_picking_inout_kanban" model="ir.actions.act_window">
4704
339
            <field name="name">PO + SO / DTS</field>
4705
340
            <field name="res_model">stock.picking</field>
4706
341
            <field name="type">ir.actions.act_window</field>
4707
342
            <field name="view_type">tree</field>
4708
343
            <field name="view_mode">kanban,form</field>
4709
344
            <field name="domain">['&amp;','|','&amp;',('type','=','in'),'&amp;',('state','=','assigned'),("is_collected","=",True),'&amp;',('type','=','out'),("state","not in",["cancel"]),("delivery_state","in",['','not_planned','del_rt'])]</field>
4710
345
            <field name="context">{'contact_display': 'partner_address', 'update_pts':1, 'search_default_dts_min_today': 1}</field>
4711
346
            <field name="search_view_id" ref="view_picking_search_kanban"/>
4712
347
        </record>
4713
348
        <menuitem action="action_picking_inout_kanban" id="menu_action_picking_inout_kanban" parent="delivery_plan.menu_delivery_wizard" sequence="1"/>
4714
349
        <!-- stock picking with delivery end -->
4715
350
        
4716
351
4717
352
4718
353
4719
354
        <!-- kanban view for stock picking with delivery-->
4720
355
        <record model="ir.ui.view" id="stock_picking_inout_kanban_elico">
4721
356
            <field name="name">stock.picking.out.kanban</field>
4722
357
            <field name="model">stock.picking</field>
4723
358
            <field name="arch" type="xml">
4724
359
                <kanban version="7.0" default_group_by="dts_id">
4725
360
                    <field name="dts_id"/>
4726
361
                    <field name="min_date"/>
4727
362
                    <field name="origin"/>
4728
363
                    <field name="partner_id"/>
4729
364
                    <templates>
4730
365
                        <t t-name="kanban-box">
4731
366
                            <div t-attf-class="oe_kanban_card oe_kanban_global_click">
4732
367
                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
4733
368
                                    <span class="oe_e">í</span>
4734
369
                                    <ul class="oe_dropdown_menu">
4735
370
                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
4736
371
                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
4737
372
                                    </ul>
4738
373
                                </div>
4739
374
                                <div class="oe_kanban_content">
4740
375
                                    <div><b><field name="origin"/></b></div>
4741
376
                                    <div>
4742
377
                                        <field name="street"/><br />
4743
378
                                        <field name="min_date"/>
4744
379
                                    </div>
4745
380
                                </div>
4746
381
                                <div class="oe_clear"></div>
4747
382
                            </div>
4748
383
                        </t>
4749
384
                    </templates>
4750
385
                </kanban>
4751
386
            </field>
4752
387
        </record>
4753
388
        <!--record model="ir.ui.view" id="stock_picking_in_kanban_elico">
4754
389
            <field name="name">stock.picking.in.kanban</field>
4755
390
            <field name="model">stock.picking.in</field>
4756
391
            <field name="arch" type="xml">
4757
392
                <kanban version="7.0" default_group_by="dts_id">
4758
393
                    <field name="dts_id"/>
4759
394
                    <field name="min_date"/>
4760
395
                    <field name="origin"/>
4761
396
                    <field name="partner_id"/>
4762
397
                    <templates>
4763
398
                        <t t-name="kanban-box">
4764
399
                            <div t-attf-class="oe_kanban_card oe_kanban_global_click">
4765
400
                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
4766
401
                                    <span class="oe_e">í</span>
4767
402
                                    <ul class="oe_dropdown_menu">
4768
403
                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
4769
404
                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
4770
405
                                    </ul>
4771
406
                                </div>
4772
407
                                <div class="oe_kanban_content">
4773
408
                                    <div><b><field name="origin"/></b></div>
4774
409
                                    <div>
4775
410
                                        (<field name="name"/>)<br />
4776
411
                                        <field name="partner_id"/><br />
4777
412
                                        <field name="min_date"/>
4778
413
                                    </div>
4779
414
                                </div>
4780
415
                                <div class="oe_clear"></div>
4781
416
                            </div>
4782
417
                        </t>
4783
418
                    </templates>
4784
419
                </kanban>
4785
420
            </field>
4786
421
        </record-->
4787
422
        
4788
423
        <record id="view_picking_search_kanban" model="ir.ui.view">
4789
424
            <field name="name">stock.picking.search.kanban</field>
4790
425
            <field name="model">stock.picking</field>
4791
426
            <field name="arch" type="xml">
4792
427
                <search string="PO + SO">
4793
428
                    <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
4794
429
                    <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
4795
430
                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
4796
431
                    <separator/>
4797
432
                    <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
4798
433
                    <separator/>
4799
434
                    <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
4800
435
                    <field name="stock_journal_id"/>
4801
436
                    <field name="product_id"/>
4802
437
                    <group expand="0" string="Group By...">
4803
438
                        <filter icon="terp-stock_effects-object-colorize" name="state" string="Status" domain="[]" context="{'group_by':'state'}"/>
4804
439
                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
4805
440
                        <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/>
4806
441
                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
4807
442
                        <filter icon="terp-go-today" string="DTS Today" name="dts_today" domain="[('dts_id.start_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('dts_id.start_date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="DTS planned for Today"/>
4808
443
                        <filter icon="terp-go-today" string="DTS Today+Past" name="dts_min_today" domain="['|',('dts_id.start_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('dts_id','=',None)]" help="DTS planned Today or before"/>
4809
444
                        <filter icon="terp-go-today" string="Today" domain="[('min_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('min_date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
4810
445
                    </group>
4811
446
                </search>
4812
447
            </field>
4813
448
        </record>
4814
449
        <record id="action_picking_inout_kanban" model="ir.actions.act_window">
4815
450
            <field name="name">PO + SO / DTS</field>
4816
451
            <field name="res_model">stock.picking</field>
4817
452
            <field name="type">ir.actions.act_window</field>
4818
453
            <field name="view_type">tree</field>
4819
454
            <field name="view_mode">kanban,form</field>
4820
455
            <field name="domain">['&amp;','|','&amp;',('type','=','in'),'&amp;',('state','=','assigned'),("is_collected","=",True),'&amp;',('type','=','out'),("state","not in",["cancel"]),("delivery_state","in",['','not_planned','del_rt'])]</field>
4821
456
            <field name="context">{'contact_display': 'partner_address', 'update_pts':1, 'search_default_dts_min_today': 1}</field>
4822
457
            <field name="search_view_id" ref="view_picking_search_kanban"/>
4823
458
        </record>
4824
459
        <menuitem action="action_picking_inout_kanban" id="menu_action_picking_inout_kanban" parent="delivery_plan.menu_delivery_wizard" sequence="1"/>
4825
460
        <!-- stock picking with delivery end -->
4826
461
        
4827
462
    </data>
4828
463
</openerp>
4829
0
\ No newline at end of file
464
\ No newline at end of file
4830
1
465
4831
=== added directory 'delivery_routes'
4832
=== added file 'delivery_routes/__init__.py'
4833
--- delivery_routes/__init__.py	1970-01-01 00:00:00 +0000
4834
+++ delivery_routes/__init__.py	2013-09-09 08:37:27 +0000
4835
@@ -0,0 +1,34 @@
4836
1
# -*- encoding: utf-8 -*-
4837
2
##############################################################################
4838
3
#
4839
4
#    OpenERP, Open Source Management Solution
4840
5
# Copyright (c) 2011 Cubic ERP - Teradata SAC. (http://cubicerp.com).
4841
6
#
4842
7
# WARNING: This program as such is intended to be used by professional
4843
8
# programmers who take the whole responsability of assessing all potential
4844
9
# consequences resulting from its eventual inadequacies and bugs
4845
10
# End users who are looking for a ready-to-use solution with commercial
4846
11
# garantees and support are strongly adviced to contract a Free Software
4847
12
# Service Company
4848
13
#
4849
14
# This program is Free Software; you can redistribute it and/or
4850
15
# modify it under the terms of the GNU General Public License
4851
16
# as published by the Free Software Foundation; either version 2
4852
17
# of the License, or (at your option) any later version.
4853
18
#
4854
19
# This program is distributed in the hope that it will be useful,
4855
20
# but WITHOUT ANY WARRANTY; without even the implied warranty of
4856
21
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4857
22
# GNU General Public License for more details.
4858
23
#
4859
24
# You should have received a copy of the GNU General Public License
4860
25
# along with this program; if not, write to the Free Software
4861
26
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
4862
27
#
4863
28
##############################################################################
4864
29
import stock
4865
30
import delivery
4866
31
import purchase 
4867
32
import wizard
4868
33
4869
34
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4870
0
35
4871
=== added file 'delivery_routes/__openerp__.py'
4872
--- delivery_routes/__openerp__.py	1970-01-01 00:00:00 +0000
4873
+++ delivery_routes/__openerp__.py	2013-09-09 08:37:27 +0000
4874
@@ -0,0 +1,63 @@
4875
1
# -*- encoding: utf-8 -*-
4876
2
##############################################################################
4877
3
#
4878
4
#    OpenERP, Open Source Management Solution
4879
5
#    Copyright (C) 2011 Cubic ERP - Teradata SAC (<http://cubicerp.com>).
4880
6
#    Copyright (C) 2013 Elico Corp (<http://www.elico-corp.com>).
4881
7
#
4882
8
#    This program is free software: you can redistribute it and/or modify
4883
9
#    it under the terms of the GNU Affero General Public License as
4884
10
#    published by the Free Software Foundation, either version 3 of the
4885
11
#    License, or (at your option) any later version.
4886
12
#
4887
13
#    This program is distributed in the hope that it will be useful,
4888
14
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
4889
15
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4890
16
#    GNU Affero General Public License for more details.
4891
17
#
4892
18
#    You should have received a copy of the GNU Affero General Public License
4893
19
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
4894
20
#
4895
21
##############################################################################
4896
22
{
4897
23
    "name": "Delivery Routes",
4898
24
    "version": "1",
4899
25
    "description": """
4900
26
Manage delivery routes.
4901
27
=======================
4902
28
Based on Cubic ERP's Delivery Routes Module\n
4903
29
it add the following features:\n
4904
30
* Add group Customer Service
4905
31
* Add dts_id in purchase order, A purchase order with flag is_collected can have a delivery_route_line
4906
32
* Improve DTS , PTS. 
4907
33
* Improve Delivery carrier and driver, picker. Add color for delivery driver and picker.
4908
34
* Add interface functions with other modules sales, purchase, stock
4909
35
* use 3-seg daily dts/pts to arrange delivery.
4910
36
""",
4911
37
    "author": "Elico Corp",
4912
38
    "website": "http://www.elico-corp.com",
4913
39
    "category": "Stock Management",
4914
40
    "depends": [
4915
41
            "delivery",
4916
42
            "stock",
4917
43
            "hr",
4918
44
            #'quality_control_elico',
4919
45
        ],
4920
46
    "data":[
4921
47
            "security/delivery_security.xml",
4922
48
            "security/ir.model.access.csv",
4923
49
            "wizard/fill_picking.xml",
4924
50
            "wizard/select_range_view.xml",
4925
51
            "delivery_view.xml",
4926
52
            "delivery_sequence.xml",
4927
53
            "stock_view.xml",
4928
54
            "purchase_view.xml",
4929
55
            "wizard/stock_view.xml",
4930
56
    ],
4931
57
    "demo_xml": [ ],
4932
58
    "active": False,
4933
59
    "installable": True,
4934
60
    "certificate" : "",
4935
61
    'images': [],
4936
62
}
4937
63
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4938
0
64
4939
=== added file 'delivery_routes/delivery.py'
4940
--- delivery_routes/delivery.py	1970-01-01 00:00:00 +0000
4941
+++ delivery_routes/delivery.py	2013-09-09 08:37:27 +0000
4942
@@ -0,0 +1,660 @@
4943
1
# -*- coding: utf-8 -*-
4944
2
##############################################################################
4945
3
#    
4946
4
#    OpenERP, Open Source Management Solution
4947
5
#    Copyright (c) 2012 Cubic ERP - Teradata SAC. (http://cubicerp.com).
4948
6
#
4949
7
#    This program is free software: you can redistribute it and/or modify
4950
8
#    it under the terms of the GNU Affero General Public License as
4951
9
#    published by the Free Software Foundation, either version 3 of the
4952
10
#    License, or (at your option) any later version.
4953
11
#
4954
12
#    This program is distributed in the hope that it will be useful,
4955
13
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
4956
14
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4957
15
#    GNU Affero General Public License for more details.
4958
16
#
4959
17
#    You should have received a copy of the GNU Affero General Public License
4960
18
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
4961
19
#
4962
20
##############################################################################
4963
21
4964
22
from osv import fields, osv
4965
23
import time
4966
24
from datetime import datetime
4967
25
import pytz
4968
26
from tools.translate import _
4969
27
from tools import ustr
4970
28
import logging
4971
29
_logger = logging.getLogger(__name__)
4972
30
4973
31
4974
32
class sale_order(osv.osv):
4975
33
    _inherit = "sale.order"
4976
34
    
4977
35
    _columns = {
4978
36
        'so_payment_method': fields.char('Payment Method', size=32),
4979
37
    }
4980
38
sale_order()
4981
39
4982
40
class delivery_driver(osv.osv):
4983
41
    _name='delivery.driver'
4984
42
    
4985
43
    _columns = {
4986
44
        'partner_id': fields.many2one('res.partner','Partner',help='Fill this field if the driver is a outsourcing of the company'),
4987
45
        'employee_id': fields.many2one('hr.employee','Employee',help='Fill this if the driver is a employee of the company'),
4988
46
        'name': fields.char('Name', size=64, required=True),
4989
47
        'carrier_id': fields.many2one('delivery.carrier','Carrier'),
4990
48
        'outsourcing': fields.boolean('Outsourcing ?'),
4991
49
        'route_ids': fields.one2many('delivery.route','driver_id','Delivery Routes'),
4992
50
        'is_driver': fields.boolean('Is Driver ?'),
4993
51
        'is_picker': fields.boolean('Is Picker ?'),
4994
52
        'active': fields.boolean('Active ?'),
4995
53
        'color': fields.integer('Color Index'),
4996
54
        'tmp_route_id': fields.many2one('delivery.route_tmp','Temporary Delivery Route'),
4997
55
    }
4998
56
    _defaults = {
4999
57
        'outsourcing': False,
5000
58
        'is_driver':   True,
Status:	Merged
Merged at revision:	4
Proposed branch:	lp:~jean-lelievre/openobject-addons/elico-7.0_modules_updates
Merge into:	lp:~elico-corp/openobject-addons/elico-7.0
Diff against target:	22991 lines (+22203/-0) 125 files modified account_prepayment/static/description/index.html (+16/-0) delivery_plan/__init__.py (+27/-0) delivery_plan/__openerp__.py (+58/-0) delivery_plan/delivery_report.xml (+73/-0) delivery_plan/i18n/zh_CN.po (+703/-0) delivery_plan/partner.py (+33/-0) delivery_plan/report/__init__.py (+32/-0) delivery_plan/report/delivery_route_print.mako (+110/-0) delivery_plan/report/delivery_route_print.mako.1 (+111/-0) delivery_plan/report/delivery_route_print.py (+39/-0) delivery_plan/report/delivery_route_print.py.bak (+53/-0) delivery_plan/report/delivery_route_print.rml (+243/-0) delivery_plan/report/delivery_route_print.rml.bk (+266/-0) delivery_plan/sale.py (+1182/-0) delivery_plan/security/ir.model.access.csv (+3/-0) delivery_plan/sequence.xml (+18/-0) delivery_plan/static/description/index.html (+40/-0) delivery_plan/stock_view.xml (+694/-0) delivery_plan/wizard/__init__.py (+25/-0) delivery_plan/wizard/stock.py (+503/-0) delivery_plan/wizard/stock_view.xml (+463/-0) delivery_routes/__init__.py (+34/-0) delivery_routes/__openerp__.py (+63/-0) delivery_routes/delivery.py (+660/-0) delivery_routes/delivery_sequence.xml (+21/-0) delivery_routes/delivery_view.xml (+499/-0) delivery_routes/i18n/delivery_routes.pot (+603/-0) delivery_routes/i18n/es_PE.po (+603/-0) delivery_routes/i18n/zh_CN.po (+873/-0) delivery_routes/purchase.py (+33/-0) delivery_routes/purchase_view.xml (+68/-0) delivery_routes/report.xml (+240/-0) delivery_routes/security/delivery_security.xml (+19/-0) delivery_routes/security/ir.model.access.csv (+15/-0) delivery_routes/static/description/index.html (+43/-0) delivery_routes/stock.py (+352/-0) delivery_routes/stock_view.xml (+203/-0) delivery_routes/wizard/__init__.py (+34/-0) delivery_routes/wizard/fill_picking.py (+125/-0) delivery_routes/wizard/fill_picking.xml (+33/-0) delivery_routes/wizard/select_range.py (+47/-0) delivery_routes/wizard/select_range_view.xml (+32/-0) delivery_routes/wizard/stock.py (+46/-0) delivery_routes/wizard/stock_view.xml (+32/-0) move_reports/__init__.py (+26/-0) move_reports/__openerp__.py (+59/-0) move_reports/security/ir.model.access.csv (+2/-0) move_reports/static/description/index.html (+25/-0) move_reports/stock_move_report/__init__.py (+22/-0) move_reports/stock_move_report/stock_move_report.py (+482/-0) move_reports/stock_move_report/stock_move_report_view.xml (+113/-0) mrp_wave/__init__.py (+24/-0) mrp_wave/__openerp__.py (+52/-0) mrp_wave/static/description/index.html (+16/-0) mrp_wave/wizard/__init__.py (+25/-0) mrp_wave/wizard/scheduler.py (+1104/-0) mrp_wave/wizard/scheduler.xml (+268/-0) product_inventory_warning/__init__.py (+27/-0) product_inventory_warning/__openerp__.py (+53/-0) product_inventory_warning/i18n/zh_CN.po (+315/-0) product_inventory_warning/product.py (+613/-0) product_inventory_warning/product_view.xml (+137/-0) product_inventory_warning/security/ir.model.access.csv (+3/-0) product_inventory_warning/static/description/index.html (+23/-0) product_inventory_warning/wizard/__init__.py (+26/-0) product_inventory_warning/wizard/product_qty.py (+69/-0) product_inventory_warning/wizard/product_qty_view.xml (+32/-0) product_inventory_warning/wizard/product_sfc.py (+80/-0) product_inventory_warning/wizard/product_sfc_view.xml (+62/-0) product_separate_cost/__init__.py (+25/-0) product_separate_cost/__openerp__.py (+47/-0) product_separate_cost/product.py (+108/-0) product_separate_cost/static/description/index.html (+12/-0) product_stock_type/__init__.py (+26/-0) product_stock_type/__openerp__.py (+52/-0) product_stock_type/i18n/zh_CN.po (+93/-0) product_stock_type/product.py (+198/-0) product_stock_type/product_view.xml (+76/-0) product_stock_type/static/description/index.html (+22/-0) quality_control_elico/__init__.py (+25/-0) quality_control_elico/__openerp__.py (+56/-0) quality_control_elico/i18n/zh_CN.po (+214/-0) quality_control_elico/security/ir.model.access.csv (+18/-0) quality_control_elico/security/qc_security.xml (+15/-0) quality_control_elico/static/description/index.html (+20/-0) quality_control_elico/stock.py (+113/-0) quality_control_elico/stock_view.xml (+80/-0) stock_batch_move/__init__.py (+25/-0) stock_batch_move/__openerp__.py (+51/-0) stock_batch_move/i18n/zh_CN.po (+956/-0) stock_batch_move/i18n/zh_CN.po.old (+677/-0) stock_batch_move/static/description/index.html (+17/-0) stock_batch_move/wizard/__init__.py (+25/-0) stock_batch_move/wizard/stock_batch_move.py (+139/-0) stock_batch_move/wizard/stock_batch_move_view.xml (+35/-0) stock_extra/__init__.py (+25/-0) stock_extra/__openerp__.py (+53/-0) stock_extra/i18n/zh_CN.po (+956/-0) stock_extra/i18n/zh_CN.po.old (+677/-0) stock_extra/security/ir.model.access.csv (+2/-0) stock_extra/static/description/index.html (+23/-0) stock_extra/stock.py (+795/-0) stock_extra/stock_view.xml (+965/-0) stock_fillin_inventory_with_steps/__init__.py (+25/-0) stock_fillin_inventory_with_steps/__openerp__.py (+46/-0) stock_fillin_inventory_with_steps/static/description/index.html (+12/-0) stock_fillin_inventory_with_steps/wizard/__init__.py (+25/-0) stock_fillin_inventory_with_steps/wizard/stock_fill_inventory.py (+137/-0) stock_location_reports/__init__.py (+25/-0) stock_location_reports/__openerp__.py (+49/-0) stock_location_reports/report/__init__.py (+27/-0) stock_location_reports/report/lot_overview.py (+56/-0) stock_location_reports/report/lot_overview.rml (+212/-0) stock_location_reports/report/lot_overview_all.py (+55/-0) stock_location_reports/report/lot_overview_all.rml (+212/-0) stock_location_reports/report/stock_inventory_move.rml (+218/-0) stock_location_reports/report/stock_inventory_move_report.py (+47/-0) stock_location_reports/reports.xml (+11/-0) stock_location_reports/static/description/index.html (+21/-0) stock_with_cost/__init__.py (+25/-0) stock_with_cost/__openerp__.py (+48/-0) stock_with_cost/i18n/zh_CN.po (+956/-0) stock_with_cost/static/description/index.html (+20/-0) stock_with_cost/stock.py (+197/-0) stock_with_cost/stock_view.xml (+130/-0)
To merge this branch:	bzr merge lp:~jean-lelievre/openobject-addons/elico-7.0_modules_updates
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Elico Corp (www.elico-corp.com)		2013-09-09	Pending
Review via email: mp+184516@code.launchpad.net