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

[Erwin van der Ploeg (BAS Solutions)]

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

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2014-02-12 17:51:41 +0000
+++ account/account_invoice.py	2014-03-07 13:14:52 +0000
@@ -215,7 +215,7 @@
 
     _name = "account.invoice"
     _inherit = ['mail.thread']
-    _description = 'Invoice'
+    _description = _('Invoice')
     _order = "id desc"
     _track = {
         'type': {

=== modified file 'account/partner.py'
--- account/partner.py	2013-11-27 15:32:57 +0000
+++ account/partner.py	2014-03-07 13:14:52 +0000
@@ -22,6 +22,7 @@
 from operator import itemgetter
 import time
 
+from openerp.tools.translate import _
 from openerp.osv import fields, osv
 
 class account_fiscal_position(osv.osv):
@@ -104,7 +105,7 @@
 class res_partner(osv.osv):
     _name = 'res.partner'
     _inherit = 'res.partner'
-    _description = 'Partner'
+    _description = _('Partner')
 
     def _credit_debit_get(self, cr, uid, ids, field_names, arg, context=None):
         ctx = context.copy()

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2014-02-13 12:03:25 +0000
+++ account_voucher/account_voucher.py	2014-03-07 13:14:52 +0000
@@ -316,7 +316,7 @@
         return res
 
     _name = 'account.voucher'
-    _description = 'Accounting Voucher'
+    _description = _('Accounting Voucher')
     _inherit = ['mail.thread']
     _order = "date desc, id desc"
 #    _rec_name = 'number'

=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2014-02-10 05:26:55 +0000
+++ analytic/analytic.py	2014-03-07 13:14:52 +0000
@@ -30,7 +30,7 @@
 class account_analytic_account(osv.osv):
     _name = 'account.analytic.account'
     _inherit = ['mail.thread']
-    _description = 'Analytic Account'
+    _description = _('Analytic Account')
     _track = {
         'state': {
             'analytic.mt_account_pending': lambda self, cr, uid, obj, ctx=None: obj.state == 'pending',

=== modified file 'crm/crm.py'
--- crm/crm.py	2014-02-11 11:09:36 +0000
+++ crm/crm.py	2014-03-07 13:14:52 +0000
@@ -93,7 +93,7 @@
     _name = "crm.case.section"
     _inherits = {'mail.alias': 'alias_id'}
     _inherit = "mail.thread"
-    _description = "Sales Teams"
+    _description = _("Sales Teams")
     _order = "complete_name"
     # number of periods for lead/opportunities/... tracking in salesteam kanban dashboard/kanban view
     _period_number = 5

=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2014-02-20 16:38:15 +0000
+++ crm/crm_lead.py	2014-03-07 13:14:52 +0000
@@ -66,7 +66,7 @@
 class crm_lead(format_address, osv.osv):
     """ CRM Lead Case """
     _name = "crm.lead"
-    _description = "Lead/Opportunity"
+    _description = _("Lead/Opportunity")
     _order = "priority,date_action,id desc"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 

=== modified file 'crm/crm_phonecall.py'
--- crm/crm_phonecall.py	2014-02-10 06:46:42 +0000
+++ crm/crm_phonecall.py	2014-03-07 13:14:52 +0000
@@ -28,7 +28,7 @@
 class crm_phonecall(osv.osv):
     """ Model for CRM phonecalls """
     _name = "crm.phonecall"
-    _description = "Phonecall"
+    _description = _("Phonecall")
     _order = "id desc"
     _inherit = ['mail.thread']
     _columns = {

=== modified file 'crm_claim/crm_claim.py'
--- crm_claim/crm_claim.py	2013-11-27 15:32:57 +0000
+++ crm_claim/crm_claim.py	2014-03-07 13:14:52 +0000
@@ -58,7 +58,7 @@
     """ Crm claim
     """
     _name = "crm.claim"
-    _description = "Claim"
+    _description = _("Claim")
     _order = "priority,date desc"
     _inherit = ['mail.thread']
 

=== modified file 'crm_helpdesk/crm_helpdesk.py'
--- crm_helpdesk/crm_helpdesk.py	2013-11-27 15:32:57 +0000
+++ crm_helpdesk/crm_helpdesk.py	2014-03-07 13:14:52 +0000
@@ -31,7 +31,7 @@
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"
-    _description = "Helpdesk"
+    _description = _("Helpdesk")
     _order = "id desc"
     _inherit = ['mail.thread']
 

=== modified file 'hr/hr.py'
--- hr/hr.py	2014-02-18 16:29:58 +0000
+++ hr/hr.py	2014-03-07 13:14:52 +0000
@@ -93,8 +93,13 @@
         return res
 
     _name = "hr.job"
+<<<<<<< TREE
     _description = "Job Position"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
+=======
+    _description = _("Job Description")
+    _inherit = ['mail.thread']
+>>>>>>> MERGE-SOURCE
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
         'expected_employees': fields.function(_get_nbr_employees, string='Total Forecasted Employees',

=== modified file 'hr_evaluation/hr_evaluation.py'
--- hr_evaluation/hr_evaluation.py	2013-12-12 09:32:34 +0000
+++ hr_evaluation/hr_evaluation.py	2014-03-07 13:14:52 +0000
@@ -130,7 +130,7 @@
 class hr_evaluation(osv.osv):
     _name = "hr_evaluation.evaluation"
     _inherit = "mail.thread"
-    _description = "Employee Appraisal"
+    _description = _("Employee Appraisal")
     _rec_name = 'employee_id'
     _columns = {
         'date': fields.date("Appraisal Deadline", required=True, select=True),

=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2013-10-27 12:31:04 +0000
+++ hr_expense/hr_expense.py	2014-03-07 13:14:52 +0000
@@ -54,7 +54,7 @@
 
     _name = "hr.expense.expense"
     _inherit = ['mail.thread']
-    _description = "Expense"
+    _description = _("Expense")
     _order = "id desc"
     _track = {
         'state': {

=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2014-01-15 09:38:05 +0000
+++ hr_holidays/hr_holidays.py	2014-03-07 13:14:52 +0000
@@ -101,7 +101,7 @@
 
 class hr_holidays(osv.osv):
     _name = "hr.holidays"
-    _description = "Leave"
+    _description = _("Leave")
     _order = "type desc, date_from asc"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _track = {

=== modified file 'hr_recruitment/hr_recruitment.py'
--- hr_recruitment/hr_recruitment.py	2014-02-12 10:43:40 +0000
+++ hr_recruitment/hr_recruitment.py	2014-03-07 13:14:52 +0000
@@ -77,7 +77,7 @@
 
 class hr_applicant(osv.Model):
     _name = "hr.applicant"
-    _description = "Applicant"
+    _description = _("Applicant")
     _order = "id desc"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _track = {

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2013-10-27 12:31:04 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2014-03-07 13:14:52 +0000
@@ -31,7 +31,7 @@
     _inherit = "mail.thread"
     _table = 'hr_timesheet_sheet_sheet'
     _order = "id desc"
-    _description="Timesheet"
+    _description=_("Timesheet")
 
     def _total(self, cr, uid, ids, name, args, context=None):
         """ Compute the attendances, analytic lines timesheets and differences between them

=== modified file 'idea/models/idea.py'
--- idea/models/idea.py	2013-10-27 12:31:04 +0000
+++ idea/models/idea.py	2014-03-07 13:14:52 +0000
@@ -26,10 +26,14 @@
 class IdeaCategory(osv.Model):
     """ Category of Idea """
     _name = "idea.category"
+<<<<<<< TREE
     _description = "Idea Category"
 
     _order = 'name asc'
 
+=======
+    _description = _("Idea Category")
+>>>>>>> MERGE-SOURCE
     _columns = {
         'name': fields.char('Category Name', size=64, required=True),
     }

=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py	2014-03-05 09:40:42 +0000
+++ mail/mail_thread.py	2014-03-07 13:14:52 +0000
@@ -364,7 +364,7 @@
 
         # automatic logging unless asked not to (mainly for various testing purpose)
         if not context.get('mail_create_nolog'):
-            self.message_post(cr, uid, thread_id, body=_('%s created') % (self._description), context=context)
+            self.message_post(cr, uid, thread_id, body=_('%s created') % (_(self._description)), context=context)
 
         # auto_subscribe: take values and defaults into account
         create_values = dict(values)

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2014-02-11 15:21:16 +0000
+++ mrp/mrp.py	2014-03-07 13:14:52 +0000
@@ -388,7 +388,7 @@
     Production Orders / Manufacturing Orders
     """
     _name = 'mrp.production'
-    _description = 'Manufacturing Order'
+    _description = _('Manufacturing Order')
     _date_name  = 'date_planned'
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
@@ -1074,7 +1074,7 @@
 
 class mrp_production_workcenter_line(osv.osv):
     _name = 'mrp.production.workcenter.line'
-    _description = 'Work Order'
+    _description = _('Work Order')
     _order = 'sequence'
     _inherit = ['mail.thread']
 

=== modified file 'mrp_repair/mrp_repair.py'
--- mrp_repair/mrp_repair.py	2013-10-27 12:31:04 +0000
+++ mrp_repair/mrp_repair.py	2014-03-07 13:14:52 +0000
@@ -28,7 +28,7 @@
 class mrp_repair(osv.osv):
     _name = 'mrp.repair'
     _inherit = 'mail.thread'
-    _description = 'Repair Order'
+    _description = _('Repair Order')
 
     def _amount_untaxed(self, cr, uid, ids, field_name, arg, context=None):
         """ Calculates untaxed amount.

=== modified file 'procurement/procurement.py'
--- procurement/procurement.py	2013-11-27 15:32:57 +0000
+++ procurement/procurement.py	2014-03-07 13:14:52 +0000
@@ -79,7 +79,7 @@
     Procurement Orders
     """
     _name = "procurement.order"
-    _description = "Procurement"
+    _description = _("Procurement")
     _order = 'priority desc,date_planned'
     _inherit = ['mail.thread']
     _log_create = False

=== modified file 'product/product.py'
--- product/product.py	2014-01-27 10:19:57 +0000
+++ product/product.py	2014-03-07 13:14:52 +0000
@@ -642,6 +642,7 @@
             }
         return result
 
+<<<<<<< TREE
     def _get_name_template_ids(self, cr, uid, ids, context=None):
         result = set()
         template_ids = self.pool.get('product.product').search(cr, uid, [('product_tmpl_id', 'in', ids)])
@@ -649,6 +650,31 @@
             result.add(el)
         return list(result)
 
+=======
+
+    def _get_image(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = tools.image_get_resized_images(obj.image, avoid_resize_medium=True)
+        return result
+
+    def _set_image(self, cr, uid, id, name, value, args, context=None):
+        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
+
+    _defaults = {
+        'active': lambda *a: 1,
+        'price_extra': lambda *a: 0.0,
+        'price_margin': lambda *a: 1.0,
+        'color': 0,
+    }
+
+    _name = "product.product"
+    _description = _("Product")
+    _table = "product_product"
+    _inherits = {'product.template': 'product_tmpl_id'}
+    _inherit = ['mail.thread']
+    _order = 'default_code,name_template'
+>>>>>>> MERGE-SOURCE
     _columns = {
         'qty_available': fields.function(_product_qty_available, type='float', string='Quantity On Hand'),
         'virtual_available': fields.function(_product_virtual_available, type='float', string='Quantity Available'),

=== modified file 'project/project.py'
--- project/project.py	2014-02-12 17:51:41 +0000
+++ project/project.py	2014-03-07 13:14:52 +0000
@@ -61,7 +61,7 @@
 
 class project(osv.osv):
     _name = "project.project"
-    _description = "Project"
+    _description = _("Project")
     _inherits = {'account.analytic.account': "analytic_account_id",
                  "mail.alias": "alias_id"}
     _inherit = ['mail.thread', 'ir.needaction_mixin']
@@ -557,7 +557,7 @@
 
 class task(osv.osv):
     _name = "project.task"
-    _description = "Task"
+    _description = _("Task")
     _date_name = "date_start"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 

=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py	2013-12-02 15:09:25 +0000
+++ project_issue/project_issue.py	2014-03-07 13:14:52 +0000
@@ -41,7 +41,7 @@
 
 class project_issue(osv.Model):
     _name = "project.issue"
-    _description = "Project Issue"
+    _description = _("Project Issue")
     _order = "priority, create_date desc"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2014-01-29 19:08:34 +0000
+++ purchase/purchase.py	2014-03-07 13:14:52 +0000
@@ -244,8 +244,13 @@
     ]
     _name = "purchase.order"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
+<<<<<<< TREE
     _description = "Purchase Order"
     _order = 'date_order desc, id desc'
+=======
+    _description = _("Purchase Order")
+    _order = "name desc"
+>>>>>>> MERGE-SOURCE
 
     def create(self, cr, uid, vals, context=None):
         if vals.get('name','/')=='/':

=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py	2013-12-09 16:32:54 +0000
+++ purchase_requisition/purchase_requisition.py	2014-03-07 13:14:52 +0000
@@ -29,7 +29,7 @@
 
 class purchase_requisition(osv.osv):
     _name = "purchase.requisition"
-    _description="Purchase Requisition"
+    _description=_("Purchase Requisition")
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _columns = {
         'name': fields.char('Requisition Reference', size=32,required=True),

=== modified file 'sale/sale.py'
--- sale/sale.py	2014-02-21 09:54:25 +0000
+++ sale/sale.py	2014-03-07 13:14:52 +0000
@@ -29,7 +29,7 @@
 from openerp import workflow
 
 class sale_order(osv.osv):
-    _name = "sale.order"
+    _name = _("sale.order")
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Sales Order"
     _track = {

=== modified file 'stock/stock.py'
--- stock/stock.py	2014-01-29 18:47:03 +0000
+++ stock/stock.py	2014-03-07 13:14:52 +0000
@@ -2988,7 +2988,7 @@
     _name = "stock.picking.in"
     _inherit = "stock.picking"
     _table = "stock_picking"
-    _description = "Incoming Shipments"
+    _description = _("Incoming Shipments")
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         return self.pool.get('stock.picking').search(cr, user, args, offset, limit, order, context, count)
@@ -3068,7 +3068,7 @@
     _name = "stock.picking.out"
     _inherit = "stock.picking"
     _table = "stock_picking"
-    _description = "Delivery Orders"
+    _description = _("Delivery Orders")
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         return self.pool.get('stock.picking').search(cr, user, args, offset, limit, order, context, count)