Merge lp:~openerp-dev/openobject-addons/7.0-opw-594579-mahendra_barad into lp:openobject-addons

Proposed by Erwin van der Ploeg (BAS Solutions) on 2014-03-07
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-594579-mahendra_barad
Merge into: lp:openobject-addons
Diff against target: 432 lines (+67/-26) (has conflicts)
27 files modified
account/account_invoice.py (+1/-1)
account/partner.py (+2/-1)
account_voucher/account_voucher.py (+1/-1)
analytic/analytic.py (+1/-1)
crm/crm.py (+1/-1)
crm/crm_lead.py (+1/-1)
crm/crm_phonecall.py (+1/-1)
crm_claim/crm_claim.py (+1/-1)
crm_helpdesk/crm_helpdesk.py (+1/-1)
hr/hr.py (+5/-0)
hr_evaluation/hr_evaluation.py (+1/-1)
hr_expense/hr_expense.py (+1/-1)
hr_holidays/hr_holidays.py (+1/-1)
hr_recruitment/hr_recruitment.py (+1/-1)
hr_timesheet_sheet/hr_timesheet_sheet.py (+1/-1)
idea/models/idea.py (+4/-0)
mail/mail_thread.py (+1/-1)
mrp/mrp.py (+2/-2)
mrp_repair/mrp_repair.py (+1/-1)
procurement/procurement.py (+1/-1)
product/product.py (+26/-0)
project/project.py (+2/-2)
project_issue/project_issue.py (+1/-1)
purchase/purchase.py (+5/-0)
purchase_requisition/purchase_requisition.py (+1/-1)
sale/sale.py (+1/-1)
stock/stock.py (+2/-2)
Text conflict in hr/hr.py
Text conflict in idea/models/idea.py
Text conflict in product/product.py
Text conflict in purchase/purchase.py
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-594579-mahendra_barad
Reviewer Review Type Date Requested Status
OpenERP Core Team 2014-03-07 Pending
Review via email: mp+209916@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

9333. By Mahendra Barad(OpenERP) on 2013-09-03

Merge with 7.0

9332. By Mahendra Barad(OpenERP) on 2013-07-30

[IMP] module description field used in chatter message so it should be translat

9331. By Mahendra Barad(OpenERP) on 2013-07-30

