unifield-wm

Merge lp:~unifield-team/unifield-wm/uf-2082 into lp:unifield-wm

  1. uf-2082
  2. Merge into trunk
Proposed by jftempo
Status: Needs review
Proposed branch: lp:~unifield-team/unifield-wm/uf-2082
Merge into: lp:unifield-wm
Diff against target: 139 lines (+15/-13)
8 files modified
msf_doc_import/purchase_order.py (+2/-2)
msf_doc_import/test/import_po.yml (+1/-1)
msf_doc_import/wizard/__init__.py (+1/-1)
msf_doc_import/wizard/wizard_import_po.py (+2/-3)
msf_doc_import/wizard/wizard_import_po_line.py (+2/-3)
msf_doc_import/wizard/wizard_import_po_line_view.xml (+3/-1)
msf_doc_import/wizard/wizard_import_po_view.xml (+3/-1)
msf_supply_doc_export/report/report_purchase_order_xls.mako (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/uf-2082
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+198663@code.launchpad.net
To post a comment you must log in.
lp:~unifield-team/unifield-wm/uf-2082 updated
1869. By Quentin THEURET @Amaris

Merge latest trunk

Unmerged revisions

1869. By Quentin THEURET @Amaris

Merge latest trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'msf_doc_import/purchase_order.py'
2--- msf_doc_import/purchase_order.py 2013-08-30 14:51:16 +0000
3+++ msf_doc_import/purchase_order.py 2013-12-12 13:02:32 +0000
4@@ -141,7 +141,7 @@
5 'res_id': export_id,
6 'view_type': 'form',
7 'view_mode': 'form',
8- 'target': 'crush',
9+ 'target': 'same',
10 'context': context,
11 }
12
13@@ -225,7 +225,7 @@
14 'res_id': export_id,
15 'view_type': 'form',
16 'view_mode': 'form',
17- 'target': 'crush',
18+ 'target': 'same',
19 'context': context,
20 }
21
22
23=== modified file 'msf_doc_import/test/import_po.yml'
24--- msf_doc_import/test/import_po.yml 2013-09-27 08:57:08 +0000
25+++ msf_doc_import/test/import_po.yml 2013-12-12 13:02:32 +0000
26@@ -47,7 +47,7 @@
27 cell_data = first_row.cells[cell].data
28 column_header.append(cell_data)
29 break
30- expected_header = ['Product Code', 'Product Description', 'Quantity', 'UoM', 'Price', 'Delivery requested date', 'Currency', 'Comment']
31+ expected_header = ['Product Code', 'Product Description', 'Quantity', 'UoM', 'Price', 'Delivery Request Date', 'Currency', 'Comment', 'Justification Code', 'Justification Coordination', 'HQ Remarks', 'Justification Y/N']
32 assert column_header==expected_header, ("Wrong header, it should be %s and it is %s" % (expected_header, column_header))
33 self.pool.get(res_model).cancel(cr, uid, wizard_values['res_id'], context)
34 -
35
36=== modified file 'msf_doc_import/wizard/__init__.py'
37--- msf_doc_import/wizard/__init__.py 2013-06-21 06:20:33 +0000
38+++ msf_doc_import/wizard/__init__.py 2013-12-12 13:02:32 +0000
39@@ -42,7 +42,7 @@
40
41 PO_COLUMNS_HEADER_FOR_IMPORT=[
42 (_('Product Code'), 'string'), (_('Product Description'), 'string'), (_('Quantity'), 'number'), (_('UoM'), 'string'), (_('Price'), 'number'),
43-(_('Delivery requested date'), 'date'), (_('Currency'), 'string'), (_('Comment'), 'string')]
44+(_('Delivery Request Date'), 'date'), (_('Currency'), 'string'), (_('Comment'), 'string'), (_('Justification Code'), 'string'), (_('Justification Coordination'), 'string'), (_('HQ Remarks'), 'string'), (_('Justification Y/N'), 'string')]
45 PO_LINE_COLUMNS_FOR_IMPORT = [x for (x, y) in PO_COLUMNS_HEADER_FOR_IMPORT]
46
47 FO_COLUMNS_HEADER_FOR_IMPORT=[
48
49=== modified file 'msf_doc_import/wizard/wizard_import_po.py'
50--- msf_doc_import/wizard/wizard_import_po.py 2013-10-28 13:32:02 +0000
51+++ msf_doc_import/wizard/wizard_import_po.py 2013-12-12 13:02:32 +0000
52@@ -846,9 +846,8 @@
53 thread = threading.Thread(target=self._import, args=(cr.dbname, uid, ids, context))
54 thread.start()
55 msg_to_return = _("""
56-Important, please do not update the Purchase Order %s
57-Import in progress, please leave this window open and press the button 'Update' when you think that the import is done.
58-Otherwise, you can continue to use Unifield.""") % self.pool.get('purchase.order').read(cr, uid, po_id, ['name'])['name']
59+ Please note that %s is temporary closed during the import to avoid conflict accesses (you can see the loading on the PO note tab check box). At the end of the load, POXX will be back in the right state. You can refresh the screen if you need to follow the upload progress
60+""") % self.pool.get('purchase.order').read(cr, uid, po_id, ['name'])['name']
61 return self.write(cr, uid, ids, {'message': msg_to_return, 'state': 'in_progress'}, context=context)
62
63 def dummy(self, cr, uid, ids, context=None):
64
65=== modified file 'msf_doc_import/wizard/wizard_import_po_line.py'
66--- msf_doc_import/wizard/wizard_import_po_line.py 2013-11-29 13:37:22 +0000
67+++ msf_doc_import/wizard/wizard_import_po_line.py 2013-12-12 13:02:32 +0000
68@@ -170,7 +170,7 @@
69
70 # Cell 5: Delivery Request Date
71 date_value = {}
72- date_value = check_line.compute_date_value(cell_nb=header_index[_('Delivery requested date')], row=row, to_write=to_write, context=context)
73+ date_value = check_line.compute_date_value(cell_nb=header_index[_('Delivery Request Date')], row=row, to_write=to_write, context=context)
74 to_write.update({'date_planned': date_value['date_planned'], 'error_list': date_value['error_list']})
75
76 # Cell 6: Currency
77@@ -308,8 +308,7 @@
78 thread.start()
79 else:
80 self._import(cr, uid, ids, context)
81- msg_to_return = _("""Import in progress, please leave this window open and press the button 'Update' when you think that the import is done.
82-Otherwise, you can continue to use Unifield.""")
83+ msg_to_return = _("""Please note that %s is temporary closed during the import to avoid conflict accesses (you can see the loading on the PO note tab check box). At the end of the load, POXX will be back in the right state. You can refresh the screen if you need to follow the upload progress""") % self.pool.get('purchase.order').browse(cr, uid, po_id).name
84 return self.write(cr, uid, ids, {'message': msg_to_return, 'state': 'in_progress'}, context=context)
85
86 def dummy(self, cr, uid, ids, context=None):
87
88=== modified file 'msf_doc_import/wizard/wizard_import_po_line_view.xml'
89--- msf_doc_import/wizard/wizard_import_po_line_view.xml 2013-03-13 16:24:00 +0000
90+++ msf_doc_import/wizard/wizard_import_po_line_view.xml 2013-12-12 13:02:32 +0000
91@@ -8,6 +8,8 @@
92 <field name="type">form</field>
93 <field name="arch" type="xml">
94 <form string="Import of lines">
95+ <separator colspan="4" string="Purchase information" />
96+ <field name="po_id" readonly="1" />
97 <separator colspan="4" string="File to import" />
98 <field name="file" filename="filename_template" />
99 <field name="percent_completed" widget="progressbar" attrs="{'invisible':[('state', '=', 'draft')]}"/>
100@@ -35,4 +37,4 @@
101 </record>
102
103 </data>
104-</openerp>
105\ No newline at end of file
106+</openerp>
107
108=== modified file 'msf_doc_import/wizard/wizard_import_po_view.xml'
109--- msf_doc_import/wizard/wizard_import_po_view.xml 2013-03-07 19:37:48 +0000
110+++ msf_doc_import/wizard/wizard_import_po_view.xml 2013-12-12 13:02:32 +0000
111@@ -8,6 +8,8 @@
112 <field name="type">form</field>
113 <field name="arch" type="xml">
114 <form string="Import po">
115+ <separator colspan="4" string="Purchase information" />
116+ <field name="po_id" readonly="1" />
117 <separator colspan="4" string="File to import" />
118 <field name="file" filename="filename_template" />
119 <field name="percent_completed" widget="progressbar" attrs="{'invisible':[('state', '=', 'draft')]}"/>
120@@ -37,4 +39,4 @@
121 </record>
122
123 </data>
124-</openerp>
125\ No newline at end of file
126+</openerp>
127
128=== modified file 'msf_supply_doc_export/report/report_purchase_order_xls.mako'
129--- msf_supply_doc_export/report/report_purchase_order_xls.mako 2013-09-24 11:48:30 +0000
130+++ msf_supply_doc_export/report/report_purchase_order_xls.mako 2013-12-12 13:02:32 +0000
131@@ -72,7 +72,7 @@
132 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Quantity')}</Data></Cell>
133 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('UoM')}</Data></Cell>
134 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Price')}</Data></Cell>
135- <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Delivery requested date')}</Data></Cell>
136+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Delivery Request Date')}</Data></Cell>
137 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Currency')}</Data></Cell>
138 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Comment')}</Data></Cell>
139 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Justification Code')}</Data></Cell>

Subscribers

People subscribed via source and target branches