[FIX] Fix the description field translation problem in the chatter

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_invoice.py'
2--- account/account_invoice.py 2014-02-12 17:51:41 +0000
3+++ account/account_invoice.py 2014-03-07 13:14:52 +0000
4@@ -215,7 +215,7 @@
5
6 _name = "account.invoice"
7 _inherit = ['mail.thread']
8- _description = 'Invoice'
9+ _description = _('Invoice')
10 _order = "id desc"
11 _track = {
12 'type': {
13
14=== modified file 'account/partner.py'
15--- account/partner.py 2013-11-27 15:32:57 +0000
16+++ account/partner.py 2014-03-07 13:14:52 +0000
17@@ -22,6 +22,7 @@
18 from operator import itemgetter
19 import time
20
21+from openerp.tools.translate import _
22 from openerp.osv import fields, osv
23
24 class account_fiscal_position(osv.osv):
25@@ -104,7 +105,7 @@
26 class res_partner(osv.osv):
27 _name = 'res.partner'
28 _inherit = 'res.partner'
29- _description = 'Partner'
30+ _description = _('Partner')
31
32 def _credit_debit_get(self, cr, uid, ids, field_names, arg, context=None):
33 ctx = context.copy()
34
35=== modified file 'account_voucher/account_voucher.py'
36--- account_voucher/account_voucher.py 2014-02-13 12:03:25 +0000
37+++ account_voucher/account_voucher.py 2014-03-07 13:14:52 +0000
38@@ -316,7 +316,7 @@
39 return res
40
41 _name = 'account.voucher'
42- _description = 'Accounting Voucher'
43+ _description = _('Accounting Voucher')
44 _inherit = ['mail.thread']
45 _order = "date desc, id desc"
46 # _rec_name = 'number'
47
48=== modified file 'analytic/analytic.py'
49--- analytic/analytic.py 2014-02-10 05:26:55 +0000
50+++ analytic/analytic.py 2014-03-07 13:14:52 +0000
51@@ -30,7 +30,7 @@
52 class account_analytic_account(osv.osv):
53 _name = 'account.analytic.account'
54 _inherit = ['mail.thread']
55- _description = 'Analytic Account'
56+ _description = _('Analytic Account')
57 _track = {
58 'state': {
59 'analytic.mt_account_pending': lambda self, cr, uid, obj, ctx=None: obj.state == 'pending',
60
61=== modified file 'crm/crm.py'
62--- crm/crm.py 2014-02-11 11:09:36 +0000
63+++ crm/crm.py 2014-03-07 13:14:52 +0000
64@@ -93,7 +93,7 @@
65 _name = "crm.case.section"
66 _inherits = {'mail.alias': 'alias_id'}
67 _inherit = "mail.thread"
68- _description = "Sales Teams"
69+ _description = _("Sales Teams")
70 _order = "complete_name"
71 # number of periods for lead/opportunities/... tracking in salesteam kanban dashboard/kanban view
72 _period_number = 5
73
74=== modified file 'crm/crm_lead.py'
75--- crm/crm_lead.py 2014-02-20 16:38:15 +0000
76+++ crm/crm_lead.py 2014-03-07 13:14:52 +0000
77@@ -66,7 +66,7 @@
78 class crm_lead(format_address, osv.osv):
79 """ CRM Lead Case """
80 _name = "crm.lead"
81- _description = "Lead/Opportunity"
82+ _description = _("Lead/Opportunity")
83 _order = "priority,date_action,id desc"
84 _inherit = ['mail.thread', 'ir.needaction_mixin']
85
86
87=== modified file 'crm/crm_phonecall.py'
88--- crm/crm_phonecall.py 2014-02-10 06:46:42 +0000
89+++ crm/crm_phonecall.py 2014-03-07 13:14:52 +0000
90@@ -28,7 +28,7 @@
91 class crm_phonecall(osv.osv):
92 """ Model for CRM phonecalls """
93 _name = "crm.phonecall"
94- _description = "Phonecall"
95+ _description = _("Phonecall")
96 _order = "id desc"
97 _inherit = ['mail.thread']
98 _columns = {
99
100=== modified file 'crm_claim/crm_claim.py'
101--- crm_claim/crm_claim.py 2013-11-27 15:32:57 +0000
102+++ crm_claim/crm_claim.py 2014-03-07 13:14:52 +0000
103@@ -58,7 +58,7 @@
104 """ Crm claim
105 """
106 _name = "crm.claim"
107- _description = "Claim"
108+ _description = _("Claim")
109 _order = "priority,date desc"
110 _inherit = ['mail.thread']
111
112
113=== modified file 'crm_helpdesk/crm_helpdesk.py'
114--- crm_helpdesk/crm_helpdesk.py 2013-11-27 15:32:57 +0000
115+++ crm_helpdesk/crm_helpdesk.py 2014-03-07 13:14:52 +0000
116@@ -31,7 +31,7 @@
117 """ Helpdesk Cases """
118
119 _name = "crm.helpdesk"
120- _description = "Helpdesk"
121+ _description = _("Helpdesk")
122 _order = "id desc"
123 _inherit = ['mail.thread']
124
125
126=== modified file 'hr/hr.py'
127--- hr/hr.py 2014-02-18 16:29:58 +0000
128+++ hr/hr.py 2014-03-07 13:14:52 +0000
129@@ -93,8 +93,13 @@
130 return res
131
132 _name = "hr.job"
133+<<<<<<< TREE
134 _description = "Job Position"
135 _inherit = ['mail.thread', 'ir.needaction_mixin']
136+=======
137+ _description = _("Job Description")
138+ _inherit = ['mail.thread']
139+>>>>>>> MERGE-SOURCE
140 _columns = {
141 'name': fields.char('Job Name', size=128, required=True, select=True),
142 'expected_employees': fields.function(_get_nbr_employees, string='Total Forecasted Employees',
143
144=== modified file 'hr_evaluation/hr_evaluation.py'
145--- hr_evaluation/hr_evaluation.py 2013-12-12 09:32:34 +0000
146+++ hr_evaluation/hr_evaluation.py 2014-03-07 13:14:52 +0000
147@@ -130,7 +130,7 @@
148 class hr_evaluation(osv.osv):
149 _name = "hr_evaluation.evaluation"
150 _inherit = "mail.thread"
151- _description = "Employee Appraisal"
152+ _description = _("Employee Appraisal")
153 _rec_name = 'employee_id'
154 _columns = {
155 'date': fields.date("Appraisal Deadline", required=True, select=True),
156
157=== modified file 'hr_expense/hr_expense.py'
158--- hr_expense/hr_expense.py 2013-10-27 12:31:04 +0000
159+++ hr_expense/hr_expense.py 2014-03-07 13:14:52 +0000
160@@ -54,7 +54,7 @@
161
162 _name = "hr.expense.expense"
163 _inherit = ['mail.thread']
164- _description = "Expense"
165+ _description = _("Expense")
166 _order = "id desc"
167 _track = {
168 'state': {
169
170=== modified file 'hr_holidays/hr_holidays.py'
171--- hr_holidays/hr_holidays.py 2014-01-15 09:38:05 +0000
172+++ hr_holidays/hr_holidays.py 2014-03-07 13:14:52 +0000
173@@ -101,7 +101,7 @@
174
175 class hr_holidays(osv.osv):
176 _name = "hr.holidays"
177- _description = "Leave"
178+ _description = _("Leave")
179 _order = "type desc, date_from asc"
180 _inherit = ['mail.thread', 'ir.needaction_mixin']
181 _track = {
182
183=== modified file 'hr_recruitment/hr_recruitment.py'
184--- hr_recruitment/hr_recruitment.py 2014-02-12 10:43:40 +0000
185+++ hr_recruitment/hr_recruitment.py 2014-03-07 13:14:52 +0000
186@@ -77,7 +77,7 @@
187
188 class hr_applicant(osv.Model):
189 _name = "hr.applicant"
190- _description = "Applicant"
191+ _description = _("Applicant")
192 _order = "id desc"
193 _inherit = ['mail.thread', 'ir.needaction_mixin']
194 _track = {
195
196=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
197--- hr_timesheet_sheet/hr_timesheet_sheet.py 2013-10-27 12:31:04 +0000
198+++ hr_timesheet_sheet/hr_timesheet_sheet.py 2014-03-07 13:14:52 +0000
199@@ -31,7 +31,7 @@
200 _inherit = "mail.thread"
201 _table = 'hr_timesheet_sheet_sheet'
202 _order = "id desc"
203- _description="Timesheet"
204+ _description=_("Timesheet")
205
206 def _total(self, cr, uid, ids, name, args, context=None):
207 """ Compute the attendances, analytic lines timesheets and differences between them
208
209=== modified file 'idea/models/idea.py'
210--- idea/models/idea.py 2013-10-27 12:31:04 +0000
211+++ idea/models/idea.py 2014-03-07 13:14:52 +0000
212@@ -26,10 +26,14 @@
213 class IdeaCategory(osv.Model):
214 """ Category of Idea """
215 _name = "idea.category"
216+<<<<<<< TREE
217 _description = "Idea Category"
218
219 _order = 'name asc'
220
221+=======
222+ _description = _("Idea Category")
223+>>>>>>> MERGE-SOURCE
224 _columns = {
225 'name': fields.char('Category Name', size=64, required=True),
226 }
227
228=== modified file 'mail/mail_thread.py'
229--- mail/mail_thread.py 2014-03-05 09:40:42 +0000
230+++ mail/mail_thread.py 2014-03-07 13:14:52 +0000
231@@ -364,7 +364,7 @@
232
233 # automatic logging unless asked not to (mainly for various testing purpose)
234 if not context.get('mail_create_nolog'):
235- self.message_post(cr, uid, thread_id, body=_('%s created') % (self._description), context=context)
236+ self.message_post(cr, uid, thread_id, body=_('%s created') % (_(self._description)), context=context)
237
238 # auto_subscribe: take values and defaults into account
239 create_values = dict(values)
240
241=== modified file 'mrp/mrp.py'
242--- mrp/mrp.py 2014-02-11 15:21:16 +0000
243+++ mrp/mrp.py 2014-03-07 13:14:52 +0000
244@@ -388,7 +388,7 @@
245 Production Orders / Manufacturing Orders
246 """
247 _name = 'mrp.production'
248- _description = 'Manufacturing Order'
249+ _description = _('Manufacturing Order')
250 _date_name = 'date_planned'
251 _inherit = ['mail.thread', 'ir.needaction_mixin']
252
253@@ -1074,7 +1074,7 @@
254
255 class mrp_production_workcenter_line(osv.osv):
256 _name = 'mrp.production.workcenter.line'
257- _description = 'Work Order'
258+ _description = _('Work Order')
259 _order = 'sequence'
260 _inherit = ['mail.thread']
261
262
263=== modified file 'mrp_repair/mrp_repair.py'
264--- mrp_repair/mrp_repair.py 2013-10-27 12:31:04 +0000
265+++ mrp_repair/mrp_repair.py 2014-03-07 13:14:52 +0000
266@@ -28,7 +28,7 @@
267 class mrp_repair(osv.osv):
268 _name = 'mrp.repair'
269 _inherit = 'mail.thread'
270- _description = 'Repair Order'
271+ _description = _('Repair Order')
272
273 def _amount_untaxed(self, cr, uid, ids, field_name, arg, context=None):
274 """ Calculates untaxed amount.
275
276=== modified file 'procurement/procurement.py'
277--- procurement/procurement.py 2013-11-27 15:32:57 +0000
278+++ procurement/procurement.py 2014-03-07 13:14:52 +0000
279@@ -79,7 +79,7 @@
280 Procurement Orders
281 """
282 _name = "procurement.order"
283- _description = "Procurement"
284+ _description = _("Procurement")
285 _order = 'priority desc,date_planned'
286 _inherit = ['mail.thread']
287 _log_create = False
288
289=== modified file 'product/product.py'
290--- product/product.py 2014-01-27 10:19:57 +0000
291+++ product/product.py 2014-03-07 13:14:52 +0000
292@@ -642,6 +642,7 @@
293 }
294 return result
295
296+<<<<<<< TREE
297 def _get_name_template_ids(self, cr, uid, ids, context=None):
298 result = set()
299 template_ids = self.pool.get('product.product').search(cr, uid, [('product_tmpl_id', 'in', ids)])
300@@ -649,6 +650,31 @@
301 result.add(el)
302 return list(result)
303
304+=======
305+
306+ def _get_image(self, cr, uid, ids, name, args, context=None):
307+ result = dict.fromkeys(ids, False)
308+ for obj in self.browse(cr, uid, ids, context=context):
309+ result[obj.id] = tools.image_get_resized_images(obj.image, avoid_resize_medium=True)
310+ return result
311+
312+ def _set_image(self, cr, uid, id, name, value, args, context=None):
313+ return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
314+
315+ _defaults = {
316+ 'active': lambda *a: 1,
317+ 'price_extra': lambda *a: 0.0,
318+ 'price_margin': lambda *a: 1.0,
319+ 'color': 0,
320+ }
321+
322+ _name = "product.product"
323+ _description = _("Product")
324+ _table = "product_product"
325+ _inherits = {'product.template': 'product_tmpl_id'}
326+ _inherit = ['mail.thread']
327+ _order = 'default_code,name_template'
328+>>>>>>> MERGE-SOURCE
329 _columns = {
330 'qty_available': fields.function(_product_qty_available, type='float', string='Quantity On Hand'),
331 'virtual_available': fields.function(_product_virtual_available, type='float', string='Quantity Available'),
332
333=== modified file 'project/project.py'
334--- project/project.py 2014-02-12 17:51:41 +0000
335+++ project/project.py 2014-03-07 13:14:52 +0000
336@@ -61,7 +61,7 @@
337
338 class project(osv.osv):
339 _name = "project.project"
340- _description = "Project"
341+ _description = _("Project")
342 _inherits = {'account.analytic.account': "analytic_account_id",
343 "mail.alias": "alias_id"}
344 _inherit = ['mail.thread', 'ir.needaction_mixin']
345@@ -557,7 +557,7 @@
346
347 class task(osv.osv):
348 _name = "project.task"
349- _description = "Task"
350+ _description = _("Task")
351 _date_name = "date_start"
352 _inherit = ['mail.thread', 'ir.needaction_mixin']
353
354
355=== modified file 'project_issue/project_issue.py'
356--- project_issue/project_issue.py 2013-12-02 15:09:25 +0000
357+++ project_issue/project_issue.py 2014-03-07 13:14:52 +0000
358@@ -41,7 +41,7 @@
359
360 class project_issue(osv.Model):
361 _name = "project.issue"
362- _description = "Project Issue"
363+ _description = _("Project Issue")
364 _order = "priority, create_date desc"
365 _inherit = ['mail.thread', 'ir.needaction_mixin']
366
367
368=== modified file 'purchase/purchase.py'
369--- purchase/purchase.py 2014-01-29 19:08:34 +0000
370+++ purchase/purchase.py 2014-03-07 13:14:52 +0000
371@@ -244,8 +244,13 @@
372 ]
373 _name = "purchase.order"
374 _inherit = ['mail.thread', 'ir.needaction_mixin']
375+<<<<<<< TREE
376 _description = "Purchase Order"
377 _order = 'date_order desc, id desc'
378+=======
379+ _description = _("Purchase Order")
380+ _order = "name desc"
381+>>>>>>> MERGE-SOURCE
382
383 def create(self, cr, uid, vals, context=None):
384 if vals.get('name','/')=='/':
385
386=== modified file 'purchase_requisition/purchase_requisition.py'
387--- purchase_requisition/purchase_requisition.py 2013-12-09 16:32:54 +0000
388+++ purchase_requisition/purchase_requisition.py 2014-03-07 13:14:52 +0000
389@@ -29,7 +29,7 @@
390
391 class purchase_requisition(osv.osv):
392 _name = "purchase.requisition"
393- _description="Purchase Requisition"
394+ _description=_("Purchase Requisition")
395 _inherit = ['mail.thread', 'ir.needaction_mixin']
396 _columns = {
397 'name': fields.char('Requisition Reference', size=32,required=True),
398
399=== modified file 'sale/sale.py'
400--- sale/sale.py 2014-02-21 09:54:25 +0000
401+++ sale/sale.py 2014-03-07 13:14:52 +0000
402@@ -29,7 +29,7 @@
403 from openerp import workflow
404
405 class sale_order(osv.osv):
406- _name = "sale.order"
407+ _name = _("sale.order")
408 _inherit = ['mail.thread', 'ir.needaction_mixin']
409 _description = "Sales Order"
410 _track = {
411
412=== modified file 'stock/stock.py'
413--- stock/stock.py 2014-01-29 18:47:03 +0000
414+++ stock/stock.py 2014-03-07 13:14:52 +0000
415@@ -2988,7 +2988,7 @@
416 _name = "stock.picking.in"
417 _inherit = "stock.picking"
418 _table = "stock_picking"
419- _description = "Incoming Shipments"
420+ _description = _("Incoming Shipments")
421
422 def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
423 return self.pool.get('stock.picking').search(cr, user, args, offset, limit, order, context, count)
424@@ -3068,7 +3068,7 @@
425 _name = "stock.picking.out"
426 _inherit = "stock.picking"
427 _table = "stock_picking"
428- _description = "Delivery Orders"
429+ _description = _("Delivery Orders")
430
431 def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
432 return self.pool.get('stock.picking').search(cr, user, args, offset, limit, order, context, count)

Subscribers

People subscribed via source and target branches

to all changes: