From f08bf5a08e67af086a26b51e67c69bd253155a38 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Mon, 4 Mar 2013 14:53:29 +0100
Subject: [PATCH 01/43] [FIX] Generates journal items immediately from expense

bzr revid: jco@openerp.com-20130304135329-v1dfw564svd0zv7q
---
 addons/hr_expense/hr_expense.py           | 301 ++++++++++++++++++++++
 addons/hr_expense/hr_expense_workflow.xml |   2 +-
 2 files changed, 302 insertions(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index f32479c2ae2..03475c90b04 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -145,6 +145,307 @@ class hr_expense_expense(osv.osv):
     def expense_canceled(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'cancelled'}, context=context)
 
+
+    def account_move_get(self, cr, uid, expense_id, journal_id, context=None):
+        '''
+        This method prepare the creation of the account move related to the given expense.
+
+        :param expense_id: Id of voucher for which we are creating account_move.
+        :return: mapping between fieldname and value of account move to create
+        :rtype: dict
+        '''
+        
+        
+        #Search for the period corresponding with confirmation date
+        expense_brw = self.browse(cr,uid,expense_id,context)
+        period_obj = self.pool.get('account.period')
+        company_id = expense_brw.company_id.id
+        ctx = context
+        ctx.update({'company_id': company_id})
+        date = expense_brw.date_confirm
+        pids = period_obj.find(cr, uid, date, context=ctx)
+        try:
+            period_id = pids[0]
+        except: 
+            raise osv.except_osv(_('Error! '), 
+                        _('Please define periods!'))
+        period = period_obj.browse(cr, uid, period_id, context=context)
+        
+        seq_obj = self.pool.get('ir.sequence')
+
+        journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+        if journal.sequence_id:
+            if not journal.sequence_id.active:
+                raise osv.except_osv(_('Configuration Error !'),
+                    _('Please activate the sequence of selected journal !'))
+            c = dict(context)
+            c.update({'fiscalyear_id': period.fiscalyear_id.id})
+            name = seq_obj.next_by_id(cr, uid, journal.sequence_id.id, context=c)
+        else:
+            raise osv.except_osv(_('Error!'),
+                        _('Please define a sequence on the journal.'))
+        #Look for the next expense number
+        ref = seq_obj.get(cr, uid, 'hr.expense.invoice')
+
+        move = {
+            'name': name,
+            'journal_id': journal_id,
+            'narration': '',
+            'date': expense_brw.date_confirm,
+            'ref': ref,
+            'period_id': period_id,
+        }
+        return move
+
+    def line_get_convert(self, cr, uid, x, part, date, context=None):
+        return {
+            'date_maturity': x.get('date_maturity', False),
+            'partner_id': part.id,
+            'name': x['name'][:64],
+            'date': date,
+            'debit': x['price']>0 and x['price'],
+            'credit': x['price']<0 and -x['price'],
+            'account_id': x['account_id'],
+            'analytic_lines': x.get('analytic_lines', False),
+            'amount_currency': x['price']>0 and abs(x.get('amount_currency', False)) or -abs(x.get('amount_currency', False)),
+            'currency_id': x.get('currency_id', False),
+            'tax_code_id': x.get('tax_code_id', False),
+            'tax_amount': x.get('tax_amount', False),
+            'ref': x.get('ref', False),
+            'quantity': x.get('quantity',1.00),
+            'product_id': x.get('product_id', False),
+            'product_uom_id': x.get('uos_id', False),
+            'analytic_account_id': x.get('account_analytic_id', False),
+        }
+
+    def compute_expense_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines, context=None):
+        if context is None:
+            context={}
+        total = 0
+        total_currency = 0
+        cur_obj = self.pool.get('res.currency')
+        for i in invoice_move_lines:
+            if inv.currency_id.id != company_currency:
+                context.update({'date': inv.date_confirm or time.strftime('%Y-%m-%d')})
+                i['currency_id'] = inv.currency_id.id
+                i['amount_currency'] = i['price']
+                i['price'] = cur_obj.compute(cr, uid, inv.currency_id.id,
+                        company_currency, i['price'],
+                        context=context)
+            else:
+                i['amount_currency'] = False
+                i['currency_id'] = False
+            i['ref'] = ref
+            total -= i['price']
+            total_currency -= i['amount_currency'] or i['price']
+        return total, total_currency, invoice_move_lines
+
+
+    def action_move_create(self, cr, uid, ids, context=None):
+        property_obj = self.pool.get('ir.property')
+        sequence_obj = self.pool.get('ir.sequence')
+        analytic_journal_obj = self.pool.get('account.analytic.journal')
+        account_journal = self.pool.get('account.journal')
+        voucher_obj = self.pool.get('account.voucher')
+        currency_obj = self.pool.get('res.currency')
+        ait_obj = self.pool.get('account.invoice.tax')
+        move_obj = self.pool.get('account.move')
+        if context is None:
+            context = {}
+        for exp in self.browse(cr, uid, ids, context=context):
+            company_id = exp.company_id.id
+            lines = []
+            total = 0.0
+            ctx = context.copy()
+            ctx.update({'date': exp.date})
+            journal = False
+            if exp.journal_id:
+                journal = exp.journal_id
+            else:
+                journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
+                if journal_id:
+                    journal = account_journal.browse(cr, uid, journal_id, context=context)
+            if not journal:
+                raise osv.except_osv(_('Error!'), _("No expense journal found. Please make sure you have a journal with type 'purchase' configured."))
+            if not journal.sequence_id:
+                raise osv.except_osv(_('Error!'), _('Please define sequence on the journal related to this invoice.'))
+            company_currency = exp.company_id.currency_id.id
+            current_currency = exp.currency_id
+#            for line in exp.line_ids: 
+#                if line.product_id:
+#                    acc = line.product_id.property_account_expense
+#                    if not acc:
+#                        acc = line.product_id.categ_id.property_account_expense_categ
+#                else:
+#                    acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
+#                    if not acc:
+#                        raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.'))
+#                total_amount = line.total_amount
+#                if journal.currency:
+#                    if exp.currency_id != journal.currency:
+#                        total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, total_amount, context=ctx)
+#                elif exp.currency_id != exp.company_id.currency_id:
+#                    total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, total_amount, context=ctx)
+#                lines.append((0, False, {
+#                    'name': line.name,
+#                    'account_id': acc.id,
+#                    'account_analytic_id': line.analytic_account.id,
+#                    'amount': total_amount,
+#                    'type': 'dr'
+#                }))
+#                total += total_amount
+            if not exp.employee_id.address_home_id:
+                raise osv.except_osv(_('Error!'), _('The employee must have a home address.'))
+            acc = exp.employee_id.address_home_id.property_account_payable.id
+            
+            #From action_move_line_create of voucher
+            move_id = move_obj.create(cr, uid, self.account_move_get(cr, uid, exp.id, journal.id, context=context), context=context)
+            move = move_obj.browse(cr, uid, move_id, context=context)
+            #iml = self._get_analytic_lines
+            
+            # within: iml = self.pool.get('account.invoice.line').move_line_get
+            iml = self.move_line_get(cr, uid, exp.id, context=context)
+            
+            #Write taxes on the lines which should automatically add the necessary extra lines upon creation
+            
+            
+            
+            diff_currency_p = exp.currency_id.id <> company_currency
+            # create one move line for the total
+            total = 0
+            total_currency = 0
+            total, total_currency, iml = self.compute_expense_totals(cr, uid, exp, company_currency, exp.name, iml, context=ctx)
+            
+            
+            #Need to have counterline: 
+            
+            iml.append({
+                    'type':'dest', 
+                    'name':'/',
+                    'price':total, 
+                    'account_id': acc, 
+                    'date_maturity': exp.date_confirm, 
+                    'amount_currency': diff_currency_p and total_currency or False, 
+                    'currency_id': diff_currency_p and exp.currency_id.id or False, 
+                    'ref': exp.name
+                    })
+            
+            line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, exp.user_id.partner_id, exp.date_confirm, context=ctx)),iml)
+            move_obj.write(cr, uid, [move_id], {'line_id':line}, context=ctx)
+            self.write(cr, uid, ids, {'account_move_id':move_id, 'state':'done'}, context=context)
+            
+            
+            #compute_taxes = ait_obj.compute(cr, uid, , context=context)
+            
+            
+            
+#    return {
+#        'type':'src', 
+#        'name':line.name.split('\n')[0][:64], 
+#        'price_unit':line.price_unit, 
+#        'quantity':line.quantity, 
+#        'price':line.price_subtotal, 
+#        'account_id':line.account_id.id, 
+#        'product_id':line.product_id.id, 
+#        'uos_id':line.uos_id.id, 
+#        'account_analytic_id':line.account_analytic_id.id, 
+#        'taxes':line.invoice_line_tax_id}
+
+
+    def move_line_get(self, cr, uid, expense_id, context=None):
+        res = []
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        if context is None:
+            context = {}
+        exp = self.browse(cr, uid, expense_id, context=context)
+        company_currency = exp.company_id.currency_id.id
+
+        for line in exp.line_ids:
+            mres = self.move_line_get_item(cr, uid, line, context)
+            if not mres:
+                continue
+            res.append(mres)
+            tax_code_found= False
+            
+            #Calculate tax according to default tax on product
+            
+            #Taken from product_id_onchange in account.invoice
+            if line.product_id:
+                fposition_id = False
+                fpos_obj = self.pool.get('account.fiscal.position')
+                fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False
+                product = line.product_id
+                taxes = product.supplier_taxes_id
+                #If taxes are not related to the product, maybe they are in the account
+                if not taxes:
+                    a = product.property_account_expense.id #Why is not there a check here?
+                    if not a:
+                        a = product.categ_id.property_account_expense_categ.id
+                    a = fpos_obj.map_account(cr, uid, fpos, a)
+                    taxes = a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False
+                tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
+            #Calculating tax on the line and creating move?
+            for tax in tax_obj.compute_all(cr, uid, taxes,
+                    line.unit_amount ,
+                    line.unit_quantity, line.product_id,
+                    exp.user_id.partner_id)['taxes']:
+                tax_code_id = tax['base_code_id']
+                tax_amount = line.total_amount * tax['base_sign']
+                if tax_code_found:
+                    if not tax_code_id:
+                        continue
+                    res.append(self.move_line_get_item(cr, uid, line, context))
+                    res[-1]['price'] = 0.0
+                    res[-1]['account_analytic_id'] = False
+                elif not tax_code_id:
+                    continue
+                tax_code_found = True
+                res[-1]['tax_code_id'] = tax_code_id
+                res[-1]['tax_amount'] = cur_obj.compute(cr, uid, exp.currency_id.id, company_currency, tax_amount, context={'date': exp.date_confirm})
+                
+                #Will create the tax here as we don't have the access 
+                assoc_tax = {
+                             'type':'tax',
+                             'name':tax['name'],
+                             'price_unit': tax['price_unit'],
+                             'quantity': 1,
+                             'price':  tax['amount'] * tax['base_sign'] or 0.0,
+                             'account_id': tax['account_collected_id'],
+                             'tax_code_id': tax['tax_code_id'],
+                             'tax_amount': tax['amount'] * tax['base_sign'],
+                             }
+                res.append(assoc_tax)
+        return res
+
+    def move_line_get_item(self, cr, uid, line, context=None):
+        company = line.expense_id.company_id
+        property_obj = self.pool.get('ir.property')
+        if line.product_id:
+            acc = line.product_id.property_account_expense
+            if not acc:
+                acc = line.product_id.categ_id.property_account_expense_categ
+        else:
+            acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company.id})
+            if not acc:
+                raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.'))
+        return {
+            'type':'src',
+            'name': line.name.split('\n')[0][:64],
+            'price_unit':line.unit_amount,
+            'quantity':line.unit_quantity,
+            'price':line.total_amount,
+            'account_id':acc.id,
+            'product_id':line.product_id.id,
+            'uos_id':line.uom_id.id,
+            'account_analytic_id':line.analytic_account.id,
+            #'taxes':line.invoice_line_tax_id,
+        }
+
+
+
+
+
     def action_receipt_create(self, cr, uid, ids, context=None):
         property_obj = self.pool.get('ir.property')
         sequence_obj = self.pool.get('ir.sequence')
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 2e085071207..c01bb4cd14b 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -43,7 +43,7 @@
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">done</field>
             <field name="kind">function</field>
-            <field name="action">action_receipt_create()</field>
+            <field name="action">action_move_create()</field>
         </record>
 
         <record id="t1" model="workflow.transition">

From 1e3725b9e6cc0f167dd3000844dc3d13e64dff98 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Mon, 4 Mar 2013 15:47:22 +0100
Subject: [PATCH 02/43] [FIX] adjust tests and no taxes when product not
 available

bzr revid: jco@openerp.com-20130304144722-y30nkmmd8hyby7x0
---
 addons/hr_expense/hr_expense.py            | 2 ++
 addons/hr_expense/test/expense_process.yml | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 03475c90b04..fb8af6649de 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -385,6 +385,8 @@ class hr_expense_expense(osv.osv):
                     a = fpos_obj.map_account(cr, uid, fpos, a)
                     taxes = a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False
                 tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
+            else:
+                taxes = []
             #Calculating tax on the line and creating move?
             for tax in tax_obj.compute_all(cr, uid, taxes,
                     line.unit_amount ,
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
index eae63c460fc..4b65c16e8ea 100644
--- a/addons/hr_expense/test/expense_process.yml
+++ b/addons/hr_expense/test/expense_process.yml
@@ -26,11 +26,6 @@
   !python {model: hr.expense.expense}: |
     sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
     assert sep_expenses.state == 'done', "Expense should be in 'Done' state."
-    assert sep_expenses.voucher_id, "Expense should have link of Purchase Receipt."
-    assert sep_expenses.voucher_id.type == 'purchase', "Receipt type is not purchase receipt."
-    assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Receipt total amount is not correspond with expense total."
-    assert len(sep_expenses.voucher_id.line_dr_ids) == len(sep_expenses.line_ids),"Lines of Receipt and expense line are not correspond."
-
 -
   I duplicate the expenses and cancel duplicated.
 -

From 804bc3a916916eb5c32ef44e8bc5b5f37c89078d Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Mon, 4 Mar 2013 16:55:50 +0100
Subject: [PATCH 03/43] [FIX] in case of no taxes

bzr revid: jco@openerp.com-20130304155550-g5m12ryt6id0b3m3
---
 addons/hr_expense/hr_expense.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index fb8af6649de..f61f8923411 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -306,9 +306,6 @@ class hr_expense_expense(osv.osv):
             # within: iml = self.pool.get('account.invoice.line').move_line_get
             iml = self.move_line_get(cr, uid, exp.id, context=context)
             
-            #Write taxes on the lines which should automatically add the necessary extra lines upon creation
-            
-            
             
             diff_currency_p = exp.currency_id.id <> company_currency
             # create one move line for the total
@@ -385,7 +382,7 @@ class hr_expense_expense(osv.osv):
                     a = fpos_obj.map_account(cr, uid, fpos, a)
                     taxes = a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False
                 tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
-            else:
+            if not taxes:
                 taxes = []
             #Calculating tax on the line and creating move?
             for tax in tax_obj.compute_all(cr, uid, taxes,

From cdabf79cf27a08f8ecb63a0a94e7d13b9f05fc4e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 6 Mar 2013 15:05:54 +0100
Subject: [PATCH 04/43] [REF] hr_expense, creation of accounting entries from
 hr.expense: a lot of code refactoring. Still a huge work to be done in order
 to factorize some code with other objects (like account.invoice,
 account.voucher, account.asset...)

bzr revid: qdp-launchpad@openerp.com-20130306140554-fhs6fhkyb779t6re
---
 addons/account/account.py             |  23 +++
 addons/hr_expense/__openerp__.py      |   2 +-
 addons/hr_expense/hr_expense.py       | 264 ++++++--------------------
 addons/hr_expense/hr_expense_view.xml |   1 +
 4 files changed, 79 insertions(+), 211 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index acf27c42392..2aab34ff8ba 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1150,6 +1150,29 @@ class account_move(osv.osv):
     _description = "Account Entry"
     _order = 'id desc'
 
+    def account_move_prepare(self, cr, uid, journal_id, date=False, ref='', company_id=False, context=None):
+        '''
+        Prepares and returns a dictionary of values, ready to be passed to create() based on the parameters received.
+        '''
+        if not date:
+            date = fields.date.today()
+        period_obj = self.pool.get('account.period')
+        if not company_id:
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            company_id = user.company_id.id
+        if context is None:
+            context = {}
+        #put the company in context to find the good period
+        ctx = context.copy()
+        ctx.update({'company_id': company_id})
+        return {
+            'journal_id': journal_id,
+            'date': date,
+            'period_id': period_obj.find(cr, uid, date, context=ctx)[0],
+            'ref': ref,
+            'company_id': company_id,
+        }
+
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         """
         Returns a list of tupples containing id, name, as internally it is called {def name_get}
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 516af7f9d27..1f4e7b42209 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -46,7 +46,7 @@ This module also uses analytic accounting and is compatible with the invoice on
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'],
-    'depends': ['hr', 'account_voucher'],
+    'depends': ['hr', 'account_voucher, account_accountant'],
     'data': [
         'security/ir.model.access.csv',
         'hr_expense_data.xml',
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index f61f8923411..29570559c65 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -145,8 +145,7 @@ class hr_expense_expense(osv.osv):
     def expense_canceled(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'cancelled'}, context=context)
 
-
-    def account_move_get(self, cr, uid, expense_id, journal_id, context=None):
+    def account_move_get(self, cr, uid, expense_id, context=None):
         '''
         This method prepare the creation of the account move related to the given expense.
 
@@ -154,53 +153,27 @@ class hr_expense_expense(osv.osv):
         :return: mapping between fieldname and value of account move to create
         :rtype: dict
         '''
-        
-        
-        #Search for the period corresponding with confirmation date
-        expense_brw = self.browse(cr,uid,expense_id,context)
-        period_obj = self.pool.get('account.period')
-        company_id = expense_brw.company_id.id
-        ctx = context
-        ctx.update({'company_id': company_id})
-        date = expense_brw.date_confirm
-        pids = period_obj.find(cr, uid, date, context=ctx)
-        try:
-            period_id = pids[0]
-        except: 
-            raise osv.except_osv(_('Error! '), 
-                        _('Please define periods!'))
-        period = period_obj.browse(cr, uid, period_id, context=context)
-        
-        seq_obj = self.pool.get('ir.sequence')
-
-        journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
-        if journal.sequence_id:
-            if not journal.sequence_id.active:
-                raise osv.except_osv(_('Configuration Error !'),
-                    _('Please activate the sequence of selected journal !'))
-            c = dict(context)
-            c.update({'fiscalyear_id': period.fiscalyear_id.id})
-            name = seq_obj.next_by_id(cr, uid, journal.sequence_id.id, context=c)
+        journal_obj = self.pool.get('account.journal')
+        expense = self.browse(cr, uid, expense_id, context=context)
+        company_id = expense.company_id.id
+        date = expense.date_confirm
+        ref = expense.name
+        journal_id = False
+        if expense.journal_id:
+            journal_id = expense.journal_id.id
         else:
-            raise osv.except_osv(_('Error!'),
-                        _('Please define a sequence on the journal.'))
-        #Look for the next expense number
-        ref = seq_obj.get(cr, uid, 'hr.expense.invoice')
-
-        move = {
-            'name': name,
-            'journal_id': journal_id,
-            'narration': '',
-            'date': expense_brw.date_confirm,
-            'ref': ref,
-            'period_id': period_id,
-        }
-        return move
+            journal_id = journal_obj.search(cr, uid, [('type', '=', 'purchase'), ('company_id', '=', company_id)])
+            if not journal_id:
+                raise osv.except_osv(_('Error!'), _("No expense journal found. Please make sure you have a journal with type 'purchase' configured."))
+            journal_id = journal_id[0]
+        return self.pool.get('account_move').account_move_prepare(cr, uid, journal_id, date=date, ref=ref, company_id=company_id, context=context)
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):
+        #partner_id  = self.pool.get('res.partner')._find_partner(part)
+        partner_id = part.id
         return {
             'date_maturity': x.get('date_maturity', False),
-            'partner_id': part.id,
+            'partner_id': partner_id,
             'name': x['name'][:64],
             'date': date,
             'debit': x['price']>0 and x['price'],
@@ -218,108 +191,65 @@ class hr_expense_expense(osv.osv):
             'analytic_account_id': x.get('account_analytic_id', False),
         }
 
-    def compute_expense_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines, context=None):
+    def compute_expense_totals(self, cr, uid, exp, company_currency, ref, account_move_lines, context=None):
+        '''
+        internal method used for computation of total amount of an expense in the company currency and
+        in the expense currency, given the account_move_lines that will be created. It also do some small
+        transformations at these account_move_lines (for multi-currency purposes)
+        
+        :param account_move_lines: list of dict
+        :rtype: tuple of 3 elements (a, b ,c)
+            a: total in company currency
+            b: total in hr.expense currency
+            c: account_move_lines potentially modified
+        '''
+        cur_obj = self.pool.get('res.currency')
         if context is None:
             context={}
-        total = 0
-        total_currency = 0
-        cur_obj = self.pool.get('res.currency')
-        for i in invoice_move_lines:
-            if inv.currency_id.id != company_currency:
-                context.update({'date': inv.date_confirm or time.strftime('%Y-%m-%d')})
-                i['currency_id'] = inv.currency_id.id
+        context.update({'date': exp.date_confirm or time.strftime('%Y-%m-%d')})
+        total = 0.0
+        total_currency = 0.0
+        for i in account_move_lines:
+            if exp.currency_id.id != company_currency:
+                i['currency_id'] = exp.currency_id.id
                 i['amount_currency'] = i['price']
-                i['price'] = cur_obj.compute(cr, uid, inv.currency_id.id,
+                i['price'] = cur_obj.compute(cr, uid, exp.currency_id.id,
                         company_currency, i['price'],
                         context=context)
             else:
                 i['amount_currency'] = False
                 i['currency_id'] = False
-            i['ref'] = ref
             total -= i['price']
             total_currency -= i['amount_currency'] or i['price']
-        return total, total_currency, invoice_move_lines
+        return total, total_currency, account_move_lines
 
 
     def action_move_create(self, cr, uid, ids, context=None):
-        property_obj = self.pool.get('ir.property')
-        sequence_obj = self.pool.get('ir.sequence')
-        analytic_journal_obj = self.pool.get('account.analytic.journal')
-        account_journal = self.pool.get('account.journal')
-        voucher_obj = self.pool.get('account.voucher')
-        currency_obj = self.pool.get('res.currency')
-        ait_obj = self.pool.get('account.invoice.tax')
         move_obj = self.pool.get('account.move')
         if context is None:
             context = {}
         for exp in self.browse(cr, uid, ids, context=context):
-            company_id = exp.company_id.id
-            lines = []
-            total = 0.0
-            ctx = context.copy()
-            ctx.update({'date': exp.date})
-            journal = False
-            if exp.journal_id:
-                journal = exp.journal_id
-            else:
-                journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
-                if journal_id:
-                    journal = account_journal.browse(cr, uid, journal_id, context=context)
-            if not journal:
-                raise osv.except_osv(_('Error!'), _("No expense journal found. Please make sure you have a journal with type 'purchase' configured."))
-            if not journal.sequence_id:
-                raise osv.except_osv(_('Error!'), _('Please define sequence on the journal related to this invoice.'))
-            company_currency = exp.company_id.currency_id.id
-            current_currency = exp.currency_id
-#            for line in exp.line_ids: 
-#                if line.product_id:
-#                    acc = line.product_id.property_account_expense
-#                    if not acc:
-#                        acc = line.product_id.categ_id.property_account_expense_categ
-#                else:
-#                    acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
-#                    if not acc:
-#                        raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.'))
-#                total_amount = line.total_amount
-#                if journal.currency:
-#                    if exp.currency_id != journal.currency:
-#                        total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, total_amount, context=ctx)
-#                elif exp.currency_id != exp.company_id.currency_id:
-#                    total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, total_amount, context=ctx)
-#                lines.append((0, False, {
-#                    'name': line.name,
-#                    'account_id': acc.id,
-#                    'account_analytic_id': line.analytic_account.id,
-#                    'amount': total_amount,
-#                    'type': 'dr'
-#                }))
-#                total += total_amount
             if not exp.employee_id.address_home_id:
                 raise osv.except_osv(_('Error!'), _('The employee must have a home address.'))
-            acc = exp.employee_id.address_home_id.property_account_payable.id
+            company_currency = exp.company_id.currency_id.id
+            diff_currency_p = exp.currency_id.id <> company_currency
             
-            #From action_move_line_create of voucher
-            move_id = move_obj.create(cr, uid, self.account_move_get(cr, uid, exp.id, journal.id, context=context), context=context)
-            move = move_obj.browse(cr, uid, move_id, context=context)
+            #create the move that will contain the accounting entries
+            move_id = move_obj.create(cr, uid, self.account_move_get(cr, uid, exp.id, context=context), context=context)
             #iml = self._get_analytic_lines
             
             # within: iml = self.pool.get('account.invoice.line').move_line_get
             iml = self.move_line_get(cr, uid, exp.id, context=context)
             
-            
-            diff_currency_p = exp.currency_id.id <> company_currency
             # create one move line for the total
-            total = 0
-            total_currency = 0
-            total, total_currency, iml = self.compute_expense_totals(cr, uid, exp, company_currency, exp.name, iml, context=ctx)
-            
-            
-            #Need to have counterline: 
+            total, total_currency, iml = self.compute_expense_totals(cr, uid, exp, company_currency, exp.name, iml, context=context)
             
+            #counterline with the total on payable account for the employee
+            acc = exp.employee_id.address_home_id.property_account_payable.id
             iml.append({
-                    'type':'dest', 
-                    'name':'/',
-                    'price':total, 
+                    'type': 'dest',
+                    'name': '/',
+                    'price': total, 
                     'account_id': acc, 
                     'date_maturity': exp.date_confirm, 
                     'amount_currency': diff_currency_p and total_currency or False, 
@@ -327,27 +257,10 @@ class hr_expense_expense(osv.osv):
                     'ref': exp.name
                     })
             
-            line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, exp.user_id.partner_id, exp.date_confirm, context=ctx)),iml)
-            move_obj.write(cr, uid, [move_id], {'line_id':line}, context=ctx)
-            self.write(cr, uid, ids, {'account_move_id':move_id, 'state':'done'}, context=context)
-            
-            
-            #compute_taxes = ait_obj.compute(cr, uid, , context=context)
-            
-            
-            
-#    return {
-#        'type':'src', 
-#        'name':line.name.split('\n')[0][:64], 
-#        'price_unit':line.price_unit, 
-#        'quantity':line.quantity, 
-#        'price':line.price_subtotal, 
-#        'account_id':line.account_id.id, 
-#        'product_id':line.product_id.id, 
-#        'uos_id':line.uos_id.id, 
-#        'account_analytic_id':line.account_analytic_id.id, 
-#        'taxes':line.invoice_line_tax_id}
-
+            lines = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, exp.user_id.partner_id, exp.date_confirm, context=context)),iml)
+            move_obj.write(cr, uid, [move_id], {'line_id': lines}, context=context)
+            self.write(cr, uid, ids, {'account_move_id': move_id, 'state': 'done'}, context=context)
+        return True
 
     def move_line_get(self, cr, uid, expense_id, context=None):
         res = []
@@ -442,80 +355,11 @@ class hr_expense_expense(osv.osv):
         }
 
 
-
-
-
     def action_receipt_create(self, cr, uid, ids, context=None):
-        property_obj = self.pool.get('ir.property')
-        sequence_obj = self.pool.get('ir.sequence')
-        analytic_journal_obj = self.pool.get('account.analytic.journal')
-        account_journal = self.pool.get('account.journal')
-        voucher_obj = self.pool.get('account.voucher')
-        currency_obj = self.pool.get('res.currency')
-        wkf_service = netsvc.LocalService("workflow")
-        if context is None:
-            context = {}
-        for exp in self.browse(cr, uid, ids, context=context):
-            company_id = exp.company_id.id
-            lines = []
-            total = 0.0
-            ctx = context.copy()
-            ctx.update({'date': exp.date})
-            journal = False
-            if exp.journal_id:
-                journal = exp.journal_id
-            else:
-                journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
-                if journal_id:
-                    journal = account_journal.browse(cr, uid, journal_id, context=context)
-            if not journal:
-               raise osv.except_osv(_('Error!'), _("No expense journal found. Please make sure you have a journal with type 'purchase' configured."))
-            for line in exp.line_ids:
-                if line.product_id:
-                    acc = line.product_id.property_account_expense
-                    if not acc:
-                        acc = line.product_id.categ_id.property_account_expense_categ
-                else:
-                    acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
-                    if not acc:
-                        raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.'))
-                total_amount = line.total_amount
-                if journal.currency:
-                    if exp.currency_id != journal.currency:
-                        total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, total_amount, context=ctx)
-                elif exp.currency_id != exp.company_id.currency_id:
-                    total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, total_amount, context=ctx)
-                lines.append((0, False, {
-                    'name': line.name,
-                    'account_id': acc.id,
-                    'account_analytic_id': line.analytic_account.id,
-                    'amount': total_amount,
-                    'type': 'dr'
-                }))
-                total += total_amount
-            if not exp.employee_id.address_home_id:
-                raise osv.except_osv(_('Error!'), _('The employee must have a home address.'))
-            acc = exp.employee_id.address_home_id.property_account_payable.id
-            voucher = {
-                'name': exp.name or '/',
-                'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
-                'account_id': acc,
-                'type': 'purchase',
-                'partner_id': exp.employee_id.address_home_id.id,
-                'company_id': company_id,
-                'line_ids': lines,
-                'amount': total,
-                'journal_id': journal.id,
-            }
-            if journal and not journal.analytic_journal_id:
-                analytic_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')], context=context)
-                if analytic_journal_ids:
-                    account_journal.write(cr, uid, [journal.id], {'analytic_journal_id': analytic_journal_ids[0]}, context=context)
-            voucher_id = voucher_obj.create(cr, uid, voucher, context=context)
-            self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'done'}, context=context)
-        return True
+        raise osv.except_osv(_('Error!'), _('Deprecated function used'))
     
     def action_view_receipt(self, cr, uid, ids, context=None):
+        raise osv.except_osv(_('Error!'), _('Deprecated function used'))
         '''
         This function returns an action that display existing receipt of given expense ids.
         '''
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 0324388786f..cb1a7408a29 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -133,6 +133,7 @@
                             <group>
                                 <group string="Accounting Data">
                                     <field name="journal_id" widget="selection" domain="[('type', '=', 'purchase')]"/>
+                                    <field name="account_move_id"/>
                                     <field name="voucher_id" context="{'form_view_ref': 'account_voucher.view_purchase_receipt_form'}"/>
                                 </group>
                             </group>

From d448390cafeeeadc470d1c84d77252e53483bf50 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 6 Mar 2013 15:35:34 +0100
Subject: [PATCH 05/43] [FIX] hr_expense: mising coma in manifest

bzr revid: qdp-launchpad@openerp.com-20130306143534-30vh1xl79eo6bf5c
---
 addons/hr_expense/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 1f4e7b42209..8eb7de957f8 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -46,7 +46,7 @@ This module also uses analytic accounting and is compatible with the invoice on
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'],
-    'depends': ['hr', 'account_voucher, account_accountant'],
+    'depends': ['hr', 'account_voucher', 'account_accountant'],
     'data': [
         'security/ir.model.access.csv',
         'hr_expense_data.xml',

From ee72f0953aec63c1f5f5444541a9075e0f3c9c43 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 6 Mar 2013 15:38:37 +0100
Subject: [PATCH 06/43] [FIX] hr_expense: typo

bzr revid: qdp-launchpad@openerp.com-20130306143837-gc7edztg71h5hi56
---
 addons/hr_expense/hr_expense.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 29570559c65..9196cba3d96 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -166,7 +166,7 @@ class hr_expense_expense(osv.osv):
             if not journal_id:
                 raise osv.except_osv(_('Error!'), _("No expense journal found. Please make sure you have a journal with type 'purchase' configured."))
             journal_id = journal_id[0]
-        return self.pool.get('account_move').account_move_prepare(cr, uid, journal_id, date=date, ref=ref, company_id=company_id, context=context)
+        return self.pool.get('account.move').account_move_prepare(cr, uid, journal_id, date=date, ref=ref, company_id=company_id, context=context)
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):
         #partner_id  = self.pool.get('res.partner')._find_partner(part)

From fd54f58ccb7802af3aa8eff580affb29dceb9874 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 6 Mar 2013 17:39:31 +0100
Subject: [PATCH 07/43] [IMP] hr_expense: now propose to open the account.move
 in form view thanks to a button in the expense form view

bzr revid: qdp-launchpad@openerp.com-20130306163931-609cgn16xmcr0wot
---
 addons/hr_expense/hr_expense.py       | 25 +++++++++++++------------
 addons/hr_expense/hr_expense_view.xml |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 9196cba3d96..cd11d19ff17 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -145,6 +145,9 @@ class hr_expense_expense(osv.osv):
     def expense_canceled(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'cancelled'}, context=context)
 
+    def action_receipt_create(self, cr, uid, ids, context=None):
+        raise osv.except_osv(_('Error!'), _('Deprecated function used'))
+
     def account_move_get(self, cr, uid, expense_id, context=None):
         '''
         This method prepare the creation of the account move related to the given expense.
@@ -354,28 +357,26 @@ class hr_expense_expense(osv.osv):
             #'taxes':line.invoice_line_tax_id,
         }
 
-
-    def action_receipt_create(self, cr, uid, ids, context=None):
-        raise osv.except_osv(_('Error!'), _('Deprecated function used'))
-    
-    def action_view_receipt(self, cr, uid, ids, context=None):
-        raise osv.except_osv(_('Error!'), _('Deprecated function used'))
+    def action_view_move(self, cr, uid, ids, context=None):
         '''
-        This function returns an action that display existing receipt of given expense ids.
+        This function returns an action that display existing account.move of given expense ids.
         '''
         assert len(ids) == 1, 'This option should only be used for a single id at a time'
         voucher_id = self.browse(cr, uid, ids[0], context=context).voucher_id.id
-        res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
+        try:
+            dummy, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'view_move_form')
+        except:
+            view_id = False
         result = {
-            'name': _('Expense Receipt'),
+            'name': _('Expense Account Move'),
             'view_type': 'form',
             'view_mode': 'form',
-            'view_id': res and res[1] or False,
-            'res_model': 'account.voucher',
+            'view_id': view_id,
+            'res_model': 'account.move',
             'type': 'ir.actions.act_window',
             'nodestroy': True,
             'target': 'current',
-            'res_id': voucher_id,
+            'res_id': account_move_id,
         }
         return result
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index cb1a7408a29..3ee97ba3a0e 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -67,7 +67,7 @@
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
                     <button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
-                    <button name="action_view_receipt" states="done" string="Open Receipt" type="object"/>
+                    <button name="action_view_move" states="done" string="Open Account Item" type="object" groups="account.group_account_invoice"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>

From 0b2fa6275cdf53039965132d3670bc8e33a5afec Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 6 Mar 2013 18:17:36 +0100
Subject: [PATCH 08/43] [FIX] hr_expense: open the account.move from the
 expense

bzr revid: qdp-launchpad@openerp.com-20130306171736-32gq9iyshvcpiddg
---
 addons/hr_expense/hr_expense.py       | 7 ++++---
 addons/hr_expense/hr_expense_view.xml | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index cd11d19ff17..3177098ef27 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -362,10 +362,11 @@ class hr_expense_expense(osv.osv):
         This function returns an action that display existing account.move of given expense ids.
         '''
         assert len(ids) == 1, 'This option should only be used for a single id at a time'
-        voucher_id = self.browse(cr, uid, ids[0], context=context).voucher_id.id
+        expense = self.browse(cr, uid, ids[0], context=context)
+        assert expense.account_move_id
         try:
             dummy, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'view_move_form')
-        except:
+        except ValueError, e:
             view_id = False
         result = {
             'name': _('Expense Account Move'),
@@ -376,7 +377,7 @@ class hr_expense_expense(osv.osv):
             'type': 'ir.actions.act_window',
             'nodestroy': True,
             'target': 'current',
-            'res_id': account_move_id,
+            'res_id': expense.account_move_id.id,
         }
         return result
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 3ee97ba3a0e..743d6814287 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -67,7 +67,7 @@
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
                     <button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
-                    <button name="action_view_move" states="done" string="Open Account Item" type="object" groups="account.group_account_invoice"/>
+                    <button name="action_view_move" states="done" string="Open Accounting Entries" type="object" groups="account.group_account_invoice"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>
@@ -134,7 +134,7 @@
                                 <group string="Accounting Data">
                                     <field name="journal_id" widget="selection" domain="[('type', '=', 'purchase')]"/>
                                     <field name="account_move_id"/>
-                                    <field name="voucher_id" context="{'form_view_ref': 'account_voucher.view_purchase_receipt_form'}"/>
+                                    <field name="voucher_id" invisible="1" context="{'form_view_ref': 'account_voucher.view_purchase_receipt_form'}"/>
                                 </group>
                             </group>
                         </page>

From 311bfac7fb330170b5162e1dc1aff2597054c46b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 7 Mar 2013 10:49:58 +0100
Subject: [PATCH 09/43] [FIX] hr_expense: generate accounting entries when
 there was no product was crashing

bzr revid: qdp-launchpad@openerp.com-20130307094958-j0x8zshu665q1vlf
---
 addons/hr_expense/hr_expense.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 3177098ef27..116b56b2449 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -283,6 +283,7 @@ class hr_expense_expense(osv.osv):
             
             #Calculate tax according to default tax on product
             
+            taxes = []
             #Taken from product_id_onchange in account.invoice
             if line.product_id:
                 fposition_id = False
@@ -299,7 +300,7 @@ class hr_expense_expense(osv.osv):
                     taxes = a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False
                 tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
             if not taxes:
-                taxes = []
+                continue
             #Calculating tax on the line and creating move?
             for tax in tax_obj.compute_all(cr, uid, taxes,
                     line.unit_amount ,
@@ -354,7 +355,6 @@ class hr_expense_expense(osv.osv):
             'product_id':line.product_id.id,
             'uos_id':line.uom_id.id,
             'account_analytic_id':line.analytic_account.id,
-            #'taxes':line.invoice_line_tax_id,
         }
 
     def action_view_move(self, cr, uid, ids, context=None):

From eb75755d726c76a9b71ffc0e4be8060071944bd5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 7 Mar 2013 10:50:31 +0100
Subject: [PATCH 10/43] [FIX] hr_expense: use the good partner_id at the
 creation time of accounting entries

bzr revid: qdp-launchpad@openerp.com-20130307095031-z3hbazdqugv18ryh
---
 addons/hr_expense/hr_expense.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 116b56b2449..bf8bba5e621 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -172,8 +172,7 @@ class hr_expense_expense(osv.osv):
         return self.pool.get('account.move').account_move_prepare(cr, uid, journal_id, date=date, ref=ref, company_id=company_id, context=context)
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):
-        #partner_id  = self.pool.get('res.partner')._find_partner(part)
-        partner_id = part.id
+        partner_id  = self.pool.get('res.partner')._find_accounting_partner(part).id
         return {
             'date_maturity': x.get('date_maturity', False),
             'partner_id': partner_id,
@@ -260,7 +259,7 @@ class hr_expense_expense(osv.osv):
                     'ref': exp.name
                     })
             
-            lines = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, exp.user_id.partner_id, exp.date_confirm, context=context)),iml)
+            lines = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, exp.employee_id.address_home_id, exp.date_confirm, context=context)),iml)
             move_obj.write(cr, uid, [move_id], {'line_id': lines}, context=context)
             self.write(cr, uid, ids, {'account_move_id': move_id, 'state': 'done'}, context=context)
         return True

From 864ff38236e09d468623b3c3700e9a87e0c10d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 7 Mar 2013 16:32:16 +0100
Subject: [PATCH 11/43] [IMP] CRM: when processing incoming emails to create a
 lead, do not add the email content as description.

bzr revid: tde@openerp.com-20130307153216-hab124jnmcmj3dm8
---
 addons/crm/crm_lead.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index e5d07b2df42..e8bba67e1ce 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -975,12 +975,10 @@ class crm_lead(base_stage, format_address, osv.osv):
             through message_process.
             This override updates the document according to the email.
         """
-        if custom_values is None: custom_values = {}
-
-        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
+        if custom_values is None:
+            custom_values = {}
         defaults = {
             'name':  msg.get('subject') or _("No Subject"),
-            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'partner_id': msg.get('author_id', False),

From b551e04dcdf34f2ade1cbb8cdc4ba0b16f0a628e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 7 Mar 2013 17:28:51 +0100
Subject: [PATCH 12/43] [IMP] CRM: phonecall scheduling: opportunity
 description not in phonecall description anymore; move a field in form view
 to be more user friendly.

bzr revid: tde@openerp.com-20130307162851-jmic921ixzjop44g
---
 addons/crm/wizard/crm_opportunity_to_phonecall.py       | 2 --
 addons/crm/wizard/crm_opportunity_to_phonecall_view.xml | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index ad9d30c80a4..ee7ed1fc31f 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -52,8 +52,6 @@ class crm_opportunity2phonecall(osv.osv_memory):
                 res.update({'categ_id': categ_id})
             if 'partner_id' in fields:
                 res.update({'partner_id': opp.partner_id and opp.partner_id.id or False})
-            if 'note' in fields:
-                res.update({'note': opp.description})
             if 'contact_name' in fields:
                 res.update({'contact_name': opp.partner_id and opp.partner_id.name or False})
             if 'phone' in fields:
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 6e44573cc89..ad369448517 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -13,14 +13,14 @@
                         <group>
                             <field name="action"/>
                             <field name="name"/>
+                            <field name="categ_id" string="Type"
+                                widget="selection"
+                                domain="[('object_id.model', '=', 'crm.phonecall')]"
+                                groups="base.group_no_one"/>
                             <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
                         </group>
                         <group>
                             <field name="partner_id" readonly="True"/>
-                            <field name="categ_id" string="Type"
-                                widget="selection"
-                            domain="[('object_id.model', '=', 'crm.phonecall')]"
-                            groups="base.group_no_one"/>
                             <field name="phone"/>
                             <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
                             <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>

From 2da3ea2d628d070e19db4dd172e3b2445fccad3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 7 Mar 2013 17:50:14 +0100
Subject: [PATCH 13/43] [IMP] email_template: added _order as name.

bzr revid: tde@openerp.com-20130307165014-gv2gmfh9d1nvjy9h
---
 addons/email_template/email_template.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 743384059b4..280e44fa2fb 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -65,6 +65,7 @@ class email_template(osv.osv):
     "Templates for sending email"
     _name = "email.template"
     _description = 'Email Templates'
+    _order = 'name'
 
     def render_template(self, cr, uid, template, model, res_id, context=None):
         """Render the given template text, replace mako expressions ``${expr}``

From 2a849670f498d5c673b1f56cca5ebe7a57b79922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 7 Mar 2013 17:50:45 +0100
Subject: [PATCH 14/43] [IMP] email_template: from and subject are not required
 anymore, because they can have now defautl values using chatter.

bzr revid: tde@openerp.com-20130307165045-dihvsdo3whgsk05b
---
 addons/email_template/email_template_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 4cddb31c8e1..73e796394a8 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -28,7 +28,7 @@
                             <page string="Email Details">
                                 <group>
                                     <group string="Addressing">
-                                      <field name="email_from" required="1"/>
+                                      <field name="email_from"/>
                                       <field name="email_to"/>
                                       <field name="email_recipients"/>
                                       <field name="email_cc"/>
@@ -43,7 +43,7 @@
                                             <field name="copyvalue"/>
                                     </group>
                                     <group string="Contents" colspan="2">
-                                       <field name="subject" required="1"/>
+                                       <field name="subject"/>
                                        <field name="body_html" width="250" height="450" nolabel="1" colspan="2" placeholder="Email contents (in raw HTML format)"/>
                                     </group>
                                 </group>

From 5ebf390f965f369bc4c29c7e5cf4232480d34bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 8 Mar 2013 10:11:56 +0100
Subject: [PATCH 15/43] [FIX] email_template: void value in partner_ids when
 generating tmeplate does not erase wizard value anymore.

bzr revid: tde@openerp.com-20130308091156-ytw5k4y5w321705f
---
 .../wizard/mail_compose_message.py             | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index b39ed4e5639..e9f539a22b2 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -70,6 +70,7 @@ class mail_compose_message(osv.TransientModel):
         elif template_id:
             # FIXME odo: change the mail generation to avoid attachment duplication
             values = self.generate_email_for_composer(cr, uid, template_id, res_id, context=context)
+            print values.get('partner_ids')
             # transform attachments into attachment_ids
             values['attachment_ids'] = []
             ir_attach_obj = self.pool.get('ir.attachment')
@@ -80,7 +81,7 @@ class mail_compose_message(osv.TransientModel):
                     'datas_fname': attach_fname,
                     'res_model': model,
                     'res_id': res_id,
-                    'type': 'binary', # override default_type from context, possibly meant for another model!
+                    'type': 'binary',  # override default_type from context, possibly meant for another model!
                 }
                 values['attachment_ids'].append(ir_attach_obj.create(cr, uid, data_attach, context=context))
         else:
@@ -125,19 +126,22 @@ class mail_compose_message(osv.TransientModel):
         fields = ['body_html', 'subject', 'email_to', 'email_recipients', 'email_cc', 'attachments']
         values = dict((field, template_values[field]) for field in fields if template_values.get(field))
         values['body'] = values.pop('body_html', '')
-        # transform email_to, email_cc into partner_ids
-        values['partner_ids'] = []
 
+        # transform email_to, email_cc into partner_ids
+        partner_ids = set()
         mails = tools.email_split(values.pop('email_to', '') + ' ' + values.pop('email_cc', ''))
         for mail in mails:
             partner_id = self.pool.get('res.partner').find_or_create(cr, uid, mail, context=context)
-            values['partner_ids'].append(partner_id)
+            partner_ids.add(partner_id)
         email_recipients = values.pop('email_recipients', '')
         if email_recipients:
             for partner_id in email_recipients.split(','):
-                values['partner_ids'].append(int(partner_id))
-
-        values['partner_ids'] = list(set(values['partner_ids']))
+                if partner_id:  # placeholders could generate '', 3, 2 due to some empty field values
+                    partner_ids.add(int(partner_id))
+        # legacy template behavior: void values do not erase existing values and the
+        # related key is removed from the values dict
+        if partner_ids:
+            values['partner_ids'] = [(6, 0, list(partner_ids))]
 
         return values
 

From a82042a6b1bf1866dae4be2231e8bc56b53a5d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 8 Mar 2013 10:25:32 +0100
Subject: [PATCH 16/43] [FIX] uploader widget: use the field string instead of
 an hardcoded 'File'.

bzr revid: tde@openerp.com-20130308092532-w24qj0kxd9374s1u
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index bd4f2f15e1f..529b7809d46 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1303,7 +1303,7 @@
         <div class="oe_add" t-if="!widget.get('effective_readonly')">
             <!-- uploader of file -->
             <button class="oe_attach"><span class="oe_e">'</span></button> 
-            <span class='oe_attach_label'>File</span>
+            <span class='oe_attach_label'><t t-esc="widget.string"/></span>
             <t t-call="HiddenInputFile">
                 <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
                 <t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t>

From 22bba15ccd7ab709db9ed2c38a132273c9847e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 8 Mar 2013 13:43:41 +0100
Subject: [PATCH 17/43] [FIX] email_template: on_change values for m2m can be
 list of ids, not necessarily commands.

bzr revid: tde@openerp.com-20130308124341-ih0f4us81cffer7m
---
 addons/email_template/wizard/mail_compose_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index e9f539a22b2..9dad18e07f3 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -141,7 +141,7 @@ class mail_compose_message(osv.TransientModel):
         # legacy template behavior: void values do not erase existing values and the
         # related key is removed from the values dict
         if partner_ids:
-            values['partner_ids'] = [(6, 0, list(partner_ids))]
+            values['partner_ids'] = list(partner_ids)
 
         return values
 

From 6dbb52267f514055f013207f7522f9d49dfd6110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 8 Mar 2013 13:47:24 +0100
Subject: [PATCH 18/43] [FIX] res_partner: notification_email_send help and
 selection values strings updated for cleaner explanations.

bzr revid: tde@openerp.com-20130308124724-6tmb4w180sf32ktb
---
 addons/mail/res_partner.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 218b5ae3cb7..6807c13a08a 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -30,13 +30,16 @@ class res_partner_mail(osv.Model):
 
     _columns = {
         'notification_email_send': fields.selection([
-            ('all', 'All feeds'),
-            ('comment', 'Comments and Emails'),
-            ('email', 'Emails only'),
+            ('all', 'All Messages (discussions, emails, followed system notifications)'),
+            ('comment', 'Incoming Emails and Discussions'),
+            ('email', 'Incoming Emails only'),
             ('none', 'Never')
-            ], 'Receive Feeds by Email', required=True,
-            help="Choose in which case you want to receive an email when you "\
-                  "receive new feeds."),
+            ], 'Receive Messages by Email', required=True,
+            help="Policy to receive emails for new notifications pushed to your Inbox. "\
+                    "'Never' prevents OpenERP from sending emails for notifications. "\
+                    "'Incoming Emails only' send an email when you receive an incoming email, such as customer replies. "\
+                    "'Incoming Emails and Discussions' sends emails for incoming emails along with user input. "\
+                    "'All Messages' also sends emails for notifications received for followed subtype, like stage changes, in addition to Incoming Emails and Discussions."),
     }
 
     _defaults = {

From d130a05e8cf147ea983c42de588d3ac9c66e319a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 8 Mar 2013 13:47:53 +0100
Subject: [PATCH 19/43] [FIX] crm, email_template: opt_out parameter used only
 for mass mailing and marketing campaigns. Updated help accordingly.

bzr revid: tde@openerp.com-20130308124753-dzt5e5nf7zpaq2dk
---
 addons/crm/crm_lead.py               | 2 +-
 addons/email_template/res_partner.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index e8bba67e1ce..9b3697b8dc5 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -259,7 +259,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"),
         'contact_name': fields.char('Contact Name', size=64),
         'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner company that will be created while converting the lead into opportunity', select=1),
-        'opt_out': fields.boolean('Opt-Out', oldname='optout', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
+        'opt_out': fields.boolean('Opt-Out', oldname='optout', help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign."),
         'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
diff --git a/addons/email_template/res_partner.py b/addons/email_template/res_partner.py
index 987fca43219..bf730f37458 100644
--- a/addons/email_template/res_partner.py
+++ b/addons/email_template/res_partner.py
@@ -28,8 +28,8 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
 
     _columns = {
-        'opt_out': fields.boolean('Opt-Out', help="If checked, this partner will not receive any automated email " \
-                                                  "notifications, such as the availability of invoices."),
+        'opt_out': fields.boolean('Opt-Out',
+            help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign."),
     }
 
     _defaults = {

From 6d78c2f2349ea64d5248644c559c34a0bdccd7f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 8 Mar 2013 13:48:35 +0100
Subject: [PATCH 20/43] [FIX] res_partner: mail now adds forgotten
 notification_email_send field; otherwise partner manager are not able to
 change the email reception policy for partners that are not users.

bzr revid: tde@openerp.com-20130308124835-sooyabgjhawjg7qr
---
 addons/mail/res_partner_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index a4aa56ae971..7df5d27c9d0 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -7,6 +7,9 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='active']" position="after">
+                    <field name='notification_email_send'/>
+                </xpath>
                 <xpath expr="//sheet" position="after">
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>

From 16a89075e0cbfcb42bfe0e8c6ebbac2012b1097e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 8 Mar 2013 14:14:52 +0100
Subject: [PATCH 21/43] [FIX] FieldTextHtml: fixed quote error in parameter of
 cleditor, leading to font-family not taken into account.

bzr revid: tde@openerp.com-20130308131452-8mmmpc6was3lfse8
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3ca546a9754..c8f7eaf032e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2662,7 +2662,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc
                             "| removeformat | bullets numbering | outdent " +
                             "indent | link unlink | source",
                 bodyStyle:  // style to assign to document body contained within the editor
-                            "margin:4px; color:#4c4c4c; font-size:13px; font-family:\"Lucida Grande\",Helvetica,Verdana,Arial,sans-serif; cursor:text"
+                            "margin:4px; color:#4c4c4c; font-size:13px; font-family:\'Lucida Grande\',Helvetica,Verdana,Arial,sans-serif; cursor:text"
             });
             this.$cleditor = this.$textarea.cleditor()[0];
             this.$cleditor.change(function() {

From 7310643b6b15e09db11de2ec38be007e37706936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 11 Mar 2013 12:46:23 +0100
Subject: [PATCH 22/43] [IMP] email: better reply_to that includes document
 name.

bzr revid: tde@openerp.com-20130311114623-ftcj8s8rbahvjupz
---
 addons/mail/mail_mail.py | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 1b3ca152a9a..6219ace864f 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -21,6 +21,7 @@
 
 import base64
 import logging
+import re
 from urllib import urlencode
 from urlparse import urljoin
 
@@ -198,13 +199,27 @@ class mail_mail(osv.Model):
             :param browse_record mail: mail.mail browse_record
             :param browse_record partner: specific recipient partner
         """
+        # TDE FIXME BEFORE MERGE: not sure the late change is interesting
         if mail.reply_to:
             return mail.reply_to
-        if not mail.model or not mail.res_id:
-            return False
-        if not hasattr(self.pool.get(mail.model), 'message_get_reply_to'):
-            return False
-        return self.pool.get(mail.model).message_get_reply_to(cr, uid, [mail.res_id], context=context)[0]
+        document_name = ''
+        email_reply_to = False
+        if mail.model and mail.res_id and hasattr(self.pool.get(mail.model), 'message_get_reply_to'):
+            email_reply_to = self.pool.get(mail.model).message_get_reply_to(cr, uid, [mail.res_id], context=context)[0]
+
+        if not email_reply_to:
+            if mail.email_from:
+                match = re.search(r'([^\s,<@]+@[^>\s,]+)', mail.email_from)  # TDE TODO: simplify multiple same regex
+                if match:
+                    email_reply_to = match.group(1)
+
+        if email_reply_to:
+            if mail.model and mail.res_id:
+                document_name = self.pool.get(mail.model).name_get(cr, SUPERUSER_ID, [mail.res_id], context=context)[0]
+            if document_name:
+                return 'Followers of %s <%s>' % (document_name[1], email_reply_to)
+            else:
+                return email_reply_to
 
     def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
         """ Return a dictionary for specific email values, depending on a

From a2a8c238dcd04e683ef6d3f1051aaa9e432db89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 11 Mar 2013 13:42:54 +0100
Subject: [PATCH 23/43] [CLEAN] email_template: removed a print statement.

bzr revid: tde@openerp.com-20130311124254-xzxs1r6cnqw2zxxc
---
 addons/email_template/wizard/mail_compose_message.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 9dad18e07f3..255f93998a2 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -70,7 +70,6 @@ class mail_compose_message(osv.TransientModel):
         elif template_id:
             # FIXME odo: change the mail generation to avoid attachment duplication
             values = self.generate_email_for_composer(cr, uid, template_id, res_id, context=context)
-            print values.get('partner_ids')
             # transform attachments into attachment_ids
             values['attachment_ids'] = []
             ir_attach_obj = self.pool.get('ir.attachment')

From 6ae80a98acb524d0965658446a65bf5fd2a020d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 11 Mar 2013 13:49:14 +0100
Subject: [PATCH 24/43] [CLEAN] mail: cleaned code of modified reply_to.

bzr revid: tde@openerp.com-20130311124914-xcdbgmw4w7nm02rv
---
 addons/mail/mail_mail.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 6219ace864f..1ca3255fd84 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -202,24 +202,26 @@ class mail_mail(osv.Model):
         # TDE FIXME BEFORE MERGE: not sure the late change is interesting
         if mail.reply_to:
             return mail.reply_to
-        document_name = ''
         email_reply_to = False
+
+        # if model and res_id: try to use ``message_get_reply_to`` that returns the document alias
         if mail.model and mail.res_id and hasattr(self.pool.get(mail.model), 'message_get_reply_to'):
             email_reply_to = self.pool.get(mail.model).message_get_reply_to(cr, uid, [mail.res_id], context=context)[0]
+        # no alias reply_to -> reply_to will be the email_from, only the email part
+        if not email_reply_to and mail.email_from:
+            match = re.search(r'([^\s,<@]+@[^>\s,]+)', mail.email_from)  # TDE TODO: simplify multiple same regex
+            if match:
+                email_reply_to = match.group(1)
 
-        if not email_reply_to:
-            if mail.email_from:
-                match = re.search(r'([^\s,<@]+@[^>\s,]+)', mail.email_from)  # TDE TODO: simplify multiple same regex
-                if match:
-                    email_reply_to = match.group(1)
-
+        # format 'Document name <email_address>'
         if email_reply_to:
+            document_name = ''
             if mail.model and mail.res_id:
                 document_name = self.pool.get(mail.model).name_get(cr, SUPERUSER_ID, [mail.res_id], context=context)[0]
             if document_name:
-                return 'Followers of %s <%s>' % (document_name[1], email_reply_to)
-            else:
-                return email_reply_to
+                email_reply_to = 'Followers of %s <%s>' % (document_name[1], email_reply_to)
+
+        return email_reply_to
 
     def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
         """ Return a dictionary for specific email values, depending on a

From 459fce0150981269e668fda52001463269f58659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 11 Mar 2013 15:08:38 +0100
Subject: [PATCH 25/43] [CLEAN] Removed unnecessary quotes. As Teal'c said:
 Indeed.

bzr revid: tde@openerp.com-20130311140838-g9pvncskvuibz1wm
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c8f7eaf032e..952a1c9d15f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2662,7 +2662,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc
                             "| removeformat | bullets numbering | outdent " +
                             "indent | link unlink | source",
                 bodyStyle:  // style to assign to document body contained within the editor
-                            "margin:4px; color:#4c4c4c; font-size:13px; font-family:\'Lucida Grande\',Helvetica,Verdana,Arial,sans-serif; cursor:text"
+                            "margin:4px; color:#4c4c4c; font-size:13px; font-family:'Lucida Grande',Helvetica,Verdana,Arial,sans-serif; cursor:text"
             });
             this.$cleditor = this.$textarea.cleditor()[0];
             this.$cleditor.change(function() {

From 910f7097ba8278e329de236341f7e2e78293c0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 13 Mar 2013 11:56:40 +0100
Subject: [PATCH 26/43] [IMP] res_partner: use tools.email_split instead of
 custom regex when parsing partner_name to find an email.

bzr revid: tde@openerp.com-20130313105640-r53xueaz36zw3fjd
---
 openerp/addons/base/res/res_partner.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 4dce23b4d33..7c9fbf58c64 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -417,10 +417,10 @@ class res_partner(osv.osv, format_address):
         """ Supported syntax:
             - 'Raoul <raoul@grosbedon.fr>': will find name and email address
             - otherwise: default, everything is set as the name """
-        match = re.search(r'([^\s,<@]+@[^>\s,]+)', text)
-        if match:
-            email = match.group(1)
-            name = text[:text.index(email)].replace('"','').replace('<','').strip()
+        emails = tools.email_split(text)
+        if emails:
+            email = emails[0]
+            name = text[:text.index(email)].replace('"', '').replace('<', '').strip()
         else:
             name, email = text, ''
         return name, email

From d49889c9a8575cdb31193770172e9de3bb1b3d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 13 Mar 2013 12:17:46 +0100
Subject: [PATCH 27/43] [IMP] mail: res_partner: improved help for
 notification_email_send.

bzr revid: tde@openerp.com-20130313111746-xfrd8kdhntb39gwl
---
 addons/mail/res_partner.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 6807c13a08a..05f9fc2ace0 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -30,16 +30,16 @@ class res_partner_mail(osv.Model):
 
     _columns = {
         'notification_email_send': fields.selection([
-            ('all', 'All Messages (discussions, emails, followed system notifications)'),
-            ('comment', 'Incoming Emails and Discussions'),
+            ('none', 'Never'),
             ('email', 'Incoming Emails only'),
-            ('none', 'Never')
+            ('comment', 'Incoming Emails and Discussions'),
+            ('all', 'All Messages (discussions, emails, followed system notifications)'),
             ], 'Receive Messages by Email', required=True,
-            help="Policy to receive emails for new notifications pushed to your Inbox. "\
-                    "'Never' prevents OpenERP from sending emails for notifications. "\
-                    "'Incoming Emails only' send an email when you receive an incoming email, such as customer replies. "\
-                    "'Incoming Emails and Discussions' sends emails for incoming emails along with user input. "\
-                    "'All Messages' also sends emails for notifications received for followed subtype, like stage changes, in addition to Incoming Emails and Discussions."),
+            help="Policy to receive emails for new messages pushed to your personal Inbox:\n "
+                    "- Never: no emails are sent"
+                    "- Incoming Emails only: for messages received by the system via email"
+                    "- Incoming Emails and Discussions: for incoming emails along with internal discussions"
+                    "- All Messages: for every notification you receive in your Inbox"),
     }
 
     _defaults = {

From 6b2c64ff4099a3ab7cb5f0643f20bda5943f3f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 13 Mar 2013 12:19:26 +0100
Subject: [PATCH 28/43] [IMP] mail_mail: cleaned code about reply_to format:
 now uses tools.email_split, cleaned a bit the code.

bzr revid: tde@openerp.com-20130313111926-45d9gct5nihr6f6n
---
 addons/mail/mail_mail.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 1ca3255fd84..7720df84f92 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -209,17 +209,15 @@ class mail_mail(osv.Model):
             email_reply_to = self.pool.get(mail.model).message_get_reply_to(cr, uid, [mail.res_id], context=context)[0]
         # no alias reply_to -> reply_to will be the email_from, only the email part
         if not email_reply_to and mail.email_from:
-            match = re.search(r'([^\s,<@]+@[^>\s,]+)', mail.email_from)  # TDE TODO: simplify multiple same regex
-            if match:
-                email_reply_to = match.group(1)
+            emails = tools.email_split(mail.email_from)
+            if emails:
+                email_reply_to = emails[0]
 
         # format 'Document name <email_address>'
-        if email_reply_to:
-            document_name = ''
-            if mail.model and mail.res_id:
-                document_name = self.pool.get(mail.model).name_get(cr, SUPERUSER_ID, [mail.res_id], context=context)[0]
+        if email_reply_to and mail.model and mail.res_id:
+            document_name = self.pool.get(mail.model).name_get(cr, SUPERUSER_ID, [mail.res_id], context=context)[0]
             if document_name:
-                email_reply_to = 'Followers of %s <%s>' % (document_name[1], email_reply_to)
+                email_reply_to = _('Followers of %s <%s>') % (document_name[1], email_reply_to)
 
         return email_reply_to
 

From 2f4a59fd0652e1c5b76e5bd62826de084295c91d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 13 Mar 2013 12:20:13 +0100
Subject: [PATCH 29/43] [IMP] email_template, crm: added forgotten filters for
 opt-out; cleaned help of opt-out; email body is back into internal note as it
 has been decided that it was too much change for 7.0, especially that email
 content parsing is not robust enough.

bzr revid: tde@openerp.com-20130313112013-veqzplextey1300p
---
 addons/crm/crm_lead.py                     |  6 +++++-
 addons/crm/crm_lead_view.xml               |  2 ++
 addons/email_template/res_partner.py       |  5 +++--
 addons/email_template/res_partner_view.xml | 12 ++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9b3697b8dc5..7ab9f110a7b 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -259,7 +259,9 @@ class crm_lead(base_stage, format_address, osv.osv):
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"),
         'contact_name': fields.char('Contact Name', size=64),
         'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner company that will be created while converting the lead into opportunity', select=1),
-        'opt_out': fields.boolean('Opt-Out', oldname='optout', help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign."),
+        'opt_out': fields.boolean('Opt-Out', oldname='optout',
+            help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. "
+                    "Filter 'Available for Mass Mailing' allows users to filter the partners when performing mass mailing."),
         'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
@@ -977,8 +979,10 @@ class crm_lead(base_stage, format_address, osv.osv):
         """
         if custom_values is None:
             custom_values = {}
+        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         defaults = {
             'name':  msg.get('subject') or _("No Subject"),
+            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'partner_id': msg.get('author_id', False),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index df68f90aa57..39c9a5b98f5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -341,6 +341,8 @@
                     <filter string="Assigned to My Team(s)"
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
                             help="Leads that are assigned to any sales teams I am member of"/>
+                    <filter string="Available for mass mailing" domain="[('opt_out', '=', False)]"
+                            help="Leads that did not ask not to be included in mass mailing campaigns"/>
                     <separator/>
                     <group expand="0" string="Group By...">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/email_template/res_partner.py b/addons/email_template/res_partner.py
index bf730f37458..cb3ef67862f 100644
--- a/addons/email_template/res_partner.py
+++ b/addons/email_template/res_partner.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv
 
 class res_partner(osv.osv):
     """Inherit res.partner to add a generic opt-out field that can be used
@@ -29,7 +29,8 @@ class res_partner(osv.osv):
 
     _columns = {
         'opt_out': fields.boolean('Opt-Out',
-            help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign."),
+            help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. "
+                    "Filter 'Available for Mass Mailing' allows users to filter the partners when performing mass mailing."),
     }
 
     _defaults = {
diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml
index 3d17120d69e..7e494bd5054 100644
--- a/addons/email_template/res_partner_view.xml
+++ b/addons/email_template/res_partner_view.xml
@@ -11,5 +11,17 @@
                 </xpath>
             </field>
         </record>
+
+       <record model="ir.ui.view" id="res_partner_opt_out_search">
+            <field name="name">res.partner.opt_out.search</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_res_partner_filter"/>
+            <field name="arch" type="xml">
+                    <filter string="Suppliers" position="after">
+                        <filter string="Available for mass mailing" domain="[('opt_out', '=', False)]"
+                                help="Leads that did not ask not to be included in mass mailing campaigns"/>
+                    </filter>
+            </field>
+        </record>
     </data>
 </openerp>

From fdf7410acffa269ee81ac7a0f03c3f9429b19e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 13 Mar 2013 12:59:01 +0100
Subject: [PATCH 30/43] [FIX] crm, res_partner: added separator in search views
 after adding not opt-out filter.

bzr revid: tde@openerp.com-20130313115901-s60j69qn3e3q4bpk
---
 addons/crm/crm_lead_view.xml               | 3 ++-
 addons/email_template/res_partner_view.xml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 39c9a5b98f5..4c055ce1436 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -341,9 +341,10 @@
                     <filter string="Assigned to My Team(s)"
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
                             help="Leads that are assigned to any sales teams I am member of"/>
+                    <separator />
                     <filter string="Available for mass mailing" domain="[('opt_out', '=', False)]"
                             help="Leads that did not ask not to be included in mass mailing campaigns"/>
-                    <separator/>
+                    <separator />
                     <group expand="0" string="Group By...">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Team" domain="[]" context="{'group_by':'section_id'}"/>
diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml
index 7e494bd5054..c6331ebf514 100644
--- a/addons/email_template/res_partner_view.xml
+++ b/addons/email_template/res_partner_view.xml
@@ -18,8 +18,9 @@
             <field name="inherit_id" ref="base.view_res_partner_filter"/>
             <field name="arch" type="xml">
                     <filter string="Suppliers" position="after">
+                        <separator />
                         <filter string="Available for mass mailing" domain="[('opt_out', '=', False)]"
-                                help="Leads that did not ask not to be included in mass mailing campaigns"/>
+                                help="Leads that did not ask not to be included in mass mailing campaigns" />
                     </filter>
             </field>
         </record>

From 3dc1a58ed5906212a52c376b62cff69d9ac4ec78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 13 Mar 2013 13:12:21 +0100
Subject: [PATCH 31/43] [FIX] crm, email_template: fixed help messages talking
 about partners and leads instead of leads and partners... well, I think this
 comment is not very understandable, but at least there is a commit message.
 Horray.

bzr revid: tde@openerp.com-20130313121221-lo0kmkt2lltyr94e
---
 addons/crm/crm_lead.py                     | 2 +-
 addons/email_template/res_partner_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 7ab9f110a7b..d0be688c8a5 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -261,7 +261,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner company that will be created while converting the lead into opportunity', select=1),
         'opt_out': fields.boolean('Opt-Out', oldname='optout',
             help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. "
-                    "Filter 'Available for Mass Mailing' allows users to filter the partners when performing mass mailing."),
+                    "Filter 'Available for Mass Mailing' allows users to filter the leads when performing mass mailing."),
         'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml
index c6331ebf514..1da3681d3af 100644
--- a/addons/email_template/res_partner_view.xml
+++ b/addons/email_template/res_partner_view.xml
@@ -20,7 +20,7 @@
                     <filter string="Suppliers" position="after">
                         <separator />
                         <filter string="Available for mass mailing" domain="[('opt_out', '=', False)]"
-                                help="Leads that did not ask not to be included in mass mailing campaigns" />
+                                help="Partners that did not ask not to be included in mass mailing campaigns" />
                     </filter>
             </field>
         </record>

From ecd460e0d5a534af2a2536786b401c84267db40e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 13 Mar 2013 13:16:59 +0100
Subject: [PATCH 32/43] [IMP] email_template: improved help for email_from.

bzr revid: tde@openerp.com-20130313121659-pvdy814zoq9zonf2
---
 addons/email_template/email_template.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 280e44fa2fb..08ef3ec6e98 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -142,7 +142,9 @@ class email_template(osv.osv):
                                          help="If checked, the user's signature will be appended to the text version "
                                               "of the message"),
         'subject': fields.char('Subject', translate=True, help="Subject (placeholders may be used here)",),
-        'email_from': fields.char('From', help="Sender address (placeholders may be used here)"),
+        'email_from': fields.char('From',
+            help="Sender address (placeholders may be used here). If not set, the default "
+                    "value will be the author's email alias if configured, or email address."),
         'email_to': fields.char('To (Emails)', help="Comma-separated recipient addresses (placeholders may be used here)"),
         'email_recipients': fields.char('To (Partners)', help="Comma-separated ids of recipient partners (placeholders may be used here)"),
         'email_cc': fields.char('Cc', help="Carbon copy recipients (placeholders may be used here)"),

From 3b989b2c57f8aeb2d8bb92ec6338b862458d9641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 13 Mar 2013 13:26:32 +0100
Subject: [PATCH 33/43] [FIX] mail_message: fixed strings and names for
 read/unread filters.

bzr revid: tde@openerp.com-20130313122632-bwsz0pss88z0ups2
---
 addons/mail/mail_message_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 7d2e9483773..8f2fb3f1020 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -59,12 +59,12 @@
                     <field name="type"/>
                     <field name="author_id"/>
                     <field name="partner_ids"/>
-                    <filter string="Read"
-                            name="message_read" help="Show messages to read"
-                            domain="[('to_read', '=', False)]"/>
-                    <filter string="Unread"
+                    <filter string="To Read"
                             name="message_unread" help="Show messages to read"
                             domain="[('to_read', '=', True)]"/>
+                    <filter string="Read"
+                            name="message_read" help="Show already read messages"
+                            domain="[('to_read', '=', False)]"/>
                     <separator/>
                     <filter string="Comments"
                             name="comments" help="Comments"

From ea490d66c655924113da79019a8ce65a3380c2a5 Mon Sep 17 00:00:00 2001
From: Chris Biersbach <cbi@openerp.com>
Date: Wed, 13 Mar 2013 13:43:17 +0100
Subject: [PATCH 34/43] account: [FIX] Removes the unneeded second cancel
 button on supplier invoices

bzr revid: cbi@openerp.com-20130313124317-4ug3gvlnocmc50ko
---
 addons/account/account_invoice_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 3d46ee8365a..8c7cec67ac5 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -146,7 +146,6 @@
                         <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight" groups="account.group_account_invoice"/>
                         <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' groups="account.group_account_invoice"/>
                         <button name="invoice_cancel" states="draft,proforma2" string="Cancel Invoice" groups="account.group_account_invoice"/>
-                        <button name="invoice_cancel" states="sale,open" string="Cancel Invoice" groups="base.group_no_one"/>
                         <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" groups="account.group_account_invoice"/>
                         <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>

From 37092931bfc95ae612673e0d2c8b17a35d8d43b4 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 13 Mar 2013 13:44:09 +0100
Subject: [PATCH 35/43] [REF] hr_expense: code review and refactoring

bzr revid: qdp-launchpad@openerp.com-20130313124409-o24d2m1jlead1i3x
---
 addons/hr_expense/hr_expense.py | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index bf8bba5e621..5f39cc4d1f4 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -227,9 +227,10 @@ class hr_expense_expense(osv.osv):
 
 
     def action_move_create(self, cr, uid, ids, context=None):
+        '''
+        main function that is called when trying to create the accounting entries related to an expense
+        '''
         move_obj = self.pool.get('account.move')
-        if context is None:
-            context = {}
         for exp in self.browse(cr, uid, ids, context=context):
             if not exp.employee_id.address_home_id:
                 raise osv.except_osv(_('Error!'), _('The employee must have a home address.'))
@@ -238,17 +239,14 @@ class hr_expense_expense(osv.osv):
             
             #create the move that will contain the accounting entries
             move_id = move_obj.create(cr, uid, self.account_move_get(cr, uid, exp.id, context=context), context=context)
-            #iml = self._get_analytic_lines
+        
+            #one account.move.line per expense line (+taxes..)
+            eml = self.move_line_get(cr, uid, exp.id, context=context)
             
-            # within: iml = self.pool.get('account.invoice.line').move_line_get
-            iml = self.move_line_get(cr, uid, exp.id, context=context)
-            
-            # create one move line for the total
-            total, total_currency, iml = self.compute_expense_totals(cr, uid, exp, company_currency, exp.name, iml, context=context)
-            
-            #counterline with the total on payable account for the employee
+            #create one more move line, a counterline for the total on payable account
+            total, total_currency, eml = self.compute_expense_totals(cr, uid, exp, company_currency, exp.name, eml, context=context)
             acc = exp.employee_id.address_home_id.property_account_payable.id
-            iml.append({
+            eml.append({
                     'type': 'dest',
                     'name': '/',
                     'price': total, 
@@ -258,8 +256,9 @@ class hr_expense_expense(osv.osv):
                     'currency_id': diff_currency_p and exp.currency_id.id or False, 
                     'ref': exp.name
                     })
-            
-            lines = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, exp.employee_id.address_home_id, exp.date_confirm, context=context)),iml)
+
+            #convert eml into an osv-valid format
+            lines = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, exp.employee_id.address_home_id, exp.date_confirm, context=context)), eml)
             move_obj.write(cr, uid, [move_id], {'line_id': lines}, context=context)
             self.write(cr, uid, ids, {'account_move_id': move_id, 'state': 'done'}, context=context)
         return True

From 93d815efab5c413058aef66488a3e7a8d5838a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 13 Mar 2013 13:51:24 +0100
Subject: [PATCH 36/43] [CLEAN] crm, res_partner: added name on added filters;
 added oline breaks in big help of notification_email_send.

bzr revid: tde@openerp.com-20130313125124-wbu17isbi6cay100
---
 addons/crm/crm_lead_view.xml               | 3 ++-
 addons/email_template/res_partner_view.xml | 3 ++-
 addons/mail/res_partner.py                 | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4c055ce1436..91154b1ee5a 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -342,7 +342,8 @@
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
                             help="Leads that are assigned to any sales teams I am member of"/>
                     <separator />
-                    <filter string="Available for mass mailing" domain="[('opt_out', '=', False)]"
+                    <filter string="Available for mass mailing"
+                            name='not_opt_out' domain="[('opt_out', '=', False)]"
                             help="Leads that did not ask not to be included in mass mailing campaigns"/>
                     <separator />
                     <group expand="0" string="Group By...">
diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml
index 1da3681d3af..1eab8029cb2 100644
--- a/addons/email_template/res_partner_view.xml
+++ b/addons/email_template/res_partner_view.xml
@@ -19,7 +19,8 @@
             <field name="arch" type="xml">
                     <filter string="Suppliers" position="after">
                         <separator />
-                        <filter string="Available for mass mailing" domain="[('opt_out', '=', False)]"
+                        <filter string="Available for mass mailing"
+                                name='not_opt_out' domain="[('opt_out', '=', False)]"
                                 help="Partners that did not ask not to be included in mass mailing campaigns" />
                     </filter>
             </field>
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 05f9fc2ace0..8527e60aba0 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -35,10 +35,10 @@ class res_partner_mail(osv.Model):
             ('comment', 'Incoming Emails and Discussions'),
             ('all', 'All Messages (discussions, emails, followed system notifications)'),
             ], 'Receive Messages by Email', required=True,
-            help="Policy to receive emails for new messages pushed to your personal Inbox:\n "
-                    "- Never: no emails are sent"
-                    "- Incoming Emails only: for messages received by the system via email"
-                    "- Incoming Emails and Discussions: for incoming emails along with internal discussions"
+            help="Policy to receive emails for new messages pushed to your personal Inbox:\n"
+                    "- Never: no emails are sent\n"
+                    "- Incoming Emails only: for messages received by the system via email\n"
+                    "- Incoming Emails and Discussions: for incoming emails along with internal discussions\n"
                     "- All Messages: for every notification you receive in your Inbox"),
     }
 

From bce4b433cbdb3c565ae66d36311105a4df69e3cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 13 Mar 2013 16:12:27 +0100
Subject: [PATCH 37/43] [FIX] mail_mail: fixed search view group_by using
 fields removed between 6.1 and 7.0; added group_by author_id.

bzr revid: tde@openerp.com-20130313151227-0ukxnu9wyxm1pe37
---
 addons/mail/mail_mail_view.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index b6c4fc55977..fb2b66adb36 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -102,11 +102,10 @@
                         <field name="res_id"/>
                     </group>
                     <group expand="0" string="Group By...">
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                        <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
-                        <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Author" name="author" context="{'group_by':'author_id'}"/>
+                        <filter string="Thread" name="thread" domain="[]" context="{'group_by':'message_id'}"/>
+                        <filter string="Month" name="month" help="Creation Month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>

From ab76b7a67f9042c90abc292f9f3bb00eae33e066 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 13 Mar 2013 16:20:20 +0100
Subject: [PATCH 38/43] [FIX] web_services: fix db dump/restore when
 authentication requires a password on non-win32 systems

The various pg_* utilities require the password
via a special environment variable or a special
`pgpass` file in the user home, even on Unix,
namely when the PostgreSQL connection is done
via TCP and not via a unix socket.

Setting the environment variable is relatively
safe if it is removed from the environment
immediately after the operation, and saves user
the trouble of managing the pgpass file themselves.

This had been fixed at revision 3992 but was
incorrectly removed for non win32 platforms
at revision 4424 (rev-id stw@openerp.com-20120912114651-8hcliparft1ep9tc)

lp bug: https://launchpad.net/bugs/790164 fixed
lp bug: https://launchpad.net/bugs/919100 fixed

bzr revid: odo@openerp.com-20130313152020-suo2pyrabae0ecg4
---
 openerp/service/web_services.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 49bbf474020..0aabe62b1d7 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -234,14 +234,22 @@ class db(netsvc.ExportService):
 
     @contextlib.contextmanager
     def _set_pg_password_in_environment(self):
-        """ On Win32, pg_dump (and pg_restore) require that
-        :envvar:`PGPASSWORD` be set
+        """ On systems where pg_restore/pg_dump require an explicit
+        password (i.e. when not connecting via unix sockets, and most
+        importantly on Windows), it is necessary to pass the PG user
+        password in the environment or in a special .pgpass file.
 
         This context management method handles setting
-        :envvar:`PGPASSWORD` iif win32 and the envvar is not already
+        :envvar:`PGPASSWORD` if it is not already
         set, and removing it afterwards.
+
+        See also http://www.postgresql.org/docs/8.4/static/libpq-envars.html
+        
+        .. note:: This is not thread-safe, and should never be enabled for
+             SaaS (giving SaaS users the super-admin password is not a good idea
+             anyway)
         """
-        if os.name != 'nt' or os.environ.get('PGPASSWORD'):
+        if os.environ.get('PGPASSWORD'):
             yield
         else:
             os.environ['PGPASSWORD'] = tools.config['db_password']

From 46ed704e83f825cd3cd4f0a4781b04eb85723b85 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 13 Mar 2013 16:57:25 +0100
Subject: [PATCH 39/43] [FIX] analytic_contract, usability: display the
 reinvoicing info group when charge_expense is True

bzr revid: qdp-launchpad@openerp.com-20130313155725-v79jfvl05ehbuhdh
---
 .../account_analytic_analysis_view.xml                      | 6 +++---
 .../analytic_contract_hr_expense_view.xml                   | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 2e5565a263b..f00690ab372 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -131,10 +131,10 @@
                     </table>
                     <group name='invoice_on_timesheets' attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
                         <p class="oe_grey oe_edit_only" colspan="2">
-                            When invoicing on timesheet, OpenERP uses the
+                            When reinvoicing costs, OpenERP uses the
                             pricelist of the contract which uses the price
-                            defined on the product related to each employee to
-                            define the customer invoice price rate.
+                            defined on the product related (e.g timesheet 
+                            products are defined on each employee). 
                         </p>
                         <group>
                             <field name="pricelist_id"
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index 5628846a6a0..0f2a9229992 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -40,6 +40,9 @@
                         </td>
                     </tr>
                 </xpath>
+                <xpath expr="//group[@name='invoice_on_timesheets']" position="attributes">
+                    <attribute name="attrs">{'invisible': [('invoice_on_timesheets','=',False),('charge_expenses','=',False)]}</attribute>
+                </xpath>
             </field>
         </record>
         

From 19ddeb4b4b612e3ec133378b52c476208d52b47e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 13 Mar 2013 17:19:50 +0100
Subject: [PATCH 40/43] [FIX] analytic_contract, usability: display the
 reinvoicing info group when charge_expense is True

bzr revid: qdp-launchpad@openerp.com-20130313161950-lttkc7702pd69duq
---
 .../analytic_contract_hr_expense_view.xml                  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index 0f2a9229992..6f2d69e197c 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -43,6 +43,13 @@
                 <xpath expr="//group[@name='invoice_on_timesheets']" position="attributes">
                     <attribute name="attrs">{'invisible': [('invoice_on_timesheets','=',False),('charge_expenses','=',False)]}</attribute>
                 </xpath>
+                <xpath expr="//field[@name='pricelist_id']" position="attributes">
+                    <attribute name="attrs">{'required': ['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}</attribute>
+                </xpath>
+                <xpath expr="//field[@name='to_invoice']" position="attributes">
+                    <attribute name="attrs">{'required': ['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}</attribute>
+                    <attribute name="string">Expenses and Timesheet Invoicing Ratio</attribute>
+                </xpath>
             </field>
         </record>
         

From cdb474f179309b4296397526e18e297d9b2c3e4f Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 14 Mar 2013 05:34:39 +0000
Subject: [PATCH 41/43] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130314053439-q79rdq445kptn3nn
---
 addons/account/i18n/fr.po                     |  14 +-
 addons/account/i18n/mn.po                     |  24 +-
 addons/account_analytic_default/i18n/mk.po    |  10 +-
 addons/account_asset/i18n/hr.po               | 130 +--
 addons/account_asset/i18n/mn.po               |  14 +-
 addons/account_budget/i18n/mk.po              |  10 +-
 addons/account_budget/i18n/mn.po              |  10 +-
 addons/account_cancel/i18n/mn.po              |  10 +-
 addons/account_followup/i18n/sl.po            |  12 +-
 addons/account_voucher/i18n/mk.po             |  16 +-
 addons/analytic/i18n/mk.po                    |  18 +-
 .../analytic_contract_hr_expense/i18n/mk.po   |  12 +-
 addons/analytic_user_function/i18n/mk.po      |  10 +-
 addons/auth_ldap/i18n/mk.po                   |  16 +-
 addons/auth_openid/i18n/mk.po                 |  12 +-
 addons/auth_signup/i18n/mk.po                 |  43 +-
 addons/base_action_rule/i18n/mk.po            |  14 +-
 addons/base_iban/i18n/mk.po                   |   8 +-
 addons/base_report_designer/i18n/mk.po        |  18 +-
 addons/base_status/i18n/mk.po                 |  10 +-
 addons/base_vat/i18n/mk.po                    |  10 +-
 addons/crm/i18n/hu.po                         | 520 ++++++----
 addons/crm_partner_assign/i18n/hu.po          |  14 +-
 addons/crm_todo/i18n/mk.po                    |  12 +-
 addons/document_page/i18n/mk.po               |  18 +-
 addons/document_webdav/i18n/mk.po             |  16 +-
 addons/email_template/i18n/mk.po              |  10 +-
 addons/email_template/i18n/ro.po              |  10 +-
 addons/event/i18n/mk.po                       |  24 +-
 addons/event_moodle/i18n/mk.po                |  25 +-
 addons/event_sale/i18n/mk.po                  |   8 +-
 addons/fetchmail/i18n/mk.po                   |  22 +-
 addons/fleet/i18n/mn.po                       |  18 +-
 addons/google_base_account/i18n/mk.po         |  10 +-
 addons/hr/i18n/mk.po                          |  18 +-
 addons/lunch/i18n/mk.po                       | 906 ++++++++++++++++++
 addons/point_of_sale/i18n/hr.po               | 108 ++-
 addons/product/i18n/mn.po                     |  49 +-
 addons/project/i18n/hr.po                     | 371 +++----
 addons/purchase/i18n/mn.po                    |  10 +-
 addons/sale/i18n/mn.po                        |  16 +-
 addons/sale_stock/i18n/mn.po                  |  12 +-
 addons/stock/i18n/mn.po                       |  18 +-
 43 files changed, 1941 insertions(+), 695 deletions(-)
 create mode 100644 addons/lunch/i18n/mk.po

diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 03bc3525af9..7603bbdf16d 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-06 13:28+0000\n"
+"PO-Revision-Date: 2013-03-13 16:20+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:25+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:33+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -323,12 +323,12 @@ msgid ""
 "            "
 msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                Cliquez pour ajouter un remboursement à un client.\n"
+"                Cliquez pour ajouter un avoir client.\n"
 "              </p><p>\n"
-"                Un remboursement est un document qui crédite une facture\n"
+"                Un avoir est un document qui crédite une facture\n"
 "                complètement ou partiellement.\n"
 "              </p><p>\n"
-"                Au lieu de créer manuellement un remboursement client, vous\n"
+"                Au lieu de créer manuellement un avoir client, vous\n"
 "                pouvez le générer directement depuis la facture client\n"
 "                correspondante.\n"
 "              </p>\n"
@@ -1317,7 +1317,7 @@ msgstr "Début de période"
 #. module: account
 #: view:account.tax:0
 msgid "Refunds"
-msgstr "Remboursements"
+msgstr "Avoirs"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 094b1b77263..b8aabb58d10 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-09 08:25+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 10:07+0000\n"
+"Last-Translator: wsubuntu <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-10 05:14+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,8 +27,8 @@ msgstr "Системийн төлөлт"
 msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
-"Ижил дансууд дээр татварын харгалзаа нь зөвхөн нэг л удаа тодорхойлогдох "
-"боломжтой."
+"Ижил дансууд дээр дансны санхүүгийн позиц нь зөвхөн нэг л удаа "
+"тодорхойлогдох боломжтой."
 
 #. module: account
 #: help:account.tax.code,sequence:0
@@ -36,13 +36,13 @@ msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
-"'Санхүү \\ Тайлан \\ Тайлан үүсгэх \\ Татвар \\ Татварын Тайлан' тайланд "
-"дэлгэцийн дарааллыг тодоруул"
+"'Нягтлан бодох бүртгэл\\Тайлагнал\\Ерөнхий тайлагнал\\Татварууд\\Татварын "
+"Тайлан' тайланд дэлгэцэнд харуулах дэс дарааллыг тогтоох"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "Журналын бичилт тулгах"
+msgstr "Журналын Бичилт Тулгах"
 
 #. module: account
 #: view:account.account:0
@@ -65,12 +65,12 @@ msgstr "Үлдэгдэл"
 #: code:addons/account/account_bank_statement.py:368
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr "Журналын \"%s\" гэсэн зүйл зөв биү."
+msgstr "\"%s\" гэсэн журналын зүйл нь зөв биш."
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr "Өнөөдрийг хүртэлх авлагын насжилт"
+msgstr "Өнөөдрийг хүртэлх төлөгдөөгүй авлага"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -720,7 +720,7 @@ msgstr "Одоогийн валютын тохиргоо зөв хийгдээг
 #. module: account
 #: field:account.journal,profit_account_id:0
 msgid "Profit Account"
-msgstr "Орлогын данс"
+msgstr "Ашгийн Данс"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1159
diff --git a/addons/account_analytic_default/i18n/mk.po b/addons/account_analytic_default/i18n/mk.po
index 0c0f1bd63e8..c8ab7003577 100644
--- a/addons/account_analytic_default/i18n/mk.po
+++ b/addons/account_analytic_default/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-02-27 08:59+0000\n"
-"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
+"PO-Revision-Date: 2013-03-13 11:53+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:31+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -128,7 +128,7 @@ msgstr "Аналитичко конто"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Аналитичка дистрибуција"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
diff --git a/addons/account_asset/i18n/hr.po b/addons/account_asset/i18n/hr.po
index d188cc8f404..fa81b0ac93c 100644
--- a/addons/account_asset/i18n/hr.po
+++ b/addons/account_asset/i18n/hr.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-01-25 00:13+0000\n"
+"PO-Revision-Date: 2013-03-14 02:58+0000\n"
 "Last-Translator: Davor Bojkić <bole@dajmi5.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:32+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in draft and open states"
-msgstr ""
+msgstr "Imovina u stanju 'nacrt' ili 'otvoreno'"
 
 #. module: account_asset
 #: field:account.asset.category,method_end:0
@@ -105,7 +105,7 @@ msgstr "Postavi na nacrt"
 #: model:ir.model,name:account_asset.model_asset_asset_report
 #: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
 msgid "Assets Analysis"
-msgstr ""
+msgstr "Analiza Imovine"
 
 #. module: account_asset
 #: field:asset.modify,name:0
@@ -136,34 +136,34 @@ msgstr "Stavke"
 #: view:account.asset.asset:0
 #: field:account.asset.asset,depreciation_line_ids:0
 msgid "Depreciation Lines"
-msgstr ""
+msgstr "Stavke amortizacije"
 
 #. module: account_asset
 #: help:account.asset.asset,salvage_value:0
 msgid "It is the amount you plan to have that you cannot depreciate."
-msgstr ""
+msgstr "Iznos je koji planirate imati a ne možete amortizirati"
 
 #. module: account_asset
 #: help:account.asset.asset,method_period:0
 msgid "The amount of time between two depreciations, in months"
-msgstr ""
+msgstr "Vremenski period između dvije amortizacije , u mjesecima"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
 #: field:asset.asset.report,depreciation_date:0
 msgid "Depreciation Date"
-msgstr ""
+msgstr "Datum amortizacije"
 
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "Greška! Nije moguće kreirati rekurzivne stavke"
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
 msgid "Posted Amount"
-msgstr ""
+msgstr "Proknjiženi iznos"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -192,19 +192,19 @@ msgstr "Bilješke"
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_id:0
 msgid "Depreciation Entry"
-msgstr ""
+msgstr "Unos amortizacije"
 
 #. module: account_asset
 #: code:addons/account_asset/account_asset.py:82
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Greška!"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 #: field:asset.asset.report,nbr:0
 msgid "# of Depreciation Lines"
-msgstr ""
+msgstr "# stavaka amortizacije"
 
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
@@ -214,7 +214,7 @@ msgstr "Broj mjeseci u periodu"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in draft state"
-msgstr ""
+msgstr "Imovina u stavnu nacrta"
 
 #. module: account_asset
 #: field:account.asset.asset,method_end:0
@@ -227,25 +227,25 @@ msgstr "Do datuma"
 #. module: account_asset
 #: field:account.asset.asset,code:0
 msgid "Reference"
-msgstr ""
+msgstr "Veza"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Account Asset"
-msgstr ""
+msgstr "Konto imovine"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
 #: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
 msgid "Compute Assets"
-msgstr ""
+msgstr "Izračunj imovinu"
 
 #. module: account_asset
 #: field:account.asset.category,method_period:0
 #: field:account.asset.history,method_period:0
 #: field:asset.modify,method_period:0
 msgid "Period Length"
-msgstr ""
+msgstr "Trajanje perioda"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
@@ -257,12 +257,12 @@ msgstr "Nacrt"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Date of asset purchase"
-msgstr ""
+msgstr "Datum nabave imovine"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
-msgstr ""
+msgstr "Promjeni trajanje"
 
 #. module: account_asset
 #: help:account.asset.asset,method_number:0
@@ -274,7 +274,7 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
-msgstr ""
+msgstr "Analitički podaci"
 
 #. module: account_asset
 #: field:account.asset.category,account_analytic_id:0
@@ -297,19 +297,19 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.depreciation.line,remaining_value:0
 msgid "Next Period Depreciation"
-msgstr ""
+msgstr "Sljedeći period amortizacije"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
 msgid "Time in month between two depreciations"
-msgstr ""
+msgstr "Vrijeme u mjesecima između dvije amortizacije"
 
 #. module: account_asset
 #: view:asset.modify:0
 #: model:ir.actions.act_window,name:account_asset.action_asset_modify
 #: model:ir.model,name:account_asset.model_asset_modify
 msgid "Modify Asset"
-msgstr ""
+msgstr "Uredi imovinu"
 
 #. module: account_asset
 #: field:account.asset.asset,salvage_value:0
@@ -327,12 +327,12 @@ msgstr "Kategorija DI"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in closed state"
-msgstr ""
+msgstr "Imovina sa statusom 'zatvoreno'"
 
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
 msgid "Parent Asset"
-msgstr ""
+msgstr "Nadređena imovina"
 
 #. module: account_asset
 #: view:account.asset.history:0
@@ -343,40 +343,40 @@ msgstr "Povijest DI"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Search Asset Category"
-msgstr ""
+msgstr "Pretraži kategoriju imovine"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "months"
-msgstr ""
+msgstr "mjeseci"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Stavka računa"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation Board"
-msgstr ""
+msgstr "Tabla Amortizacija"
 
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
-msgstr ""
+msgstr "Neproknjiženi iznos"
 
 #. module: account_asset
 #: field:account.asset.asset,method_time:0
 #: field:account.asset.category,method_time:0
 #: field:account.asset.history,method_time:0
 msgid "Time Method"
-msgstr ""
+msgstr "Vremenska metoda"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "or"
-msgstr ""
+msgstr "ili"
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
@@ -431,7 +431,7 @@ msgstr ""
 #: field:account.asset.asset,state:0
 #: field:asset.asset.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
@@ -442,17 +442,17 @@ msgstr "Partner"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Posted depreciation lines"
-msgstr ""
+msgstr "Proknjižene stavke amortizacije"
 
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
 msgid "Children Assets"
-msgstr ""
+msgstr "Podređena imovina"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Date of depreciation"
-msgstr ""
+msgstr "Datum amortizacije"
 
 #. module: account_asset
 #: field:account.asset.history,user_id:0
@@ -467,18 +467,18 @@ msgstr "Konto sredstva"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Prošireni filteri..."
 
 #. module: account_asset
 #: view:account.asset.asset:0
 #: view:asset.depreciation.confirmation.wizard:0
 msgid "Compute"
-msgstr ""
+msgstr "Izračunaj"
 
 #. module: account_asset
 #: view:account.asset.history:0
 msgid "Asset History"
-msgstr ""
+msgstr "Povijest imovine"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
@@ -493,12 +493,12 @@ msgstr "Aktivno"
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
 msgid "State of Asset"
-msgstr ""
+msgstr "Stanje imovine"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,name:0
 msgid "Depreciation Name"
-msgstr ""
+msgstr "Naziv amortizacije"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -509,7 +509,7 @@ msgstr "Povijest"
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
 msgid "Compute Asset"
-msgstr ""
+msgstr "Izračunaj imovinu"
 
 #. module: account_asset
 #: field:asset.depreciation.confirmation.wizard,period_id:0
@@ -519,7 +519,7 @@ msgstr "Razdoblje"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "General"
-msgstr ""
+msgstr "Općenito"
 
 #. module: account_asset
 #: field:account.asset.asset,prorata:0
@@ -535,7 +535,7 @@ msgstr "Račun"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Set to Close"
-msgstr ""
+msgstr "Postavi na Zatvoreno"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
@@ -552,7 +552,7 @@ msgstr "Zatvori"
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Stavke dnevnika"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -564,7 +564,7 @@ msgstr ""
 #: view:asset.asset.report:0
 #: field:asset.asset.report,purchase_date:0
 msgid "Purchase Date"
-msgstr ""
+msgstr "Datum nabave"
 
 #. module: account_asset
 #: selection:account.asset.asset,method:0
@@ -582,7 +582,7 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Current"
-msgstr ""
+msgstr "Trenutno"
 
 #. module: account_asset
 #: code:addons/account_asset/account_asset.py:82
@@ -593,32 +593,32 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Depreciation Method"
-msgstr ""
+msgstr "Metoda amortizacije"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,amount:0
 msgid "Current Depreciation"
-msgstr ""
+msgstr "Trenutna amortizacija"
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
 msgid "Asset Name"
-msgstr ""
+msgstr "Naziv imovine"
 
 #. module: account_asset
 #: field:account.asset.category,open_asset:0
 msgid "Skip Draft State"
-msgstr ""
+msgstr "Preskoči stanje nacrta"
 
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Depreciation Dates"
-msgstr ""
+msgstr "Datumi amortizacije"
 
 #. module: account_asset
 #: field:account.asset.asset,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account_asset
 #: field:account.asset.category,journal_id:0
@@ -633,7 +633,7 @@ msgstr "Naziv"
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciated_value:0
 msgid "Amount Already Depreciated"
-msgstr ""
+msgstr "Iznos je već amortiziran"
 
 #. module: account_asset
 #: help:account.asset.asset,method:0
@@ -649,7 +649,7 @@ msgstr ""
 #: view:asset.asset.report:0
 #: field:asset.asset.report,move_check:0
 msgid "Posted"
-msgstr ""
+msgstr "Proknjiženo"
 
 #. module: account_asset
 #: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
@@ -672,7 +672,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: account_asset
 #: help:account.asset.category,open_asset:0
@@ -684,12 +684,12 @@ msgstr ""
 #. module: account_asset
 #: field:asset.asset.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
 msgid "Asset depreciation line"
-msgstr ""
+msgstr "Stavka amortizacije imovine"
 
 #. module: account_asset
 #: view:account.asset.category:0
@@ -702,18 +702,18 @@ msgstr "Kategorija DI"
 #: view:asset.asset.report:0
 #: field:asset.asset.report,depreciation_value:0
 msgid "Amount of Depreciation Lines"
-msgstr ""
+msgstr "Iznos stavaka amortizacije"
 
 #. module: account_asset
 #: code:addons/account_asset/wizard/wizard_asset_compute.py:49
 #, python-format
 msgid "Created Asset Moves"
-msgstr ""
+msgstr "Stvorena knjiženja imovine"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Add an internal note here..."
-msgstr ""
+msgstr "Dodaj internu bilješku ovdje..."
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0
@@ -723,7 +723,7 @@ msgstr "Brojčana serija"
 #. module: account_asset
 #: help:account.asset.category,method_period:0
 msgid "State here the time between 2 depreciations, in months"
-msgstr ""
+msgstr "Ovdje navedite vrijeme izmežu dvije amortizacije, u mjesecima"
 
 #. module: account_asset
 #: field:account.asset.history,date:0
@@ -739,7 +739,7 @@ msgstr "Datum"
 #: selection:account.asset.history,method_time:0
 #: field:asset.modify,method_number:0
 msgid "Number of Depreciations"
-msgstr ""
+msgstr "Broj amortizacija"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/mn.po b/addons/account_asset/i18n/mn.po
index 1156ed7e171..2ce5e76bd61 100644
--- a/addons/account_asset/i18n/mn.po
+++ b/addons/account_asset/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-02-15 15:53+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 10:05+0000\n"
+"Last-Translator: wsubuntu <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:32+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -200,7 +200,7 @@ msgstr "Элэгдлийн Бичилт"
 #: code:addons/account_asset/account_asset.py:82
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Алдаа!"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -608,7 +608,7 @@ msgstr "Одоогийн"
 #: code:addons/account_asset/account_asset.py:82
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
-msgstr ""
+msgstr "Элэгдэл бодогдсон хөрөнгүүдийг устгах боломжгүй."
 
 #. module: account_asset
 #: view:account.asset.category:0
@@ -743,7 +743,7 @@ msgstr "Үүсгэгдсэн Хөрөнгийн Хөдөлгөөнүүд"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Add an internal note here..."
-msgstr ""
+msgstr "Дотоод тэмдэглэлийг энд бичиж болдог."
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0
diff --git a/addons/account_budget/i18n/mk.po b/addons/account_budget/i18n/mk.po
index 61701895949..ed30b553747 100644
--- a/addons/account_budget/i18n/mk.po
+++ b/addons/account_budget/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-11 11:18+0000\n"
+"PO-Revision-Date: 2013-03-13 08:18+0000\n"
 "Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-12 05:18+0000\n"
-"X-Generator: Launchpad (build 16524)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -185,7 +185,7 @@ msgstr "Завршено"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "Реален износ"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -193,7 +193,7 @@ msgstr ""
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 msgid "Practical Amount"
-msgstr ""
+msgstr "Реален износ"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
diff --git a/addons/account_budget/i18n/mn.po b/addons/account_budget/i18n/mn.po
index ccb9b2e7139..8a199e9a519 100644
--- a/addons/account_budget/i18n/mn.po
+++ b/addons/account_budget/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-02 10:01+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 10:09+0000\n"
+"Last-Translator: wsubuntu <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:32+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -344,7 +344,7 @@ msgstr "эсвэл"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Cancel Budget"
-msgstr ""
+msgstr "Төсөв Цуцлах"
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/account_cancel/i18n/mn.po b/addons/account_cancel/i18n/mn.po
index 295fee75b7a..786180cbd58 100644
--- a/addons/account_cancel/i18n/mn.po
+++ b/addons/account_cancel/i18n/mn.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-03-13 10:08+0000\n"
+"Last-Translator: wsubuntu <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:32+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл Цуцлах"
 
 #~ msgid "Cancel"
 #~ msgstr "Цуцлах"
diff --git a/addons/account_followup/i18n/sl.po b/addons/account_followup/i18n/sl.po
index aaf97c8d6be..6ca4f0e8703 100644
--- a/addons/account_followup/i18n/sl.po
+++ b/addons/account_followup/i18n/sl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-02-07 01:14+0000\n"
+"PO-Revision-Date: 2013-03-13 14:10+0000\n"
 "Last-Translator: Dušan Laznik (Mentis) <laznik@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:33+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -106,7 +106,7 @@ msgstr "Koraki iztrjave"
 #: code:addons/account_followup/account_followup.py:262
 #, python-format
 msgid "Due Date"
-msgstr ""
+msgstr "Datum zapadlosti"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
@@ -119,7 +119,7 @@ msgstr "Pošlji opomine"
 #: code:addons/account_followup/report/account_followup_print.py:86
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Napaka!"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -240,7 +240,7 @@ msgstr ""
 #: code:addons/account_followup/account_followup.py:261
 #, python-format
 msgid "Reference"
-msgstr ""
+msgstr "Sklic"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
diff --git a/addons/account_voucher/i18n/mk.po b/addons/account_voucher/i18n/mk.po
index 835e11a087d..998dc2c9b36 100644
--- a/addons/account_voucher/i18n/mk.po
+++ b/addons/account_voucher/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-02 10:13+0000\n"
-"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
+"PO-Revision-Date: 2013-03-13 11:54+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:34+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 "Language: mk\n"
 
 #. module: account_voucher
@@ -145,7 +145,7 @@ msgstr ""
 #. module: account_voucher
 #: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
 msgid "Status changed"
-msgstr ""
+msgstr "Статусот е променет"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -258,7 +258,7 @@ msgstr "Опции за плаќање"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "e.g. 003/10"
-msgstr ""
+msgstr "на пр. 003/10"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -378,7 +378,7 @@ msgstr "Импортирај фактури"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "e.g. Invoice SAJ/0042"
-msgstr ""
+msgstr "на пр. Фактура SAJ/0042"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1112
@@ -419,7 +419,7 @@ msgstr "Линии за продажба"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Cancel Voucher"
-msgstr ""
+msgstr "Откажи го ваучерот"
 
 #. module: account_voucher
 #: view:account.voucher:0
diff --git a/addons/analytic/i18n/mk.po b/addons/analytic/i18n/mk.po
index 5dc7417eda5..1056d3c58e8 100644
--- a/addons/analytic/i18n/mk.po
+++ b/addons/analytic/i18n/mk.po
@@ -10,14 +10,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: OpenERP Macedonian <openerp-i18n-"
 "macedonian@lists.launchpad.net>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-04 14:38+0000\n"
+"PO-Revision-Date: 2013-03-13 11:50+0000\n"
 "Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: ESKON Inzenering\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:34+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 "Language: mk\n"
 
 #. module: analytic
@@ -39,7 +39,7 @@ msgstr "Договор: "
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_pending
 msgid "Contract pending"
-msgstr ""
+msgstr "Договор во очекување"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -148,7 +148,7 @@ msgstr "Опис"
 #: code:addons/analytic/analytic.py:262
 #, python-format
 msgid "Quick account creation disallowed."
-msgstr ""
+msgstr "Брзо креирање на сметка не е дозволено"
 
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
@@ -347,7 +347,7 @@ msgstr "Биланс"
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
 msgid "Full Name"
-msgstr ""
+msgstr "Цело име"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -379,7 +379,7 @@ msgstr "Грешка!"
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_closed
 msgid "Contract closed"
-msgstr ""
+msgstr "Договорот е затворен"
 
 #. module: analytic
 #: model:res.groups,name:analytic.group_analytic_accounting
@@ -407,13 +407,13 @@ msgstr "Валута"
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_opened
 msgid "Contract opened"
-msgstr ""
+msgstr "Договорот е отворен"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:262
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Внимание"
 
 #. module: analytic
 #: field:account.analytic.account,type:0
diff --git a/addons/analytic_contract_hr_expense/i18n/mk.po b/addons/analytic_contract_hr_expense/i18n/mk.po
index 2a9ce300473..903134d5ee0 100644
--- a/addons/analytic_contract_hr_expense/i18n/mk.po
+++ b/addons/analytic_contract_hr_expense/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-01 14:17+0000\n"
-"Last-Translator: Софче Димитријева <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 08:05+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:34+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -41,7 +41,7 @@ msgstr "Аналитичко конто"
 #: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
 #, python-format
 msgid "Expenses to Invoice of %s"
-msgstr ""
+msgstr "Трошоци за фактурирање од %s"
 
 #. module: analytic_contract_hr_expense
 #: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
@@ -64,7 +64,7 @@ msgstr "Проценка на трошоци за фактурирање"
 #. module: analytic_contract_hr_expense
 #: field:account.analytic.account,charge_expenses:0
 msgid "Charge Expenses"
-msgstr ""
+msgstr "Наплати трошоци"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
diff --git a/addons/analytic_user_function/i18n/mk.po b/addons/analytic_user_function/i18n/mk.po
index d0931881cad..8b47b750a7c 100644
--- a/addons/analytic_user_function/i18n/mk.po
+++ b/addons/analytic_user_function/i18n/mk.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-07 14:34+0000\n"
-"Last-Translator: Софче Димитријева <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 08:07+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:34+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Аналитичка ставка"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
diff --git a/addons/auth_ldap/i18n/mk.po b/addons/auth_ldap/i18n/mk.po
index 2b4b835106d..8e9da1e92c9 100644
--- a/addons/auth_ldap/i18n/mk.po
+++ b/addons/auth_ldap/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-11 11:20+0000\n"
+"PO-Revision-Date: 2013-03-13 08:22+0000\n"
 "Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-12 05:18+0000\n"
-"X-Generator: Launchpad (build 16524)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
@@ -42,7 +42,7 @@ msgstr "LDAP конфигурација"
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_binddn:0
 msgid "LDAP binddn"
-msgstr ""
+msgstr "LDAP спојување"
 
 #. module: auth_ldap
 #: field:res.company.ldap,company:0
@@ -91,7 +91,7 @@ msgstr "Компании"
 #. module: auth_ldap
 #: view:res.company.ldap:0
 msgid "Process Parameter"
-msgstr ""
+msgstr "Параметар за процесот"
 
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_company_ldap
@@ -101,7 +101,7 @@ msgstr "res.company.ldap"
 #. module: auth_ldap
 #: help:res.company.ldap,user:0
 msgid "User to copy when creating new users"
-msgstr ""
+msgstr "Корисник за копирање при креирање на нови корисници"
 
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_tls:0
@@ -140,6 +140,8 @@ msgid ""
 "The password of the user account on the LDAP server that is used to query "
 "the directory."
 msgstr ""
+"Лозинката на корисничката сметка на LDAP серверот што се користи за "
+"пребарување на директориумот."
 
 #. module: auth_ldap
 #: help:res.company.ldap,ldap_binddn:0
@@ -147,6 +149,8 @@ msgid ""
 "The user account on the LDAP server that is used to query the directory. "
 "Leave empty to connect anonymously."
 msgstr ""
+"Корисничката сметка на LDAP серверот што се користи за пребарување на "
+"директориумот. За анонимно поврзување, оставете празно."
 
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_users
diff --git a/addons/auth_openid/i18n/mk.po b/addons/auth_openid/i18n/mk.po
index 0f91ea81412..ca4c1b55e21 100644
--- a/addons/auth_openid/i18n/mk.po
+++ b/addons/auth_openid/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-02-28 15:03+0000\n"
-"Last-Translator: Софче Димитријева <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 11:47+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:35+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: auth_openid
 #. openerp-web
@@ -58,7 +58,7 @@ msgstr "Launchpad"
 #. module: auth_openid
 #: help:res.users,openid_email:0
 msgid "Used for disambiguation in case of a shared OpenID URL"
-msgstr ""
+msgstr "Се користи за појаснување во случај на заедничка OpenID адреса"
 
 #. module: auth_openid
 #. openerp-web
@@ -89,7 +89,7 @@ msgstr "Лозинка"
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:10
 #, python-format
 msgid "Google Apps"
-msgstr ""
+msgstr "Google Apps"
 
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
diff --git a/addons/auth_signup/i18n/mk.po b/addons/auth_signup/i18n/mk.po
index 34521937f4e..b4a4d916909 100644
--- a/addons/auth_signup/i18n/mk.po
+++ b/addons/auth_signup/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-02-26 19:07+0000\n"
-"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
+"PO-Revision-Date: 2013-03-13 08:11+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: ESKON-INZENERING <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:35+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 "Language: mk\n"
 
 #. module: auth_signup
@@ -167,6 +167,35 @@ msgid ""
 "                \n"
 "            "
 msgstr ""
+"\n"
+"                \n"
+"                    <p>\n"
+"                        ${object.name},\n"
+"                    </p>\n"
+"                    <p>\n"
+"                        Поканети сте да се поврзете на "
+"\"${object.company_id.name}\" за да добиете пристап до вашите документи во "
+"OpenERP.\n"
+"                    </p>\n"
+"                    <p>\n"
+"                        За да ја прифатите пораката, кликнете на следниот "
+"линк:\n"
+"                    </p>\n"
+"                    <ul>\n"
+"                        <li><a href=\"${object.signup_url}\">Прифати ја "
+"поканата за \"${object.company_id.name}\"</a></li>\n"
+"                    </ul>\n"
+"                    <p>\n"
+"                        Ви Благодариме,\n"
+"                    </p>\n"
+"                    <pre>\n"
+"--\n"
+"${object.company_id.name or ''}\n"
+"${object.company_id.email or ''}\n"
+"${object.company_id.phone or ''}\n"
+"                    </pre>\n"
+"                \n"
+"            "
 
 #. module: auth_signup
 #. openerp-web
@@ -195,7 +224,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:174
 #, python-format
 msgid "An email has been sent with credentials to reset your password"
-msgstr ""
+msgstr "Пратен е e-mail со креденции за ресетирање на вашата лозинка"
 
 #. module: auth_signup
 #. openerp-web
@@ -297,7 +326,7 @@ msgstr "Дозволи ресетирање на лозинка од стран
 #. module: auth_signup
 #: model:email.template,subject:auth_signup.set_password_email
 msgid "${object.company_id.name} invitation to connect on OpenERP"
-msgstr ""
+msgstr "${object.company_id.name} покана за поврзување на OpenERP"
 
 #. module: auth_signup
 #. openerp-web
@@ -314,7 +343,7 @@ msgstr "Партнер"
 #. module: auth_signup
 #: view:res.users:0
 msgid "Send reset password instructions by email"
-msgstr ""
+msgstr "Инструкциите за ресетирање на лозинка испрати ги на e-mail"
 
 #. module: auth_signup
 #: field:res.partner,signup_token:0
diff --git a/addons/base_action_rule/i18n/mk.po b/addons/base_action_rule/i18n/mk.po
index 3e183d08e50..cfd25fb023a 100644
--- a/addons/base_action_rule/i18n/mk.po
+++ b/addons/base_action_rule/i18n/mk.po
@@ -9,15 +9,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: OpenERP Macedonian <openerp-i18n-"
 "macedonian@lists.launchpad.net >\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-02 16:57+0000\n"
-"Last-Translator: Софче Димитријева <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 12:20+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: OpenERP Macedonia <openerp-i18n-"
 "macedonian@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:35+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 "Language: mk\n"
 
 #. module: base_action_rule
@@ -255,7 +255,7 @@ msgstr "Минути"
 #. module: base_action_rule
 #: field:base.action.rule,model_id:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Поврзан модел на документ"
 
 #. module: base_action_rule
 #: help:base.action.rule,filter_pre_id:0
@@ -314,9 +314,9 @@ msgstr "Датум на активирање"
 #: view:base.action.rule:0
 #: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
-msgstr ""
+msgstr "Дејства на серверот"
 
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,name:0
 msgid "Subject"
-msgstr ""
+msgstr "Тема"
diff --git a/addons/base_iban/i18n/mk.po b/addons/base_iban/i18n/mk.po
index dba2e1c4247..35170482b1b 100644
--- a/addons/base_iban/i18n/mk.po
+++ b/addons/base_iban/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-08 15:35+0000\n"
+"PO-Revision-Date: 2013-03-13 08:00+0000\n"
 "Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-09 05:38+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
@@ -52,7 +52,7 @@ msgstr "zip"
 #. module: base_iban
 #: help:res.partner.bank,iban:0
 msgid "International Bank Account Number"
-msgstr ""
+msgstr "Интернационален број на банкарска сметка"
 
 #. module: base_iban
 #: model:ir.model,name:base_iban.model_res_partner_bank
diff --git a/addons/base_report_designer/i18n/mk.po b/addons/base_report_designer/i18n/mk.po
index 87123d83cfd..76143dbbbe7 100644
--- a/addons/base_report_designer/i18n/mk.po
+++ b/addons/base_report_designer/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-06 13:46+0000\n"
-"Last-Translator: Софче Димитријева <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 11:42+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:36+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -33,6 +33,8 @@ msgid ""
 "This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
 "Writer."
 msgstr ""
+"Овој додаток овозможува креирање/модифицирање на OpenERP извештаи во "
+"OpenOffice."
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -89,7 +91,7 @@ msgstr "Име на датотеката"
 #: view:base.report.file.sxw:0
 #: view:base.report.sxw:0
 msgid "Get a report"
-msgstr ""
+msgstr "Земи извештај"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
@@ -113,6 +115,8 @@ msgid ""
 "OpenObject Report Designer plug-in file. Save as this file and install this "
 "plug-in in OpenOffice."
 msgstr ""
+"Датотека за додатокот OpenObject Report Designer. Зачувајте ја оваа датотека "
+"и инсталирајте го додатокот во OpenOffice."
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
@@ -153,7 +157,7 @@ msgstr ""
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
 msgid "Base Report sxw"
-msgstr ""
+msgstr "Основен извештај sxw"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_file_sxw
@@ -163,7 +167,7 @@ msgstr "base.report.file.sxw"
 #. module: base_report_designer
 #: field:base_report_designer.installer,plugin_file:0
 msgid "OpenObject Report Designer Plug-in"
-msgstr ""
+msgstr "OpenObject Report Designer додаток"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
diff --git a/addons/base_status/i18n/mk.po b/addons/base_status/i18n/mk.po
index ba0de1fef60..7ace73f2453 100644
--- a/addons/base_status/i18n/mk.po
+++ b/addons/base_status/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-07 11:56+0000\n"
+"PO-Revision-Date: 2013-03-13 08:04+0000\n"
 "Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:37+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -48,6 +48,8 @@ msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
 msgstr ""
+"Неможе да ескалирате, веќе сте на највисокото ниво со оглед на категоријата "
+"на вашиот продажбен тим."
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:193
@@ -68,6 +70,8 @@ msgid ""
 "You are already at the top level of your sales-team category.\n"
 "Therefore you cannot escalate furthermore."
 msgstr ""
+"Веќе сте на највисокото ниво на вашиот продажбен тим.\n"
+"Значи понатамошно ескалирање не е можно."
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:181
diff --git a/addons/base_vat/i18n/mk.po b/addons/base_vat/i18n/mk.po
index f753e87c176..86f91290c1b 100644
--- a/addons/base_vat/i18n/mk.po
+++ b/addons/base_vat/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-02-27 09:32+0000\n"
-"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
+"PO-Revision-Date: 2013-03-13 08:07+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:37+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: base_vat
 #: view:res.partner:0
@@ -51,7 +51,7 @@ msgstr "Грешка!"
 #. module: base_vat
 #: view:res.partner:0
 msgid "e.g. BE0477472701"
-msgstr ""
+msgstr "на пр. BE0477472701"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po
index 4bf53ca7404..77228dd2d27 100644
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/i18n/hu.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-03-12 18:01+0000\n"
+"PO-Revision-Date: 2013-03-13 16:12+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-13 04:58+0000\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: crm
@@ -103,7 +103,7 @@ msgstr "Szakasz neve"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Értékesítő"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
@@ -120,33 +120,33 @@ msgstr "Nap"
 #. module: crm
 #: view:crm.lead:0
 msgid "Company Name"
-msgstr ""
+msgstr "Cég neve"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Training"
-msgstr ""
+msgstr "Képzés"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Sales Tags"
-msgstr ""
+msgstr "Értékesítési címkék"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Exp. Closing"
-msgstr ""
+msgstr "Várh. zárás"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Cancel Call"
-msgstr ""
+msgstr "Hívás visszavonása"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "Létrehozás dátuma"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -157,7 +157,7 @@ msgstr "Előírás neve"
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "It's only possible to convert one phonecall at a time."
-msgstr ""
+msgstr "Egyszerre csak egy telefonhívást tud átalakítani."
 
 #. module: crm
 #: view:crm.case.resource.type:0
@@ -177,7 +177,7 @@ msgstr "Lehetőségek keresése"
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr ""
+msgstr "Zárás várható hónapja"
 
 #. module: crm
 #: help:crm.case.section,message_summary:0
@@ -187,6 +187,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"A chettelés összegzést megállítja (üzenetek száma,...). Ez az összegzés "
+"direkt HTML formátumú ahhoz hogy beilleszthető legyen a kanban nézetekbe."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:624
@@ -227,7 +229,7 @@ msgstr "Telefonhívás"
 #. module: crm
 #: field:crm.lead,opt_out:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Kilép"
 
 #. module: crm
 #: view:crm.lead:0
@@ -237,12 +239,12 @@ msgstr ""
 #. module: crm
 #: field:res.partner,meeting_count:0
 msgid "# Meetings"
-msgstr ""
+msgstr "# Találkozók"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
 msgid "Reminder to User"
-msgstr ""
+msgstr "Emlékeztő a felhasználónak"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -252,17 +254,17 @@ msgstr "Kritériumok"
 #. module: crm
 #: view:crm.lead:0
 msgid "Assigned to My Team(s)"
-msgstr ""
+msgstr "A csoportomhoz/csoportjaimhoz csatolt"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
-msgstr ""
+msgstr "Kizárt válaszok:"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge opportunities"
-msgstr ""
+msgstr "Lehetőségek öszzefésülése"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -296,6 +298,8 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
+"Ha a kilépés be van jelölve, akkor ez a kapcsolat  visszautasította az e-"
+"maileket vagy leiratkozott egy kampányról."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -306,7 +310,7 @@ msgstr "Leendő partner"
 #: code:addons/crm/crm_lead.py:982
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Nincs tárgy"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
@@ -319,6 +323,8 @@ msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
 msgstr ""
+"A partner kategóriák, melyek hozzá lesznek adva a kiosztási kritérium "
+"szerinti partnerekhez a futtatás után."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -333,6 +339,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson új vevő kiosztás meghatározásához.\n"
+"              </p><p>\n"
+"                Egyedi kategória meghatározása amit hozzá tud rendelni a\n"
+"                kapcsolataihoz a jobb kölcsönhatás biztosítására. A "
+"kiosztási\n"
+"                eszköz lehetővé teszi a kategóriák kapcsolatokhoz "
+"rendelését\n"
+"                a beállított kritériuma alapján.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,contact_name:0
@@ -352,7 +369,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Találkozó lehetőség"
 
 #. module: crm
 #: help:crm.lead.report,delay_close:0
@@ -387,12 +404,29 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson ehhez a kapcsolathoz egy lehetőség "
+"létrehozásához.\n"
+"              </p><p>\n"
+"                Használja a lehetőségeket az értékesítési folyamatainak "
+"nyomon követéséhez,\n"
+"                kövesse nyomon a potenciális üzleteket és jelezze jobban "
+"előre a jövőbeni bevételeit.\n"
+"              </p><p>\n"
+"                Lehetősége lesz találkozókat és telefon hívásokat tervezni a "
+"\n"
+"                lehetőségekből, átalakíthatja azokat árajánlatokká, "
+"hozzáfűzheti az\n"
+"                idevonatkozó dokumentumokat, nyomon követheti a "
+"beszélgetéseket, és még sok minden más.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead7
 #: view:crm.lead:0
 msgid "Dead"
-msgstr ""
+msgstr "Sikertelen"
 
 #. module: crm
 #: field:crm.case.section,message_unread:0
@@ -400,21 +434,21 @@ msgstr ""
 #: field:crm.lead,message_unread:0
 #: field:crm.phonecall,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olvasatlan üzenetek"
 
 #. module: crm
 #: view:crm.segmentation:0
 #: field:crm.segmentation.line,segmentation_id:0
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
 msgid "Segmentation"
-msgstr "Szegmentálás"
+msgstr "Kiosztás"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
-msgstr ""
+msgstr "Összekapcsolás egy meglévő vevőhöz"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -430,7 +464,7 @@ msgstr "Csoportvezető"
 #: code:addons/crm/crm_lead.py:1032
 #, python-format
 msgid "%s a call for %s.%s"
-msgstr ""
+msgstr "%s egy hívás ide %s.%s"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -466,7 +500,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "Partner kapcsolati Email"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -480,6 +514,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy új értékesítési csoport meghatározásához.\n"
+"              </p><p>\n"
+"                Használja az értékesítési csoportokat a különböző "
+"értékesítők vagy \n"
+"                osztályok különálló csoportokba szervezéséhez. Mindegyik "
+"csoport\n"
+"                a saját lehetőség listáin dolgozik.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -493,7 +537,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Állapot"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -508,7 +552,7 @@ msgstr "Beállítás"
 #. module: crm
 #: view:crm.lead:0
 msgid "Escalate"
-msgstr ""
+msgstr "Fokozat"
 
 #. module: crm
 #: view:crm.lead:0
@@ -518,7 +562,7 @@ msgstr "Levelezések"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "Szakasz megváltozott"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -541,7 +585,7 @@ msgstr "Tervezett jövedelem"
 #: code:addons/crm/crm_lead.py:970
 #, python-format
 msgid "Customer Email"
-msgstr ""
+msgstr "Vevői e-mail"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
@@ -558,7 +602,7 @@ msgstr "Október"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Included Answers :"
-msgstr ""
+msgstr "Tartalmazott válaszok :"
 
 #. module: crm
 #: help:crm.phonecall,state:0
@@ -580,7 +624,7 @@ msgstr "Összegzés"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge"
-msgstr ""
+msgstr "Egyesít"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -590,7 +634,7 @@ msgstr "Eset kategória"
 #. module: crm
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "Partner kapcsolattartó neve"
 
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
@@ -627,14 +671,14 @@ msgstr "Az értékesítési csapat kódjának egyedinek kell lennie !"
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "Email address of the contact"
-msgstr ""
+msgstr "A kapcsolat email címei"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
 #: selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Folyamatban"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
@@ -648,6 +692,14 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Kattintson új kategória hozzáadásához.\n"
+"          </p><p>\n"
+"            Sajátos telefon hívás kategóriát hoz létre a telefonhívás "
+"típusok jobb \n"
+"            meghatározásához a rendszerben való nyomonkövetéshez.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -659,7 +711,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Létrehozás hónapja"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -670,7 +722,7 @@ msgstr "Munkaidő"
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr ""
+msgstr "Partner kiosztási sorok"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -687,12 +739,12 @@ msgstr "Érdeklődők űrlapja"
 #: view:crm.segmentation:0
 #: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr ""
+msgstr "Partner kiosztás"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Pénznem"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -702,12 +754,12 @@ msgstr "Várható bevétel"
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "Létrehozás hónapja"
 
 #. module: crm
 #: help:crm.segmentation,name:0
 msgid "The name of the segmentation."
-msgstr ""
+msgstr "A kiosztás neve."
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_usa_lead
@@ -718,6 +770,7 @@ msgstr "Érdeklődés USA-ból"
 #: sql_constraint:crm.lead:0
 msgid "The probability of closing the deal should be between 0% and 100%!"
 msgstr ""
+"Az üzlet létrejöttének a lehetősége 0% és 100% közöttinek kell lennie!"
 
 #. module: crm
 #: view:crm.lead:0
@@ -746,17 +799,17 @@ msgstr "Lehetőség"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
-msgstr ""
+msgstr "Televízió"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "Átalakít lehetőséggé"
 
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -766,7 +819,7 @@ msgstr "Folyamat megállítása"
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Álnév"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -800,12 +853,12 @@ msgstr "Kizárólagos"
 #: code:addons/crm/crm_lead.py:584
 #, python-format
 msgid "From %s : %s"
-msgstr ""
+msgstr "Ettől %s : %s"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert to Opportunities"
-msgstr ""
+msgstr "Átalakít lehetőséggé"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -814,7 +867,7 @@ msgstr ""
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
-msgstr ""
+msgstr "vagy"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -833,6 +886,8 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Kapcsolat a szakaaszok és az értékesítő csoportok között. Ha beállított, ez "
+"lehatárolja a jelenlegi szakaszra a kiválasztott értékesítési csoportot."
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -848,7 +903,7 @@ msgstr "Irányítószám"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "Még ki nem osztott telefonhívások"
 
 #. module: crm
 #: view:crm.lead:0
@@ -871,12 +926,12 @@ msgstr "Partner kategória"
 #. module: crm
 #: field:crm.lead,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Siker mértéke  (%)"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
 msgid "Use The Sales Purchase Rules"
-msgstr ""
+msgstr "Használja a beszerzési szabályt"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -891,7 +946,7 @@ msgstr "Érdeklődés ami hozzám lett rendelve"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Megnyertnek jelölje"
 
 #. module: crm
 #: field:crm.case.stage,probability:0
@@ -901,7 +956,7 @@ msgstr "Valószínűség (%)"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "Elveszítettnek jelölje"
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_draft_lead
@@ -918,7 +973,7 @@ msgstr "Március"
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Email"
-msgstr ""
+msgstr "E-mail küldése"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:89
@@ -931,7 +986,7 @@ msgstr "Vigyázat !"
 #: help:crm.lead,message_unread:0
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Ha be van jelölve, akkor figyelje az új üzeneteket."
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -941,7 +996,7 @@ msgstr "Megnyitásig hátralévő napok"
 #. module: crm
 #: view:crm.lead:0
 msgid "ZIP"
-msgstr ""
+msgstr "Irányítószám"
 
 #. module: crm
 #: field:crm.lead,mobile:0
@@ -957,7 +1012,7 @@ msgstr "Hivatkozás"
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
 msgid "Used to compute open days"
-msgstr ""
+msgstr "A szabad napok számolására használt"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new
@@ -990,12 +1045,12 @@ msgstr "Tervezet"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr ""
+msgstr "Partner kiosztás"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "Csak a lehetőségek mutatása"
 
 #. module: crm
 #: field:crm.lead,name:0
@@ -1005,7 +1060,7 @@ msgstr "Tárgy"
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "Értékesítési csoport mutatása"
 
 #. module: crm
 #: help:sale.config.settings,module_crm_claim:0
@@ -1018,12 +1073,12 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_lead6
 #: view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "Megnyert"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Túllépett határidő"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
@@ -1041,7 +1096,7 @@ msgstr "Típus"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Compute Segmentation"
-msgstr ""
+msgstr "Kiosztás számítása"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1073,7 +1128,7 @@ msgstr "Vásárlási összeg"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr ""
+msgstr "Hívás éve"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1092,7 +1147,7 @@ msgstr "Szakasz"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone Calls that are assigned to me"
-msgstr ""
+msgstr "Részemre kiosztott telefonhívások"
 
 #. module: crm
 #: field:crm.lead,user_login:0
@@ -1102,12 +1157,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "No salesperson"
-msgstr ""
+msgstr "Nincs értékesítő"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr ""
+msgstr "Függőben lévő telefonhívások"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1129,22 +1184,22 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Delete"
-msgstr ""
+msgstr "Törlés"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
 msgid "Opportunity created"
-msgstr ""
+msgstr "Lehetőség létrehozva"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
-msgstr ""
+msgstr "í"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Description..."
-msgstr ""
+msgstr "Leírás..."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1168,6 +1223,21 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Kattintson új lehetőség létrehozásához.\n"
+"          </p><p>\n"
+"          OpenERP segít az értékesítési folyamat nyomon követésében a\n"
+"          lehetséges értékesítések követésében és a jobb jövőbeni "
+"bevételeinek\n"
+"          előrejelzésében.\n"
+"          </p><p>\n"
+"          Lehetősége lesz találkozók, telefonhívások tervezésére a \n"
+"          lehetőségekből, azok átalakítására árajánlatokká, hozzáfűzni az "
+"ide\n"
+"          vonatkozó dokumentumokat, beszélgetések nyomon követésére, és még "
+"sok másra.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1189,7 +1259,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_payment_mode_act
 msgid "Payment Modes"
-msgstr ""
+msgstr "Fizetési módok"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
@@ -1205,12 +1275,12 @@ msgstr "Időtartam percben"
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
-msgstr ""
+msgstr "Csatorna neve"
 
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "Várható határidő"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1218,6 +1288,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
 msgstr ""
+"Ha az aktív mező igazra van állítva, akkor lehetővé teszi az értékesítő "
+"csoport eltüntetését annak elvétele nélkül."
 
 #. module: crm
 #: help:crm.case.stage,case_default:0
@@ -1225,6 +1297,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Ha bejelölte ezt a mezőt, ez a szakasz lesz javasolva alapértelmezetten az "
+"összes értékesítő csoportnak. Meglévő csoportokhoz nem lesz hozzárendelve."
 
 #. module: crm
 #: help:crm.case.stage,type:0
@@ -1232,12 +1306,15 @@ msgid ""
 "This field is used to distinguish stages related to Leads from stages "
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
+"Ez a mező az érdeklődéssel kapcsolatos szakaszokat különbözteti meg a  "
+"lehetőséggel kapcsolatos szakaszoktól, vagy meghatározza azokat a "
+"szakaszokat, melyek mindkét típushoz hozzátartoznak."
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_create
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead
 msgid "Lead Created"
-msgstr ""
+msgstr "Érdeklődés létrehozva"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1245,6 +1322,8 @@ msgid ""
 "Check if you want to use this tab as part of the segmentation rule. If not "
 "checked, the criteria beneath will be ignored"
 msgstr ""
+"Jelölje ki, ha ezt a fület használni akarja a kijelölési szabály részeként. "
+"Ha nincs bejelölve, a kritérium alá eső rész figyelmen kívül lesz hagyva."
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1254,7 +1333,7 @@ msgstr "Végrehajtási állapot"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "Hívások naplózása"
 
 #. module: crm
 #: field:crm.lead,day_close:0
@@ -1271,7 +1350,7 @@ msgstr "Ismeretlen"
 #: field:crm.lead,message_is_follower:0
 #: field:crm.phonecall,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Ez egy követő"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1284,7 +1363,7 @@ msgstr "Dátum"
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
-msgstr ""
+msgstr "Online támogatás"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1310,23 +1389,29 @@ msgid ""
 "set to 'Done'. If the case needs to be reviewed then the Status is  set to "
 "'Pending'."
 msgstr ""
+"Az állapota be lesz állítva mint 'Terv', amikor az ügyet létrehozza. Ha az "
+"ügy feldolgozás alatt van akkor annak állapota be lesz állítva mint "
+"'Nyitott'. Ha az ügy teljesítve lett, az állapota 'Elvégezve' lesz. Ha az "
+"ügyet át kell nézni akkor annak állapota 'Függőben' lesz.."
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_1
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "Értékesítési kereskedelmi osztály"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:569
 #, python-format
 msgid "Merged lead"
-msgstr ""
+msgstr "Érdeklődés összefésülése"
 
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
+"Ha leveleket küld, az alapértelmezett email cím az értékesítő csoporttól "
+"lesz kiválasztva."
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -1334,22 +1419,24 @@ msgid ""
 "Phone Calls Assigned to the current user or with a team having the current "
 "user as team leader"
 msgstr ""
+"Telefonhívás a jelenlegi felhasználóhoz iktatva vagy ahhoz a csoporthoz, "
+"melynek a vezetője"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
-msgstr ""
+msgstr "Kiosztás leírása"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:565
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "Lehetőségek összefésülése"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Consulting"
-msgstr ""
+msgstr "Tanácsadó"
 
 #. module: crm
 #: field:crm.case.section,code:0
@@ -1359,7 +1446,7 @@ msgstr "Kód"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Jellemzők"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -1369,12 +1456,12 @@ msgstr "Alcsoportok"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr ""
+msgstr "Telefonhívások, melyek tervezet vagy nyitott állapotúak"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmen"
-msgstr ""
+msgstr "Értékesítő"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1394,29 +1481,29 @@ msgstr "Mégse"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Information"
-msgstr ""
+msgstr "Információ"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr ""
+msgstr "Függőben lévő Érdeklődések/Lehetőségek"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+msgstr "Tennivaló"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_lost
 msgid "Opportunity lost"
-msgstr ""
+msgstr "Elveszített lehetőség"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2opportunity.partner.mass,action:0
 #: field:crm.partner.binding,action:0
 msgid "Related Customer"
-msgstr ""
+msgstr "Ide vonatkozó vevő"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1427,18 +1514,18 @@ msgstr "Egyéb"
 #: field:crm.phonecall,opportunity_id:0
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Érdeklődő/Lehetőség"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge leads/opportunities"
-msgstr ""
+msgstr "Érdeklődés/Lehetőség eggyesítése"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "Szakaszok rendszerezéséhez használt. Alacsonyabb érték a jobb."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1448,17 +1535,19 @@ msgstr "Telefonhívás kategóriák"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr ""
+msgstr "Nyitott állapotú Érdeklődések/Lehetőségek"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunities that are assigned to any sales teams I am member of"
 msgstr ""
+"Lehetőségek, melyek kiosztva bármely értékesítési csoportnak, melynek tagja "
+"vagyok"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "Szakasz megváltoztatva"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
@@ -1474,7 +1563,7 @@ msgstr "Hiba ! Nem hozhat létre rekurzív értékesítési csapatot."
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr ""
+msgstr "Egy hívás naplózása"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1507,7 +1596,7 @@ msgstr "Név"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities that are assigned to me"
-msgstr ""
+msgstr "Hozzám rendelt Érdeklődések/Lehetőségek"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1519,17 +1608,17 @@ msgstr "Eseteim"
 #: help:crm.lead,message_ids:0
 #: help:crm.phonecall,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Üzenetek és kommunikáció történet"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Countries"
-msgstr ""
+msgstr "Országok mutatása"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "Hívás dátuma"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1548,22 +1637,22 @@ msgstr "Magas"
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "A leendő partner átalakítása üzleti partnerré"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
-msgstr ""
+msgstr "CRM Fizetési mód"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr ""
+msgstr "Elvégzett állípotú Érdeklődések/Lehetőségek"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Késleltetés a zárásig"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1576,12 +1665,12 @@ msgstr "Csoportosítás..."
 #. module: crm
 #: model:email.template,subject:crm.email_template_opportunity_mail
 msgid "${object.name}"
-msgstr ""
+msgstr "${object.name}"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge Leads/Opportunities"
-msgstr ""
+msgstr "Érdeklődések/Lehetőségek  összefésülése"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
@@ -1593,7 +1682,7 @@ msgstr "Főcsoport"
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
-msgstr ""
+msgstr "Ne kapcsolja ügyfélhez"
 
 #. module: crm
 #: field:crm.lead,date_action:0
@@ -1611,7 +1700,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assign opportunities to"
-msgstr ""
+msgstr "Iktassa a lehetőséget neki"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1621,23 +1710,23 @@ msgstr "Bejövő"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Month of call"
-msgstr ""
+msgstr "Hívás hónapja"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Describe the lead..."
-msgstr ""
+msgstr "Fejtse ki az Érdeklődést..."
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
-msgstr ""
+msgstr "Partner <b>létrehozva</b>."
 
 #. module: crm
 #: field:sale.config.settings,module_crm_claim:0
 msgid "Manage Customer Claims"
-msgstr ""
+msgstr "Jótállási ügyek intézése"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -1646,11 +1735,15 @@ msgid ""
 "the treatment delays or number of leads per state. You can sort out your "
 "leads analysis by different groups to get accurate grained analysis."
 msgstr ""
+"Érdeklődési elemzés lehetővé teszi a CRM ügyfélkapcsolat kezelő rendszerrel "
+"kapcsolatos információk ellenőrzését, mint eljárás késedelem vagy a "
+"szakaszonkénti érdeklődések száma. Kiválaszthatja az érdeklődések "
+"elemzéséből a különböző csoportokat a pontos részletezett elemzésekhez."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Services"
-msgstr ""
+msgstr "Szolgáltatások"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1663,7 +1756,7 @@ msgstr "Legmagasabb"
 #. module: crm
 #: help:crm.lead.report,creation_year:0
 msgid "Creation year"
-msgstr ""
+msgstr "Létrehozás éve"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1674,7 +1767,7 @@ msgstr "Megjegyzések"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Call Description"
-msgstr ""
+msgstr "Hívás leírása"
 
 #. module: crm
 #: field:crm.lead,partner_name:0
@@ -1689,7 +1782,7 @@ msgstr "Válasz"
 #. module: crm
 #: view:crm.lead:0
 msgid "Display"
-msgstr ""
+msgstr "Megjelenítés"
 
 #. module: crm
 #: view:board.board:0
@@ -1699,7 +1792,7 @@ msgstr "Lehetőségek szakaszok szerint"
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "A leendő partner átalakítá alatt üzleti partnerré"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -1707,7 +1800,7 @@ msgstr ""
 #: model:ir.model,name:crm.model_crm_case_channel
 #: model:ir.ui.menu,name:crm.menu_crm_case_channel
 msgid "Channels"
-msgstr ""
+msgstr "Csatornák"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -1725,22 +1818,22 @@ msgstr "Extra információ"
 #. module: crm
 #: view:crm.lead:0
 msgid "Fund Raising"
-msgstr ""
+msgstr "Tőkebevonás"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit..."
-msgstr ""
+msgstr "Szerkesztés..."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
 msgid "Google Adwords"
-msgstr ""
+msgstr "Google hirdetési szavak"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select Stages for this Sales Team"
-msgstr ""
+msgstr "Szakasz kiválasztása ehhez az értékesítési csoporthoz"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1762,13 +1855,15 @@ msgstr ""
 #: help:crm.lead,partner_id:0
 msgid "Linked partner (optional). Usually created when converting the lead."
 msgstr ""
+"Kapcsolat partner (választható). Rendszerint az érdeklődés átalakításánál "
+"lesz létrehozva."
 
 #. module: crm
 #: field:crm.lead,payment_mode:0
 #: view:crm.payment.mode:0
 #: model:ir.actions.act_window,name:crm.action_crm_payment_mode
 msgid "Payment Mode"
-msgstr ""
+msgstr "Fizetési mód"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
@@ -1778,19 +1873,19 @@ msgstr ""
 #. module: crm
 #: view:sale.config.settings:0
 msgid "On Mail Server"
-msgstr ""
+msgstr "Levelező szerveren"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM"
-msgstr ""
+msgstr "CRM ügyfélkapcsolat-kezelő rendszer"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Contacts Segmentation"
-msgstr ""
+msgstr "Kapcsolatok kiosztása"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
@@ -1805,7 +1900,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
 msgid "Segmentation line"
-msgstr ""
+msgstr "Kiosztási sor"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
@@ -1816,18 +1911,18 @@ msgstr "Tervezett időpont"
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Elvárt árbevételek"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "Hivatkozás"
 
 #. module: crm
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "A típust az érdeklődők és a lehetőségek szétválasztására használja"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1839,17 +1934,17 @@ msgstr "Július"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "Érdeklődés / Vevő"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_2
 msgid "Support Department"
-msgstr ""
+msgstr "Támogatási osztály"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "Csak az Érdeklődések mutatása"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
@@ -1861,7 +1956,7 @@ msgstr "Értékesítési csapatok"
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Default to New Sales Team"
-msgstr ""
+msgstr "Alapértelmezett az új értékesítési csoportnak"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1871,7 +1966,7 @@ msgstr "Csapat"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "Új állapotú Érdeklődések/Lehetőségek"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
@@ -1903,18 +1998,18 @@ msgstr "Érdeklődők"
 #: code:addons/crm/crm_lead.py:563
 #, python-format
 msgid "Merged leads"
-msgstr ""
+msgstr "Össztefésült érdeklődések"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
-msgstr ""
+msgstr "Terv"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 msgid "Merge with existing opportunities"
-msgstr ""
+msgstr "Egyesít meglévő lehetőséggel"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1926,12 +2021,12 @@ msgstr "Tennivaló"
 #: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
 msgid "Lead to Opportunity"
-msgstr ""
+msgstr "Érdeklődés Lehetőséggé alakítása"
 
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Felhasználó  email címe"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
@@ -1939,6 +2034,8 @@ msgid ""
 "The name of the future partner company that will be created while converting "
 "the lead into opportunity"
 msgstr ""
+"A jövőben létrehozni kívánt partner vállalat neve, ami akkor lesz "
+"létrehozva, amikor az érdeklődő át lesz alakítva lehetőséggé"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,note:0
@@ -1967,12 +2064,12 @@ msgstr "lezárt"
 #. module: crm
 #: view:crm.lead:0
 msgid "Open Opportunities"
-msgstr ""
+msgstr "Nyitott lehetőségek"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Email Campaign - Services"
-msgstr ""
+msgstr "Email kampány - Szolgáltatások"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -1986,7 +2083,7 @@ msgstr "Függőben lévő"
 #. module: crm
 #: view:crm.lead:0
 msgid "Assigned to Me"
-msgstr ""
+msgstr "Nekem iktatott"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
@@ -1996,7 +2093,7 @@ msgstr "Várható lehetőség"
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "Globális CC /másolat/"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2010,7 +2107,7 @@ msgstr "Telefonhívások"
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Search"
-msgstr ""
+msgstr "Szakasz keresése"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0
@@ -2038,24 +2135,24 @@ msgstr "aktív"
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr ""
+msgstr "Kötelező kifejezés"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Create a new customer"
-msgstr ""
+msgstr "Új vevő létrehozása"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr ""
+msgstr "Várh. határidő"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Software"
-msgstr ""
+msgstr "Szoftver"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
@@ -2090,12 +2187,12 @@ msgstr "Város"
 #. module: crm
 #: selection:crm.case.stage,type:0
 msgid "Both"
-msgstr ""
+msgstr "Mindkettő"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Done"
-msgstr ""
+msgstr "Hívás elvégezve"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2106,22 +2203,22 @@ msgstr "Felelős"
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
-msgstr ""
+msgstr "Direkt Marketing"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Product"
-msgstr ""
+msgstr "Termék"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "Létrehozás éve"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
-msgstr ""
+msgstr "Átállítási lehetőségek"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -2129,16 +2226,20 @@ msgid ""
 "Follow this salesteam to automatically track the events associated to users "
 "of this team."
 msgstr ""
+"Kövesse ezt az értékesítési csoportot a csoport felhasználókhoz kapcsolódó "
+"események nyomon követéséhez."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
-msgstr ""
+msgstr "Cím"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to any sales teams I am member of"
 msgstr ""
+"Érdeklődések, melyek bármely értékesítési csoporthoz iktatva vannak, melynek "
+"tagja vagyok"
 
 #. module: crm
 #: help:crm.case.section,alias_id:0
@@ -2146,6 +2247,8 @@ msgid ""
 "The email address associated with this team. New emails received will "
 "automatically create new leads assigned to the team."
 msgstr ""
+"Az e-mail cím, mely ehhez a csoporthoz rendelt. Új erre a címre érkezett "
+"levél automatikusan Érdeklődést fog létrehozni ehhez a csoporthoz."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2157,7 +2260,7 @@ msgstr "Potenciális ügyfelek közötti kezelés"
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Késleltetés a nyitáshoz"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
@@ -2176,34 +2279,36 @@ msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
 msgstr ""
+"Melyik kampányból (szeminárium, értékesítési kampány, tömeges levélküldés, "
+"...) érkezett ez a kapcsolat?"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Résztvevők információi"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr ""
+msgstr "Kiosztás tesztelése"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Continue Process"
-msgstr ""
+msgstr "Feldolgozás folytatása"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
 msgid "Convert to opportunity"
-msgstr ""
+msgstr "Lehetőséggé alakít"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Hozzárendel ehhez"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0
@@ -2232,6 +2337,17 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Kattintson egy hívás ütemezéséhez.\n"
+"          </p><p>\n"
+"            OpenERP lehetővé teszi az értékesítési csoportja összes\n"
+"            telefonhívásának könnyű meghatározását és nyomon \n"
+"            követését az összefoglalója alapján.\n"
+"         </p><p>  \n"
+"            Az importálás használatával tömegesen importálhat új\n"
+"            listákat a leendő partnerek módosítására.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.stage,fold:0
@@ -2239,6 +2355,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Ez a szakasz nem látható, például az állapot sorban vagy kanban nézetben, ha "
+"azon a szakaszon nem lehet rekordot kijelezni."
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
@@ -2249,17 +2367,17 @@ msgstr "Esetek száma"
 #. module: crm
 #: help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "Értékesítési csoport aki az üggyel foglalkozik."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Banner Ads"
-msgstr ""
+msgstr "Szallagcím hírdetés"
 
 #. module: crm
 #: field:crm.merge.opportunity,opportunity_ids:0
 msgid "Leads/Opportunities"
-msgstr ""
+msgstr "Érdeklődések/lehetőségek"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2284,7 +2402,7 @@ msgstr "Futó"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
 msgid "Lead converted into an opportunity"
-msgstr ""
+msgstr "Érdeklődés átalakítva egy lehetőséggé"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_won
@@ -2304,12 +2422,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset"
-msgstr ""
+msgstr "Visszaállítás"
 
 #. module: crm
 #: view:sale.config.settings:0
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Értékesítés utáni szolgáltatások"
 
 #. module: crm
 #: field:crm.case.section,message_ids:0
@@ -2321,7 +2439,7 @@ msgstr "Üzenetek"
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "Communikéciós csatorna (levelezés, direkt, telefon, ...)"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0
@@ -2341,7 +2459,7 @@ msgstr "Törölt"
 #. module: crm
 #: view:crm.lead:0
 msgid "Street..."
-msgstr ""
+msgstr "Utca..."
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
@@ -2361,12 +2479,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,fold:0
 msgid "Fold by Default"
-msgstr ""
+msgstr "Alapértelmezetten összehajtva"
 
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Összefüggés állapot"
 
 #. module: crm
 #: field:crm.phonecall,name:0
@@ -2376,7 +2494,7 @@ msgstr "Hívás összefoglalása"
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Szín meghatározó"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -2387,12 +2505,12 @@ msgstr "Operátor"
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "Hívás Ütemezés/Naplózás"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Leads/Opportunities"
-msgstr ""
+msgstr "Érdeklődések/lehetőségek kiválasztása"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
@@ -2407,7 +2525,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "Tervezet árbevétel felhasználó és szakasz szerint"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2417,7 +2535,7 @@ msgstr "Megerősítés"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unread messages"
-msgstr ""
+msgstr "Olvasatlan üzenetek"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -2434,7 +2552,7 @@ msgstr "Választható kifejezés"
 #: field:crm.lead,message_follower_ids:0
 #: field:crm.phonecall,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Követők"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2457,7 +2575,7 @@ msgstr ""
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
-msgstr ""
+msgstr "Érdeklődés létrehozáse beérkező levélből"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2485,7 +2603,7 @@ msgstr "Hívás ütemezése"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Az én értékesítő csapato(ai)m"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2495,6 +2613,10 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"Ellenőrizze ha a kategória limitálva van azokra a partnerekre akik egyeznek "
+"a kiosztási kritériumokkal.                        \n"
+"Ha be van jelölve, vegye le azokról a partnerekről a katagóriát akik nem "
+"egyeznek meg a kritériumokkal."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
@@ -2504,7 +2626,7 @@ msgstr "Üzleti lehetőségek létrehozása a potenciális ügyfelekből"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Email Campaign - Products"
-msgstr ""
+msgstr "Email kampány - Termékek"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@@ -2523,21 +2645,34 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Kattintson egy telefonhívás összesítés naplózásához. \n"
+"          </p><p>\n"
+"            OpenERP lehetővé tesz a beérkező telefon hívások azonnali "
+"naplózását az\n"
+"            ügyféllel történt kommunikációs történet nyomon követéséhez vagy "
+"egy\n"
+"            másik csoport vezető értesítéséhez.\n"
+"          </p><p>\n"
+"            Ahhoz, hogy nyomon követhesse a hívásokat, kapcsolhat egy másik\n"
+"            hívást, találkozót vagy lehetőséget.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Ellenőrizze az első partnert egy új leendővel"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Calls"
-msgstr ""
+msgstr "Hívások"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Cancel Case"
-msgstr ""
+msgstr "Ügy visszavonása"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -2558,7 +2693,7 @@ msgstr "Végzettség"
 #: field:crm.lead2opportunity.partner,name:0
 #: field:crm.lead2opportunity.partner.mass,name:0
 msgid "Conversion Action"
-msgstr ""
+msgstr "Átállítási művelet"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2705,7 +2840,7 @@ msgstr "Eset kategóriája"
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "Tervezet árbevétel szakasz és felhasználó szerint"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -2795,7 +2930,7 @@ msgstr "Eset szakasza"
 #: code:addons/crm/crm_lead.py:569
 #, python-format
 msgid "Merged opportunity"
-msgstr ""
+msgstr "Egyesített lehetőség"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3061,7 +3196,7 @@ msgstr "Hírlevél"
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
 msgid "Opportunity Stage Changed"
-msgstr ""
+msgstr "Lehetőség szakasza megváltozott"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
@@ -3075,6 +3210,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson új szakasz beállításához az érdeklődés/lehetőség "
+"folyamatában.\n"
+"              </p><p>\n"
+"                Szakaszok lehetővé teszik az értékesítő részére az nyomon\n"
+"                követni, hogyan illeszkedik az érdeklődés vagy a lehetőség\n"
+"                az értékesítési folyamatba.\n"
+"              </p>\n"
+"            "
 
 #~ msgid "Send Mail"
 #~ msgstr "Levél küldése"
diff --git a/addons/crm_partner_assign/i18n/hu.po b/addons/crm_partner_assign/i18n/hu.po
index c221a937d0b..34ba86ba8b6 100644
--- a/addons/crm_partner_assign/i18n/hu.po
+++ b/addons/crm_partner_assign/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-10 22:39+0000\n"
+"PO-Revision-Date: 2013-03-13 15:42+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-11 05:42+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -192,7 +192,7 @@ msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
-"A partnerhez kiadható lehetőség valószínűségét adja meg. (A nincs kiadást a "
+"A partnerhez kiadható érdeklődés valószínűségét adja meg. (A nincs kiadást a "
 "0 jelenti)"
 
 #. module: crm_partner_assign
@@ -209,7 +209,7 @@ msgstr "Rendszerüzenet"
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
-msgstr "Továbblépés lehetőségről"
+msgstr "Továbblépés érdeklődésről"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
@@ -341,7 +341,7 @@ msgstr "Partner hozzárendelés"
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr "A típust az érdeklődők és az esélyek szétválasztására használja"
+msgstr "A típust az érdeklődők és a lehetőségek szétválasztására használja"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -752,7 +752,7 @@ msgstr "Jelenleg"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr "Lehetőség/Esély"
+msgstr "Érdeklődő/Lehetőség"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
diff --git a/addons/crm_todo/i18n/mk.po b/addons/crm_todo/i18n/mk.po
index fbab43aa142..51bb21f3772 100644
--- a/addons/crm_todo/i18n/mk.po
+++ b/addons/crm_todo/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-01 12:35+0000\n"
-"Last-Translator: Софче Димитријева <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 08:06+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:40+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
@@ -30,7 +30,7 @@ msgstr ""
 #. module: crm_todo
 #: view:crm.lead:0
 msgid "Lead"
-msgstr ""
+msgstr "Водечко"
 
 #. module: crm_todo
 #: view:crm.lead:0
@@ -72,7 +72,7 @@ msgstr "Lead/Можност"
 #. module: crm_todo
 #: field:project.task,lead_id:0
 msgid "Lead / Opportunity"
-msgstr ""
+msgstr "Водечко / Можност"
 
 #. module: crm_todo
 #: view:crm.lead:0
diff --git a/addons/document_page/i18n/mk.po b/addons/document_page/i18n/mk.po
index 343d8b1efaf..ba2666a2147 100644
--- a/addons/document_page/i18n/mk.po
+++ b/addons/document_page/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-01 17:59+0000\n"
-"Last-Translator: Софче Димитријева <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 11:53+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:41+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: document_page
 #: view:document.page:0
@@ -23,13 +23,13 @@ msgstr ""
 #: selection:document.page,type:0
 #: model:ir.actions.act_window,name:document_page.action_category
 msgid "Category"
-msgstr ""
+msgstr "Категорија"
 
 #. module: document_page
 #: view:document.page:0
 #: field:document.page,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Последен приложувач"
 
 #. module: document_page
 #: view:document.page:0
@@ -76,6 +76,8 @@ msgstr "Урнек"
 msgid ""
 "that will be used as a content template for all new page of this category."
 msgstr ""
+"што ќе се користи како шаблон за содржината на сите нови страници од оваа "
+"категорија"
 
 #. module: document_page
 #: field:document.page,name:0
@@ -161,7 +163,7 @@ msgstr "Категории"
 #. module: document_page
 #: view:document.page:0
 msgid "Name"
-msgstr ""
+msgstr "Име"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
@@ -193,7 +195,7 @@ msgstr "Резиме"
 #. module: document_page
 #: view:document.page:0
 msgid "e.g. Once upon a time..."
-msgstr ""
+msgstr "на пр. Еднаш, многу одамна..."
 
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_page
diff --git a/addons/document_webdav/i18n/mk.po b/addons/document_webdav/i18n/mk.po
index 9a4d60f16d2..53faec53c3a 100644
--- a/addons/document_webdav/i18n/mk.po
+++ b/addons/document_webdav/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-07 12:30+0000\n"
-"Last-Translator: Софче Димитријева <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 11:42+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:41+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -26,7 +26,7 @@ msgstr "Датумот е креиран"
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_document_props
 msgid "Documents"
-msgstr ""
+msgstr "Документи"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -37,7 +37,7 @@ msgstr "Сопственост на документ"
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Search Document properties"
-msgstr ""
+msgstr "Пребарувај ги својствата на документот"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -150,7 +150,7 @@ msgstr "Креатор"
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 msgid "Document Property"
-msgstr ""
+msgstr "Својство на документот"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
@@ -161,4 +161,4 @@ msgstr ""
 #: field:document.webdav.dir.property,do_subst:0
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
-msgstr ""
+msgstr "Замена"
diff --git a/addons/email_template/i18n/mk.po b/addons/email_template/i18n/mk.po
index a0904d3f29b..71ad32e0522 100644
--- a/addons/email_template/i18n/mk.po
+++ b/addons/email_template/i18n/mk.po
@@ -9,15 +9,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: OpenERP Macedonian <openerp-i18n-"
 "macedonian@lists.launchpad.net >\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-02 10:12+0000\n"
-"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
+"PO-Revision-Date: 2013-03-13 07:59+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: OpenERP Macedonia <openerp-i18n-"
 "macedonian@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:41+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 "Language: mk\n"
 
 #. module: email_template
@@ -46,7 +46,7 @@ msgstr "Исклучи"
 #. module: email_template
 #: view:email.template:0
 msgid "Email contents (in raw HTML format)"
-msgstr ""
+msgstr "E-mail содржини (во HTML формат)"
 
 #. module: email_template
 #: field:email.template,email_to:0
diff --git a/addons/email_template/i18n/ro.po b/addons/email_template/i18n/ro.po
index bf628440e5a..fb72e3a2164 100644
--- a/addons/email_template/i18n/ro.po
+++ b/addons/email_template/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-07 18:51+0000\n"
+"PO-Revision-Date: 2013-03-13 18:52+0000\n"
 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:41+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -192,7 +192,7 @@ msgstr ""
 "trimiteti un e-mail. Daca nu este setata, va fi folosita versiunea in limba "
 "engleza. Aceasta ar trebui de obicei sa fie o expresie inlocuitoare care "
 "furnizeaza codul limbii corespunzatoare, de exemplu "
-"${obiect.partener_id.cod.limba}."
+"${object.partner_id.lang.code}."
 
 #. module: email_template
 #: field:email_template.preview,res_id:0
@@ -421,7 +421,7 @@ msgstr "Stergerea inregistrarii actiunii a esuat."
 #: field:email.template,email_cc:0
 #: field:email_template.preview,email_cc:0
 msgid "Cc"
-msgstr "Cc (copie carbon)"
+msgstr "Cc"
 
 #. module: email_template
 #: field:email.template,model_id:0
diff --git a/addons/event/i18n/mk.po b/addons/event/i18n/mk.po
index a812592e06c..ba20274f195 100644
--- a/addons/event/i18n/mk.po
+++ b/addons/event/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-08 15:37+0000\n"
-"Last-Translator: Софче Димитријева <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 12:14+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-09 05:38+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1129,12 +1129,12 @@ msgstr "Датум на почеток на настан"
 #. module: event
 #: view:report.event.registration:0
 msgid "Participant / Contact"
-msgstr ""
+msgstr "Учесник / Контакт"
 
 #. module: event
 #: view:event.event:0
 msgid "Current Registrations"
-msgstr ""
+msgstr "Моментални запишувања"
 
 #. module: event
 #: model:email.template,body_html:event.confirmation_registration
@@ -1149,6 +1149,14 @@ msgid ""
 "        <p>Thank you for your participation!</p>\n"
 "        <p>Best regards</p>"
 msgstr ""
+"\n"
+"        <p>Здраво ${object.name},</p>\n"
+"        <p>Ви потврдуваме дека вашата регистрација за настанот "
+"${object.event_id.name} е запишана.\n"
+"        Автоматски ќе добиете e-mail со информации (како распоред, дневен "
+"ред...)  штом ќе се потврди    настанот.</p>\n"
+"        <p>Ви благодариме за учеството!</p>\n"
+"        <p>Со почит</p>"
 
 #. module: event
 #: help:event.event,reply_to:0
@@ -1180,7 +1188,7 @@ msgstr "Улица"
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr ""
+msgstr "Потврдување на настан"
 
 #. module: event
 #: view:report.event.registration:0
@@ -1191,4 +1199,4 @@ msgstr "Година"
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr ""
+msgstr "Гласноговорникот е потврден"
diff --git a/addons/event_moodle/i18n/mk.po b/addons/event_moodle/i18n/mk.po
index fac85f229a5..59451e5463b 100644
--- a/addons/event_moodle/i18n/mk.po
+++ b/addons/event_moodle/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-08 14:45+0000\n"
-"Last-Translator: Софче Димитријева <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 12:08+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-09 05:38+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
@@ -33,6 +33,8 @@ msgid ""
 "URL where you have your moodle server. For exemple: 'http://127.0.0.1' or "
 "'http://localhost'"
 msgstr ""
+"URl адресата на вашиот moodle сервер. На пример, 'http://127.0.0.1' или "
+"'http://localhost'"
 
 #. module: event_moodle
 #: field:event.registration,moodle_user_password:0
@@ -62,6 +64,9 @@ msgid ""
 "'token' in Moodle. It will be used to authenticate OpenERP as a trustable "
 "application."
 msgstr ""
+"Најлесен начин да се поврзете на OpenERP со moodle сервер е да креирате "
+"токен во moodle. Тој ќе се користи за автентикација на OpenERP како "
+"поверлива апликација."
 
 #. module: event_moodle
 #: field:event.moodle.config.wiz,url:0
@@ -71,7 +76,7 @@ msgstr "URL на Moodle Сервер"
 #. module: event_moodle
 #: help:event.moodle.config.wiz,url:0
 msgid "The url that will be used for the connection with moodle in xml-rpc"
-msgstr ""
+msgstr "URL адресата што ќе се користи за врската со moodle во xml-rpc"
 
 #. module: event_moodle
 #: model:ir.model,name:event_moodle.model_event_registration
@@ -84,11 +89,13 @@ msgid ""
 "Another approach is to create a user for OpenERP in Moodle. If you do so, "
 "make sure that this user has appropriate access rights."
 msgstr ""
+"Другиот начин е да се креира корисник за OpenERP во Moodle. Доколку го "
+"направите тоа, погрижете се овој корисник да ги има сите права за пристап."
 
 #. module: event_moodle
 #: field:event.registration,moodle_uid:0
 msgid "Moodle User ID"
-msgstr ""
+msgstr "Moodle корисничко ID"
 
 #. module: event_moodle
 #: field:event.moodle.config.wiz,server_moodle:0
@@ -117,7 +124,7 @@ msgstr "Грешка!"
 #: code:addons/event_moodle/event_moodle.py:105
 #, python-format
 msgid "You must configure your moodle connection."
-msgstr ""
+msgstr "Мора да ја конфигурирате вашата moodle врска."
 
 #. module: event_moodle
 #: field:event.moodle.config.wiz,moodle_username:0
@@ -153,7 +160,7 @@ msgstr "Идентификувач на овој настан во Moodle"
 #. module: event_moodle
 #: help:event.moodle.config.wiz,moodle_token:0
 msgid "Put your token that you created in your moodle server"
-msgstr ""
+msgstr "Токенот што го креиравте, вметнете го во вашиот moodle сервер"
 
 #. module: event_moodle
 #: model:ir.ui.menu,name:event_moodle.wizard_moodle
@@ -169,7 +176,7 @@ msgstr "или"
 #: code:addons/event_moodle/event_moodle.py:57
 #, python-format
 msgid "First configure your moodle connection."
-msgstr ""
+msgstr "Најпрво конфигурирајте ја вашата moodle врска"
 
 #. module: event_moodle
 #: view:event.moodle.config.wiz:0
diff --git a/addons/event_sale/i18n/mk.po b/addons/event_sale/i18n/mk.po
index 9e9631e98d9..adf2bc8ba47 100644
--- a/addons/event_sale/i18n/mk.po
+++ b/addons/event_sale/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-11 12:49+0000\n"
+"PO-Revision-Date: 2013-03-13 11:48+0000\n"
 "Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-12 05:18+0000\n"
-"X-Generator: Launchpad (build 16524)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_product_product
@@ -39,7 +39,7 @@ msgstr ""
 #. module: event_sale
 #: model:event.event,name:event_sale.event_technical_training
 msgid "Technical training in Grand-Rosiere"
-msgstr ""
+msgstr "Техничка обука во Grand-Rosiere"
 
 #. module: event_sale
 #: help:product.product,event_type_id:0
diff --git a/addons/fetchmail/i18n/mk.po b/addons/fetchmail/i18n/mk.po
index 60cc4d2c146..89f5b143859 100644
--- a/addons/fetchmail/i18n/mk.po
+++ b/addons/fetchmail/i18n/mk.po
@@ -9,15 +9,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: OpenERP Macedonian <openerp-i18n-"
 "macedonian@lists.launchpad.net >\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-02-28 20:33+0000\n"
-"Last-Translator: Софче Димитријева <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 12:01+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: OpenERP Macedonia <openerp-i18n-"
 "macedonian@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:42+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 "Language: mk\n"
 
 #. module: fetchmail
@@ -48,6 +48,8 @@ msgid ""
 "Connections are encrypted with SSL/TLS through a dedicated port (default: "
 "IMAPS=993, POP3S=995)"
 msgstr ""
+"Врската е енкриптирана со SSL/TLS преку зададен порт (стандардно: IMAPS=993, "
+"POP3S=995)"
 
 #. module: fetchmail
 #: field:fetchmail.server,attach:0
@@ -78,7 +80,7 @@ msgstr "Конфигурирање на портал за влезна е-пош
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Fetch Now"
-msgstr ""
+msgstr "Земи сега"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
@@ -124,12 +126,12 @@ msgstr "SSL"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_config_settings
 msgid "fetchmail.config.settings"
-msgstr ""
+msgstr "fetchmail.config.settings"
 
 #. module: fetchmail
 #: field:fetchmail.server,date:0
 msgid "Last Fetch Date"
-msgstr ""
+msgstr "ПОследен датум за земање"
 
 #. module: fetchmail
 #: help:fetchmail.server,action_id:0
@@ -162,7 +164,7 @@ msgstr "Конфигурација"
 #. module: fetchmail
 #: field:fetchmail.server,script:0
 msgid "Script"
-msgstr ""
+msgstr "Скрипта"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -183,7 +185,7 @@ msgstr "Корисничко име"
 #. module: fetchmail
 #: help:fetchmail.server,server:0
 msgid "Hostname or IP of the mail server"
-msgstr ""
+msgstr "Име на хостот или IP-адреса на меил серверот"
 
 #. module: fetchmail
 #: field:fetchmail.server,name:0
@@ -248,7 +250,7 @@ msgstr "Излезни мејлови"
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
 msgid "Server Priority"
-msgstr ""
+msgstr "Приоритет на серверот"
 
 #. module: fetchmail
 #: selection:fetchmail.server,type:0
diff --git a/addons/fleet/i18n/mn.po b/addons/fleet/i18n/mn.po
index 6ea11c6b357..9016f3998a4 100644
--- a/addons/fleet/i18n/mn.po
+++ b/addons/fleet/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2013-03-04 13:27+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 09:07+0000\n"
+"Last-Translator: wsubuntu <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:42+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -147,7 +147,7 @@ msgstr "Литр"
 #. module: fleet
 #: model:ir.actions.client,name:fleet.action_fleet_menu
 msgid "Open Fleet Menu"
-msgstr "Авто Цэс Нээх"
+msgstr "Авто-парк Цэс Нээх"
 
 #. module: fleet
 #: view:board.board:0
@@ -328,7 +328,7 @@ msgstr "Агаар Шүүгч Солилт"
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_tag
 msgid "fleet.vehicle.tag"
-msgstr "fleet.vehicle.tag"
+msgstr "авто-парк.авто-хэрэгсэл.тойг"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -1100,7 +1100,7 @@ msgstr ""
 #. module: fleet
 #: view:board.board:0
 msgid "Fleet Dashboard"
-msgstr ""
+msgstr "Авто-паркийн дэйшбоард"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
@@ -1324,7 +1324,7 @@ msgstr ""
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting
 #: model:ir.ui.menu,name:fleet.menu_root
 msgid "Fleet"
-msgstr "Авто бааз /// Флот /// Авто зогсоол гэх үү ????"
+msgstr "Авто-парк"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_14
@@ -1634,7 +1634,7 @@ msgstr ""
 #: code:addons/fleet/fleet.py:397
 #, python-format
 msgid "Vehicle %s has been added to the fleet!"
-msgstr ""
+msgstr "Авто-хэрэгсэл %s нь авто-паркад бүртгэгдлээ"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
diff --git a/addons/google_base_account/i18n/mk.po b/addons/google_base_account/i18n/mk.po
index d24e31a5312..c80acf34f34 100644
--- a/addons/google_base_account/i18n/mk.po
+++ b/addons/google_base_account/i18n/mk.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-02 22:59+0000\n"
-"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
+"PO-Revision-Date: 2013-03-13 08:00+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:42+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
@@ -78,7 +78,7 @@ msgstr "Неуспешна најава. Проверете го корисни
 #. module: google_base_account
 #: view:google.login:0
 msgid "e.g. user@gmail.com"
-msgstr ""
+msgstr "на пр. user@gmail.com"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:29
diff --git a/addons/hr/i18n/mk.po b/addons/hr/i18n/mk.po
index c5a20b2a297..cb7f914f2ae 100644
--- a/addons/hr/i18n/mk.po
+++ b/addons/hr/i18n/mk.po
@@ -9,15 +9,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: OpenERP Macedonian <openerp-i18n-"
 "macedonian@lists.launchpad.net >\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-11 22:47+0000\n"
-"Last-Translator: Ivica Dimitrijev <palifra@gmail.com>\n"
+"PO-Revision-Date: 2013-03-13 08:23+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
 "Language-Team: OpenERP Macedonia <openerp-i18n-"
 "macedonian@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-12 05:18+0000\n"
-"X-Generator: Launchpad (build 16524)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 "Language: mk\n"
 
 #. module: hr
@@ -152,7 +152,7 @@ msgstr "Очекува при вработувањето"
 #. module: hr
 #: view:hr.employee:0
 msgid "Other Information ..."
-msgstr ""
+msgstr "Други информации..."
 
 #. module: hr
 #: constraint:hr.employee.category:0
@@ -208,7 +208,7 @@ msgstr "Пораки"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Talent Management"
-msgstr ""
+msgstr "Управување со таленти"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet_sheet:0
@@ -334,6 +334,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Прикажува резиме на конверзација (број на пораки, ...). Ова резиме е "
+"директно во html формат со цел да биде вметнато во kanban преглед."
 
 #. module: hr
 #: help:hr.config.settings,module_account_analytic_analysis:0
@@ -411,7 +413,7 @@ msgstr "Контакт на вработен"
 #. module: hr
 #: view:hr.employee:0
 msgid "e.g. Part Time"
-msgstr ""
+msgstr "на пр. Дел од времето"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -933,7 +935,7 @@ msgstr "Конфигурирај човечки ресурси"
 #. module: hr
 #: selection:hr.job,state:0
 msgid "No Recruitment"
-msgstr ""
+msgstr "Нема вработување"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
diff --git a/addons/lunch/i18n/mk.po b/addons/lunch/i18n/mk.po
new file mode 100644
index 00000000000..76aa64eb28b
--- /dev/null
+++ b/addons/lunch/i18n/mk.po
@@ -0,0 +1,906 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:38+0000\n"
+"PO-Revision-Date: 2013-03-13 07:53+0000\n"
+"Last-Translator: Aleksandar Panov <server986@gmail.com>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
+
+#. module: lunch
+#: field:lunch.product,category_id:0
+#: field:lunch.product.category,name:0
+msgid "Category"
+msgstr "Категорија"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_by_supplier_form
+msgid "Today's Orders by Supplier"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "My Orders"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Partially Confirmed"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order.line:0
+msgid "Group By..."
+msgstr "Групирај По..."
+
+#. module: lunch
+#: field:lunch.alert,sunday:0
+msgid "Sunday"
+msgstr "Недела"
+
+#. module: lunch
+#: field:lunch.order.line,supplier:0
+#: field:lunch.product,supplier:0
+msgid "Supplier"
+msgstr "Добавувач"
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "Today"
+msgstr "Денес"
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "March"
+msgstr "Март"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "By Employee"
+msgstr "По Вработен"
+
+#. module: lunch
+#: field:lunch.alert,friday:0
+msgid "Friday"
+msgstr "Петок"
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "validate order lines"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "Order lines Tree"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,specific_day:0
+#: field:report.lunch.order.line,day:0
+msgid "Day"
+msgstr "Ден"
+
+#. module: lunch
+#: view:lunch.order.line:0
+#: selection:lunch.order.line,state:0
+msgid "Received"
+msgstr "Примено"
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "By Supplier"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_order_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a lunch order. \n"
+"            </p>\n"
+"            <p>\n"
+"                A lunch order is defined by its user, date and order lines.\n"
+"                Each order line corresponds to a product, an additional note "
+"and a price.\n"
+"                Before selecting your order lines, don't forget to read the "
+"warnings displayed in the reddish area.\n"
+"            </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "Not Received"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_by_supplier_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_control_suppliers
+msgid "Orders by Supplier"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "Receive Meals"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "cashmove form"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_cashmove_form
+msgid ""
+"<p>\n"
+"                Here you can see your cash moves.<br/>A cash moves can be "
+"either an expense or a payment.\n"
+"                An expense is automatically created when an order is "
+"received while a payment is a reimbursement to the company encoded by the "
+"manager.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+msgid "Amount"
+msgstr "Износ"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_products
+#: model:ir.ui.menu,name:lunch.menu_lunch_products
+#: field:lunch.order,order_line_ids:0
+msgid "Products"
+msgstr "Производи"
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "By Date"
+msgstr "По датум"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+#: view:lunch.order.line:0
+#: selection:lunch.order.line,state:0
+msgid "Cancelled"
+msgstr "Откажано"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "lunch employee payment"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+msgid "alert tree"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order_line
+msgid "Lunch Orders Statistics"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_alert
+msgid "Lunch Alert"
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:183
+#, python-format
+msgid "Select a product and put your order comments on the note."
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.alert,alter_type:0
+msgid "Every Week"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove
+msgid "Register Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "Потврдено"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "lunch orders"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "Confirm"
+msgstr "Потврди"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+msgid "Your Account"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Your Lunch Account"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,active_from:0
+msgid "Between"
+msgstr "Помеѓу"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_order
+msgid "Wizard to order a meal"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+#: selection:lunch.order.line,state:0
+msgid "New"
+msgstr "Ново"
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:180
+#, python-format
+msgid "This is the first time you order a meal"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order.line,price_total:0
+msgid "Total Price"
+msgstr "Вкупна цена"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_validation
+msgid "lunch validation for order"
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order.line:0
+msgid "Name/Date"
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order.line:0
+msgid "Total :"
+msgstr "Вкупно :"
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "July"
+msgstr "Јули"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_config
+msgid "Configuration"
+msgstr "Конфигурација"
+
+#. module: lunch
+#: field:lunch.order,state:0
+#: field:lunch.order.line,state:0
+msgid "Status"
+msgstr "Статус"
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid ""
+"Order a meal doesn't mean that we have to pay it.\n"
+"                        A meal should be paid when it is received."
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_control_accounts
+#: model:ir.ui.menu,name:lunch.menu_lunch_control_accounts
+msgid "Control Accounts"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.alert,alter_type:0
+msgid "Every Day"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,cashmove:0
+msgid "Cash Move"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.order_order_lines
+msgid "Order meals"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+msgid "Schedule Hour"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "September"
+msgstr "Септември"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_control_suppliers
+msgid ""
+"<p>\n"
+"                Here you can see every orders grouped by suppliers and by "
+"date.\n"
+"              </p>\n"
+"              <p>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/terp-call-start.png\"/> to announce "
+"that the order is ordered <br/>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/gtk-apply.png\"/> to announce that "
+"the order is received <br/>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/gtk-cancel.png\"/> red X to announce "
+"that the order isn't available\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,tuesday:0
+msgid "Tuesday"
+msgstr "Вторник"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_tree
+msgid "Your Orders"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order.line,month:0
+msgid "Month"
+msgstr "Месец"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_products
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a product for lunch. \n"
+"            </p>\n"
+"              <p>\n"
+"                A product is defined by its name, category, price and "
+"supplier.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+#: field:lunch.alert,message:0
+msgid "Message"
+msgstr "Порака"
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid "Order Meals"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+#: view:lunch.order.order:0
+#: view:lunch.validation:0
+msgid "or"
+msgstr "или"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_product_categories
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a lunch category. \n"
+"            </p>\n"
+"              <p>\n"
+"                Here you can find every lunch categories for products.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid "Order meal"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_categories
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_categories
+msgid "Product Categories"
+msgstr "Категории на производ"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_control_suppliers
+msgid "Control Suppliers"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+msgid "Schedule Date"
+msgstr "Планиран датум"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_alert
+#: model:ir.ui.menu,name:lunch.menu_lunch_alert
+#: field:lunch.order,alerts:0
+msgid "Alerts"
+msgstr "Известувања"
+
+#. module: lunch
+#: field:lunch.order.line,note:0
+#: field:report.lunch.order.line,note:0
+msgid "Note"
+msgstr "Белешка"
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:250
+#, python-format
+msgid "Add"
+msgstr "Додади"
+
+#. module: lunch
+#: view:lunch.product:0
+#: view:lunch.product.category:0
+msgid "Products Form"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.cancel_order_lines
+msgid "Cancel meals"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+#: view:lunch.cashmove:0
+msgid "lunch cashmove"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "Are you sure you want to cancel these meals?"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "August"
+msgstr "Август"
+
+#. module: lunch
+#: field:lunch.alert,monday:0
+msgid "Monday"
+msgstr "Понеделник"
+
+#. module: lunch
+#: field:lunch.order.line,name:0
+msgid "unknown"
+msgstr "непознато"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.validate_order_lines
+msgid "Receive meals"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "June"
+msgstr "Јуни"
+
+#. module: lunch
+#: field:lunch.cashmove,user_id:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.order.line,user_id:0
+msgid "User Name"
+msgstr "Корисничко име"
+
+#. module: lunch
+#: model:ir.module.category,name:lunch.module_lunch_category
+#: model:ir.ui.menu,name:lunch.menu_lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_title
+msgid "Lunch"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_line
+msgid "lunch order line"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "lunch product"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,user_id:0
+#: model:res.groups,name:lunch.group_lunch_user
+msgid "User"
+msgstr "Корисник"
+
+#. module: lunch
+#: field:lunch.cashmove,date:0
+#: field:lunch.order,date:0
+#: field:lunch.order.line,date:0
+msgid "Date"
+msgstr "Датум"
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "November"
+msgstr "Ноември"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Orders Tree"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Orders Form"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+#: view:lunch.order.line:0
+msgid "Search"
+msgstr "Пребарувај"
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "October"
+msgstr "Октомври"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_order_by_supplier_form
+msgid ""
+"<p>\n"
+"                Here you can see today's orders grouped by suppliers.\n"
+"              </p>\n"
+"              <p>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/terp-call-start.png\"/> to announce "
+"that the order is ordered <br/>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/gtk-apply.png\"/> to announce that "
+"the order is received <br/>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/gtk-cancel.png\"/> to announce that "
+"the order isn't available\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "January"
+msgstr "Јануари"
+
+#. module: lunch
+#: selection:lunch.alert,alter_type:0
+msgid "Specific Day"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,wednesday:0
+msgid "Wednesday"
+msgstr "Среда"
+
+#. module: lunch
+#: view:lunch.product.category:0
+msgid "Product Category: "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,active_to:0
+msgid "And"
+msgstr "И"
+
+#. module: lunch
+#: view:lunch.alert:0
+msgid "Write the message you want to display during the defined period..."
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order.line,state:0
+msgid "Ordered"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order.line,date:0
+msgid "Date Order"
+msgstr "Датум на налогот"
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "Cancel Orders"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_alert
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a lunch alert. \n"
+"            </p>\n"
+"              <p>\n"
+"                Alerts are used to warn employee from possible issues "
+"concerning the lunch orders.\n"
+"                To create a lunch alert you have to define its recurrency, "
+"the time interval during which the alert should be executed and the message "
+"to display.\n"
+"            </p>\n"
+"            <p>\n"
+"                Example: <br/>\n"
+"                - Recurency: Everyday<br/>\n"
+"                - Time interval: from 00h00 am to 11h59 pm<br/>\n"
+"                - Message: \"You must order before 10h30 am\"\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "A cancelled meal should not be paid by employees."
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cash
+msgid "Administrate Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cancel
+msgid "cancel lunch order"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "December"
+msgstr "Декември"
+
+#. module: lunch
+#: view:lunch.cancel:0
+#: view:lunch.order.line:0
+#: view:lunch.order.order:0
+#: view:lunch.validation:0
+msgid "Cancel"
+msgstr "Откажи"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_cashmove
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a payment. \n"
+"            </p>\n"
+"              <p>\n"
+"                Here you can see the employees' payment. A payment is a cash "
+"move from the employee to the company.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:186
+#, python-format
+msgid "Your favorite meals will be created based on your last orders."
+msgstr ""
+
+#. module: lunch
+#: model:ir.module.category,description:lunch.module_lunch_category
+msgid ""
+"Helps you handle your lunch needs, if you are a manager you will be able to "
+"create new products, cashmoves and to confirm or cancel orders."
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_control_accounts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new payment. \n"
+"            </p>\n"
+"              <p>\n"
+"                A cashmove can either be an expense or a payment.<br/>\n"
+"                An expense is automatically created at the order "
+"receipt.<br/>\n"
+"                A payment represents the employee reimbursement to the "
+"company.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,alter_type:0
+msgid "Recurrency"
+msgstr "Повторливост"
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:189
+#, python-format
+msgid "Don't forget the alerts displayed in the reddish area"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,thursday:0
+msgid "Thursday"
+msgstr "Четврток"
+
+#. module: lunch
+#: report:lunch.order.line:0
+msgid "Unit Price"
+msgstr "Единечна цена"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "By User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,product_id:0
+#: field:lunch.product,name:0
+msgid "Product"
+msgstr "Производ"
+
+#. module: lunch
+#: field:lunch.cashmove,description:0
+#: report:lunch.order.line:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr "Опис"
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "May"
+msgstr "Мај"
+
+#. module: lunch
+#: field:lunch.order.line,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr "Цена"
+
+#. module: lunch
+#: field:lunch.cashmove,state:0
+msgid "Is an order or a Payment"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+msgid "New Order"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "cashmove tree"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "Cancel a meal means that we didn't receive it from the supplier."
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "My Account grouped"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: selection:lunch.cashmove,state:0
+msgid "Payment"
+msgstr "Плаќање"
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "February"
+msgstr "Февруари"
+
+#. module: lunch
+#: field:report.lunch.order.line,year:0
+msgid "Year"
+msgstr "Година"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "List"
+msgstr "Листа"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_admin
+msgid "Administrate Orders"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "April"
+msgstr "Април"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Select your order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,order_id:0
+#: selection:lunch.cashmove,state:0
+#: report:lunch.order.line:0
+#: view:lunch.order.line:0
+#: field:lunch.order.line,order_id:0
+msgid "Order"
+msgstr "Нарачка"
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: report:lunch.order.line:0
+msgid "Lunch Order"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid "Are you sure you want to order these meals?"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "cancel order lines"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product_category
+msgid "lunch product category"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,saturday:0
+msgid "Saturday"
+msgstr "Сабота"
+
+#. module: lunch
+#: model:res.groups,name:lunch.group_lunch_manager
+msgid "Manager"
+msgstr "Менаџер"
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "Did your received these meals?"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "Once a meal is received a new cash move is created for the employee."
+msgstr ""
+
+#. module: lunch
+#: view:lunch.product:0
+msgid "Products Tree"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+#: field:lunch.order,total:0
+#: view:lunch.order.line:0
+msgid "Total"
+msgstr "Вкупно"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_tree
+msgid "Previous Orders"
+msgstr ""
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index 84c10e5f295..12abd684c08 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-11 23:55+0000\n"
+"PO-Revision-Date: 2013-03-13 19:40+0000\n"
 "Last-Translator: Davor Bojkić <bole@dajmi5.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-13 04:58+0000\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: point_of_sale
@@ -43,6 +43,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                             Kliknite za "
+"kreiranje nove kategorije.\n"
+"                                                      </p><p>\n"
+"                                                             Kategorije se "
+"koriste za pronalaženje proizvoda kroz \n"
+"                                                             touschcreen "
+"sučelje .\n"
+"                                                      </p><p>\n"
+"                                                              Ako stavite "
+"sliku na kategoriju, prikaz na \n"
+"                                                              touckscreen "
+"sučelju pokazati sliku kategorije. \n"
+"                                                              Savjetujemo da "
+"ne koristite slike kategorija na \n"
+"                                                              malim "
+"(1024x768) ekranima.\n"
+"                                                       </p>\n"
+"            "
 
 #. module: point_of_sale
 #: view:pos.receipt:0
@@ -91,7 +110,7 @@ msgstr "Dnevnik prodaje"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_2l_product_template
 msgid "Spa Reine 2L"
-msgstr ""
+msgstr "Spa Reine 2L"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
@@ -259,7 +278,7 @@ msgstr "Prosječna cijena"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Računovodstvo"
 
 #. module: point_of_sale
 #. openerp-web
@@ -349,6 +368,8 @@ msgid ""
 "Check this if this point of sale should open by default in a self checkout "
 "mode. If unchecked, OpenERP uses the normal cashier mode by default."
 msgstr ""
+"Označite ovje ako se ovaj POS treba zadano otvarati u samonaplatnom načinu "
+"rada. Ako nije označeno, OpenERP koristi normalni način blagajne."
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
@@ -488,7 +509,7 @@ msgstr ") je \""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.Onions_product_template
 msgid "Onions"
-msgstr ""
+msgstr "Luk"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -627,6 +648,28 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                          "
+"Kliknite za otvaranje nove smjene.\n"
+"                                                                         "
+"</p><p>\n"
+"                                                                           "
+"Smjena je period vremena, obično jedan ili pola dana\n"
+"                                                                           "
+"tijekom kojeg se vrši prodaja na POS-u. Korisnik mora \n"
+"                                                                           "
+"provjeriti stanje blagajne na početku i na kraju svake \n"
+"                                                                           "
+"smjene.\n"
+"                                                                        "
+"</p><p>\n"
+"                                                                           "
+"Zapamtite da biste trebali koristiti izbornik <i>Vaša smjena </>\n"
+"                                                                           "
+"za brzo otvaranje nove smjene.\n"
+"                                                                        "
+"</p>\n"
+"            "
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:867
@@ -1947,6 +1990,8 @@ msgid ""
 "Check if, this is a product you can use to put cash into a statement for the "
 "point of sale backend."
 msgstr ""
+"Označite , ukoliko je ovo proizvod koji može koristiti za stavljanje novca u "
+"nalog kroz backend POS-a"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
@@ -2211,7 +2256,7 @@ msgstr "Date Order"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Point of Sale Orders"
-msgstr ""
+msgstr "Nalozi POS-a"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
@@ -2243,6 +2288,23 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                Kliknite za "
+"dodavanje novog proizvoda.\n"
+"                                                             </p><p>\n"
+"                                                                   Morate "
+"definirati proizvod za sve što prodajete kroz\n"
+"                                                                   sučelje "
+"POS-a.\n"
+"                                                              </p><p>\n"
+"                                                                   Ne "
+"zaboravite postaviti cijenu i kategoriju POS-a u kojoj\n"
+"                                                                    bi se "
+"proizvod trebao pojaviti. Ako proizvod nije pridružen \n"
+"                                                                    nijednoj "
+"kategoriji POS-a nije ga moguće prodavati na taj način\n"
+"                                                                 </p>\n"
+"            "
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2505,7 +2567,7 @@ msgstr "Dnevnik prodaje"
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Početni saldo"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -2562,12 +2624,12 @@ msgstr "Aktivan"
 #. module: point_of_sale
 #: field:pos.session,name:0
 msgid "Session ID"
-msgstr ""
+msgstr "ID Smjene"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
 msgid "Pay Order"
-msgstr ""
+msgstr "Naplati naručeno"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -3483,7 +3545,7 @@ msgstr "Ispiši račun"
 #. module: point_of_sale
 #: field:pos.order,pos_reference:0
 msgid "Receipt Ref"
-msgstr ""
+msgstr "Referenca Računa"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
@@ -3559,6 +3621,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                               Kliknite za "
+"kreiranje novog naloga.\n"
+"                                                            </p><p>\n"
+"                                                                   Koristite "
+"ovaj izbornik za pregled vaših računa. Za stvaranje \n"
+"                                                                   novih "
+"računa bolje je koristiti touch screen sučelje korz izbornik\n"
+"                                                                   <i>Vaša "
+"smjena</i>.\n"
+"                                                               </p>\n"
+"            "
 
 #. module: point_of_sale
 #. openerp-web
@@ -3928,6 +4002,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                  Kliknite "
+"za dodavanje načina plaćanja.\n"
+"                                                               </p><p>\n"
+"                                                                     Načini "
+"plaćanja se definiraju označavanjem polja\n"
+"                                                                     <i>POS "
+"način plaćanja</i> u računovodstvenim dnevnicima.\n"
+"                                                                     Da bi "
+"bio dostupan na POS-u korz touch screen sučelje,\n"
+"                                                                     morate "
+"ga postaviti korz konfiguraciju POS-a\n"
+"                                                                </p>\n"
+"            "
 
 #. module: point_of_sale
 #: view:pos.order:0
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index cd88a768e67..3e9b139e736 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-02-17 13:06+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 10:37+0000\n"
+"Last-Translator: wsubuntu <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:55+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -50,7 +50,7 @@ msgstr "Барааны нэр"
 #. module: product
 #: view:product.template:0
 msgid "Second Unit of Measure"
-msgstr "Хоёр дахь хэмжих нэгж"
+msgstr "Хоёрдогч хэмжих нэгж"
 
 #. module: product
 #: help:res.partner,property_product_pricelist:0
@@ -141,7 +141,7 @@ msgstr "Уг үнийн дүрмийн нэрлэлт, тайлбарлалт."
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "Unit of Measure -> UOS Coeff"
-msgstr "Хэмжих нэгж -> х.н-н коэф"
+msgstr "Хэмжих нэгж -> БХН коэф"
 
 #. module: product
 #: field:product.price_list,price_list:0
@@ -507,7 +507,7 @@ msgstr "Тоо хэмжээ-3"
 #. module: product
 #: model:res.groups,name:product.group_product_variant
 msgid "Product Variant (not supported)"
-msgstr ""
+msgstr "Барааны Хувилбар"
 
 #. module: product
 #: field:product.price_list,qty4:0
@@ -634,7 +634,7 @@ msgstr "Савлагааны өргөний хэмжээ"
 #: code:addons/product/product.py:361
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
-msgstr "Ангилалын Хэмжих Нэгж таарахгүй байна!"
+msgstr "Хэмжих нэгжийн ангилалууд нь таарахгүй байна."
 
 #. module: product
 #: model:product.template,name:product.product_product_36_product_template
@@ -830,7 +830,7 @@ msgstr "Гадаад хатуу диск"
 #. module: product
 #: view:product.product:0
 msgid "describe the product characteristics..."
-msgstr ""
+msgstr "барааны шинжүүдийг тайлбарлах..."
 
 #. module: product
 #: help:product.template,standard_price:0
@@ -1373,6 +1373,7 @@ msgstr "Бараа"
 msgid ""
 "Hands free headset for laptop PC with in-line microphone and headphone plug."
 msgstr ""
+"Микрофон болон чихэвчний оролт бүхий зөөврийн компьютерт зориулсан чихэвч"
 
 #. module: product
 #: help:product.packaging,rows:0
@@ -1387,7 +1388,7 @@ msgstr "Суурь үнээс дээш тохируулах хамгийн ба
 #. module: product
 #: field:product.product,name_template:0
 msgid "Template Name"
-msgstr ""
+msgstr "Тэмплэйт Нэр"
 
 #. module: product
 #: field:product.template,weight_net:0
@@ -1419,7 +1420,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 msgid "This note will be displayed on requests for quotation..."
-msgstr ""
+msgstr "Энэ тэмдэглэгээ нь үнийн саналын хүсэлт дээр бичигддэг..."
 
 #. module: product
 #: view:product.product:0
@@ -1445,7 +1446,7 @@ msgstr "Газар дээрх тусламж"
 #. module: product
 #: model:product.template,name:product.product_product_39_product_template
 msgid "Toner Cartridge"
-msgstr ""
+msgstr "Принтерийн хор"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1472,7 +1473,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_43_product_template
 msgid "Zed+ Antivirus"
-msgstr ""
+msgstr "Zed+ Antivirus"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
@@ -1509,7 +1510,7 @@ msgstr "Бохир жин кг-аар."
 #. module: product
 #: model:product.template,name:product.product_product_37_product_template
 msgid "Printer, All-in-one"
-msgstr ""
+msgstr "Олон үйлдэлт принтер"
 
 #. module: product
 #: view:product.template:0
@@ -1519,7 +1520,7 @@ msgstr "Татан авалт"
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Processor AMD 8-Core"
-msgstr ""
+msgstr "AMD 8-Core процессор"
 
 #. module: product
 #: view:product.product:0
@@ -1570,7 +1571,7 @@ msgstr "Эхлэх огноо"
 #. module: product
 #: model:product.template,name:product.product_product_38_product_template
 msgid "Ink Cartridge"
-msgstr ""
+msgstr "Принтерийн бэхэн хор"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
@@ -1661,7 +1662,7 @@ msgstr "Хувилбарын хамгийн сүүлийн зөв огноо"
 #. module: product
 #: model:product.template,name:product.product_product_19_product_template
 msgid "HDD on Demand"
-msgstr ""
+msgstr "Зөөврийн хард диск"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1848,12 +1849,12 @@ msgstr "Бараа, ангиллаар"
 #. module: product
 #: model:product.template,name:product.product_product_16_product_template
 msgid "Computer Case"
-msgstr ""
+msgstr "Процессорын хайрцаг"
 
 #. module: product
 #: model:product.template,name:product.product_product_9_product_template
 msgid "USB Keyboard, AZERTY"
-msgstr ""
+msgstr "USB товчлуур, AZERTY"
 
 #. module: product
 #: help:product.supplierinfo,sequence:0
@@ -1898,7 +1899,7 @@ msgstr "30x40x60 хайрцаг"
 #. module: product
 #: model:product.template,name:product.product_product_47_product_template
 msgid "Switch, 24 ports"
-msgstr ""
+msgstr "24 порт бүхий свич"
 
 #. module: product
 #: selection:product.uom,uom_type:0
@@ -1919,7 +1920,7 @@ msgstr "Дотоод тайлбар"
 #. module: product
 #: model:product.template,name:product.product_product_48_product_template
 msgid "USB Adapter"
-msgstr ""
+msgstr "USB адаптер"
 
 #. module: product
 #: help:product.template,uos_id:0
@@ -1960,7 +1961,7 @@ msgstr "Компани"
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Laptop S3450"
-msgstr ""
+msgstr "Гар компьютер S3450"
 
 #. module: product
 #: view:product.product:0
@@ -2022,7 +2023,7 @@ msgstr "Бүрэлдэхүүнүүд"
 #. module: product
 #: view:product.product:0
 msgid "e.g. 5901234123457"
-msgstr ""
+msgstr "5901234123457 гэх мэт"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
@@ -2133,7 +2134,7 @@ msgstr "* ( 1 + "
 #. module: product
 #: model:product.template,name:product.product_product_31_product_template
 msgid "Multimedia Speakers"
-msgstr ""
+msgstr "Мултимедиа өсгөгчүүд"
 
 #. module: product
 #: field:product.product,message_follower_ids:0
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index 6b6e52bd280..789d028385a 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-13 00:01+0000\n"
+"PO-Revision-Date: 2013-03-13 10:05+0000\n"
 "Last-Translator: Davor Bojkić <bole@dajmi5.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-13 04:58+0000\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project
@@ -28,6 +28,8 @@ msgid ""
 "If checked, this contract will be available in the project menu and you will "
 "be able to manage tasks or track issues"
 msgstr ""
+"Ako je označeno, ovaj ugovor će biti dostupan u izborniku Projekata i biti "
+"će omogućeno upravljanje zadacima ili problemima"
 
 #. module: project
 #: field:project.project,progress_rate:0
@@ -75,7 +77,7 @@ msgstr "Dan"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Merge"
-msgstr "Stopi"
+msgstr "Spoji"
 
 #. module: project
 #: view:res.partner:0
@@ -186,11 +188,14 @@ msgid ""
 "users. You can analyse the quantities of tasks, the hours spent compared to "
 "the planned hours, the average number of days to open or close a task, etc."
 msgstr ""
+"Ovaj izvještaj omogućuje vam analizu  učinka po projektima i korisnicima. "
+"Možete analizirati količine na zadacima, utrošene sate u odnosu na "
+"planirane, prosječan broj dana do zatvaranja zadatka isl."
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Ovjera naslova zadatka"
 
 #. module: project
 #: model:res.groups,name:project.group_delegate_task
@@ -311,6 +316,8 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Članovi projekta su korisnici koji mogu pristupiti zadacima vezanim na "
+"projekt."
 
 #. module: project
 #: view:project.project:0
@@ -330,7 +337,7 @@ msgstr "Status"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: project
 #: view:project.project:0
@@ -341,17 +348,17 @@ msgstr "Ime Projekta"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: project
 #: view:project.task:0
 msgid "Gantt View"
-msgstr ""
+msgstr "Gantogram"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -359,6 +366,8 @@ msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Suma svih sati utrošenih na svim zadacima povezanim na ovaj projekt i "
+"njegove podprojekte."
 
 #. module: project
 #: help:project.project,active:0
@@ -366,6 +375,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Ako je polje Aktivan postavljeno na NE, omogućeno vam je sakrivanje projekta "
+"bez brisanja."
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -376,23 +387,24 @@ msgstr "Kada je zadatak izvršen, doći će u stanje \"Gotovo\""
 #: field:project.project,message_summary:0
 #: field:project.task,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sažetak"
 
 #. module: project
 #: view:project.task:0
 msgid "Task summary..."
-msgstr ""
+msgstr "Sažetak zadatka..."
 
 #. module: project
 #: view:project.project:0
 msgid "Append this project to another one using analytic accounts hierarchy"
 msgstr ""
+"Nastavi ovaj projekt na neki drugi koristeći hijerarhiju analitičkih konta"
 
 #. module: project
 #: view:project.task:0
 #: view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Zadaci u tijeku"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -401,9 +413,9 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
-"Ovo će postaviti jedinicu mjere koja se koristi u projektima i zadacima. "
-"Koristite li Raspored povezan s Projektima (Project Timesheet Module), ne "
-"zaboravite postaviti jedinice mjerenja."
+"Ovo će postavitijedinicu mjere korištenu u projektima i zadacima.\n"
+"Ukoliko koristite raspored povezan na projekte (project_timesheet module), "
+"ne zaboravite postaviti ispravnu jedinicu mjere na vašim zaposlenicima."
 
 #. module: project
 #: field:project.task,user_id:0
@@ -415,12 +427,12 @@ msgstr "Dodijeljeno"
 #: code:addons/project/project.py:1021
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Potrebno je navesti korisnika kojem se delegira"
 
 #. module: project
 #: view:project.project:0
 msgid "Project(s) Manager"
-msgstr ""
+msgstr "Voditelj projekta"
 
 #. module: project
 #: selection:project.project,state:0
@@ -446,23 +458,23 @@ msgstr "Radno Vrijeme"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "Ponovo procijeni zadatak"
 
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
-msgstr ""
+msgstr "Ovjeri planirano vrijeme"
 
 #. module: project
 #: field:project.config.settings,module_pad:0
 msgid "Use integrated collaborative note pads on task"
-msgstr ""
+msgstr "Koristi integrirane zabilješke na zadacima"
 
 #. module: project
 #: model:mail.message.subtype,name:project.mt_project_task_blocked
 #: model:mail.message.subtype,name:project.mt_task_blocked
 msgid "Task Blocked"
-msgstr ""
+msgstr "Zadatak blokiran"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -472,7 +484,7 @@ msgstr "Kodiraj radne sate"
 #. module: project
 #: field:project.project,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: project
 #: view:project.task:0
@@ -482,52 +494,52 @@ msgstr ""
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_blocked
 msgid "Task blocked"
-msgstr ""
+msgstr "Zadatak blokiran"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
-msgstr ""
+msgstr "Delegiranje"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: project
 #: view:project.task:0
 msgid "Add a Description..."
-msgstr ""
+msgstr "Dodaj opis"
 
 #. module: project
 #: view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "za promjenu u stanje Otvoreno"
 
 #. module: project
 #: view:project.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Primjeni"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Delegirani zadatak"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "Ponovo uključi opis zadatka u zadatku za korisnika"
 
 #. module: project
 #: view:project.project:0
 msgid "Project Settings"
-msgstr ""
+msgstr "Postavke projekata"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Moji zadaci"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -537,7 +549,7 @@ msgstr "Otvori Gotov Zadatak"
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr "Sati za procjenu"
+msgstr "Sati za ovjeru"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -550,7 +562,7 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: project
 #: view:board.board:0
@@ -563,7 +575,7 @@ msgstr "Moji Zadaci"
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -579,7 +591,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dana za otvaranje"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
@@ -590,7 +602,7 @@ msgstr "Vrlo hitno"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "Korisnik kojem želite delegirati ovaj zadatak"
 
 #. module: project
 #: view:project.project:0
@@ -612,7 +624,7 @@ msgstr "Zadatak"
 #. module: project
 #: help:project.config.settings,group_tasks_work_on_tasks:0
 msgid "Allows you to compute work on tasks."
-msgstr ""
+msgstr "Dozvoljava izračun radova na zadacima."
 
 #. module: project
 #: view:project.project:0
@@ -622,7 +634,7 @@ msgstr "Administracija"
 #. module: project
 #: field:project.config.settings,group_tasks_work_on_tasks:0
 msgid "Log work activities on tasks"
-msgstr ""
+msgstr "Bilježenje aktivnosti na zadacima"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
@@ -633,17 +645,17 @@ msgstr "Analiza"
 #: field:project.task,name:0
 #: field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "Sažetak zadatka"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Nije predložak zadatka"
 
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
-msgstr ""
+msgstr "Inicijalno planirani sati"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -682,22 +694,22 @@ msgstr "Planiranje"
 #: field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr "Rok"
+msgstr "Krajnji rok"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Spremno"
 
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Novi zadaci"
 
 #. module: project
 #: field:project.config.settings,module_project_issue_sheet:0
 msgid "Invoice working time on issues"
-msgstr ""
+msgstr "Fakturiranje radnih sati na problemima"
 
 #. module: project
 #: view:project.project:0
@@ -705,12 +717,12 @@ msgstr ""
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
-msgstr ""
+msgstr "Specifikacija"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -720,7 +732,7 @@ msgstr "Iz stanja Nacrta, doći će u stanje Otvoreno"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Analiza zadataka"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -731,12 +743,12 @@ msgstr "Novi Opis Zadatka"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Prekoračen rok"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Novi zadaci"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -752,12 +764,12 @@ msgstr "Ukupno vrijeme"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: project
 #: view:project.project:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Razno"
 
 #. module: project
 #: view:project.task:0
@@ -765,12 +777,12 @@ msgstr ""
 #: field:project.task.history,type_id:0
 #: field:project.task.history.cumulative,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Faza"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr "Skiciraj otvoreni zadatak"
+msgstr "Otovoreni zadatak u stanju nacrta"
 
 #. module: project
 #: field:project.project,alias_model:0
@@ -780,33 +792,33 @@ msgstr ""
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Broj dana do zatvaranja zadatka"
 
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Moja ploča"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
 msgid "Stages"
-msgstr ""
+msgstr "Faze"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "Delete"
-msgstr ""
+msgstr "Briši"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "u tijeku"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
@@ -816,7 +828,7 @@ msgstr "Hitno"
 #. module: project
 #: model:project.category,name:project.project_category_02
 msgid "Feature request"
-msgstr ""
+msgstr "Zahtjev za svojstvom"
 
 #. module: project
 #: view:project.task:0
@@ -826,29 +838,29 @@ msgstr "Delegirani Zadaci"
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Rad na zadatnu projekta"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "PROVJERI: %s"
 
 #. module: project
 #: view:project.project:0
 msgid "Close Project"
-msgstr ""
+msgstr "Zatvori projekt"
 
 #. module: project
 #: field:project.project,tasks:0
 msgid "Task Activities"
-msgstr ""
+msgstr "Aktivnosti na zadatku"
 
 #. module: project
 #: field:project.project,effective_hours:0
 #: field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr "Vrijeme Provedeno"
+msgstr "Utrošeno vrijeme"
 
 #. module: project
 #: view:project.project:0
@@ -859,13 +871,13 @@ msgstr ""
 #. module: project
 #: field:account.analytic.account,company_uom_id:0
 msgid "unknown"
-msgstr ""
+msgstr "nepoznat"
 
 #. module: project
 #: field:project.project,message_is_follower:0
 #: field:project.task,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Pratitelj"
 
 #. module: project
 #: field:project.task.history,date:0
@@ -877,7 +889,7 @@ msgstr "Datum"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Prošireni filteri..."
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks_config
@@ -887,7 +899,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Project Stages"
-msgstr ""
+msgstr "Faze projekta"
 
 #. module: project
 #: help:project.task,state:0
@@ -898,21 +910,25 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"Status je postavljen na 'Nacrt' kada je kreiran slučaj. Kada je slučaj u "
+"tijeku status se mijenja u 'Otvoreno', Kad je slujčaj završen, status "
+"prelazi u 'Učinjeno'. Ukoliko slučaj treba biti ponovo pregledan, status "
+"prelazi u 'Na čekanju'"
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Organizacije"
 
 #. module: project
 #: field:project.task.type,fold:0
 msgid "Folded by Default"
-msgstr ""
+msgstr "Zatvoreno (zadano)"
 
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr "Izvršeni rad"
+msgstr "Posao je gotov"
 
 #. module: project
 #: help:project.config.settings,module_project_issue:0
@@ -920,6 +936,9 @@ msgid ""
 "Provides management of issues/bugs in projects.\n"
 "                This installs the module project_issue."
 msgstr ""
+"Pruža mogućnost upravljanja problemima/bugovima u projektu.\n"
+"                                                        Ovo instalira modul "
+"project_issue."
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -939,7 +958,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Cancel Project"
-msgstr ""
+msgstr "Otkaži projekt"
 
 #. module: project
 #: help:project.project,analytic_account_id:0
@@ -964,7 +983,7 @@ msgstr "Otkaži"
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
-msgstr ""
+msgstr "Ostale informacije"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -983,6 +1002,8 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Suma utročenih sati na svim zadacima vezanim na ovaj projekt i njegove "
+"podprojekte."
 
 #. module: project
 #: view:project.project:0
@@ -990,22 +1011,24 @@ msgid ""
 "Follow this project to automatically track the events associated to tasks "
 "and issues of this project."
 msgstr ""
+"Pratite ovaj projekt da automatsko opaćanje događaja povezanih na zadatke i "
+"probleme ovog projekta."
 
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Korisnici"
 
 #. module: project
 #: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "Stanje izmjenjeno"
 
 #. module: project
 #: view:project.project:0
 #: model:res.groups,name:project.group_project_manager
 msgid "Manager"
-msgstr ""
+msgstr "Voditelj"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.project_category_action
@@ -1019,51 +1042,51 @@ msgstr ""
 #. module: project
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Task Stages"
-msgstr ""
+msgstr "Faze zadatka"
 
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Ponovo procijeni zadatak"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Faza zadatka"
 
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Uobičajeno"
 
 #. module: project
 #: help:project.project,message_ids:0
 #: help:project.task,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Poruke i povijest komunikacije"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "To invoice or setup invoicing and renewal options, go to the related "
 "contract:"
-msgstr ""
+msgstr "Za fakturiranje i postavke onavljanja, otvorite povezani ugovor:"
 
 #. module: project
 #: field:project.task.delegate,state:0
 msgid "Validation State"
-msgstr "Stanje Vrednovanja"
+msgstr "Statuis ovjere"
 
 #. module: project
 #: field:project.task.work,name:0
@@ -1075,7 +1098,7 @@ msgstr "Sižetak rada"
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: project
 #: view:project.project:0
@@ -1086,17 +1109,18 @@ msgstr "Predložak"
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Ponovno otvori projekt"
 
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Daje redoslje prikaza prilikom prikazivanja popisa projekata"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
 
 #. module: project
 #: field:project.project,members:0
@@ -1114,13 +1138,13 @@ msgstr "Delegirani Zadaci"
 #: view:project.task:0
 #: field:project.task,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Nepročitane poruke"
 
 #. module: project
 #: view:project.task:0
 #: field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Nadređeni zadaci"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1130,7 +1154,7 @@ msgstr "Otvorite zadatak"
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Faze zajedničke svim projektima"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
@@ -1140,7 +1164,7 @@ msgstr "Skica zadatka"
 #. module: project
 #: field:project.task,notes:0
 msgid "Notes"
-msgstr "Bilješke"
+msgstr "Zabilješke"
 
 #. module: project
 #: view:project.task:0
@@ -1151,12 +1175,12 @@ msgstr "Zadaci na čekanju"
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Prikaži samo zadatke koji imaju krajnji rok"
 
 #. module: project
 #: model:project.category,name:project.project_category_04
 msgid "Usability"
-msgstr ""
+msgstr "Iskoristivost"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1173,7 +1197,7 @@ msgstr "izvršio"
 #: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Neispravna akcija!"
 
 #. module: project
 #: help:project.task.type,state:0
@@ -1182,6 +1206,9 @@ msgid ""
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
 msgstr ""
+"Status vašeg dokumenta je automatski izmjenjen ovisno o odabranoj fazi. Na "
+"primjer, ako je faza povezana sa stanjem 'Zatvori' kada vaš dokument dođe u "
+"ovu fazu, automatski je zatvoren."
 
 #. module: project
 #: view:project.task:0
@@ -1191,29 +1218,29 @@ msgstr "Dodatne informacije"
 #. module: project
 #: view:project.task:0
 msgid "Edit..."
-msgstr ""
+msgstr "Uredi ..."
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "# zadataka"
 
 #. module: project
 #: field:project.project,doc_count:0
 msgid "Number of documents attached"
-msgstr ""
+msgstr "Broj pridruženih dokumenata"
 
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritet"
 
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Otvoreni projekti"
 
 #. module: project
 #: help:project.project,alias_id:0
@@ -1222,6 +1249,9 @@ msgid ""
 "automatically synchronizedwith Tasks (or optionally Issues if the Issue "
 "Tracker module is installed)."
 msgstr ""
+"Interni email pridružen ovom projektu. Dolazni mailovi su automatski "
+"sinhronizirani sa zadacima (ili opcionalno Problemima ukoliko je pratitelj "
+"problema instaliran)"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -1249,19 +1279,19 @@ msgstr "Računa se kao: Utrošeno vrijeme + Preostalo vrijeme"
 #: code:addons/project/project.py:709
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopija)"
 
 #. module: project
 #: model:mail.message.subtype,name:project.mt_project_task_stage
 msgid "Task Stage Changed"
-msgstr ""
+msgstr "Stanje zadatka izmjenjeno"
 
 #. module: project
 #: view:project.task:0
 #: field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Preostalo vrijeme"
 
 #. module: project
 #: field:project.task.delegate,name:0
@@ -1271,7 +1301,7 @@ msgstr "Delegirani naslov"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
@@ -1286,22 +1316,22 @@ msgstr "Odgodi u satima"
 #. module: project
 #: view:project.task.type:0
 msgid "Add a description..."
-msgstr ""
+msgstr "Dodaj opis..."
 
 #. module: project
 #: view:project.project:0
 msgid "Team"
-msgstr ""
+msgstr "Tim"
 
 #. module: project
 #: help:project.config.settings,time_unit:0
 msgid "This will set the unit of measure used in projects and tasks."
-msgstr ""
+msgstr "Ovo će postaviti jedinice mjere korištene u projektima i zadacima."
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Veoma važno"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1312,12 +1342,12 @@ msgstr "Mjesec"
 #. module: project
 #: model:project.task.type,name:project.project_tt_design
 msgid "Design"
-msgstr ""
+msgstr "Dizajn"
 
 #. module: project
 #: view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: project
 #: view:project.task:0
@@ -1326,7 +1356,7 @@ msgstr ""
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Blokiran"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1334,26 +1364,28 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Ukoliko zadatak ima napredan od 99,99% trebali bi ga zatvoriti ili ponovo "
+"procijeniti vrijeme."
 
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Korisnikov email"
 
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Naslov važeg ovjerenog zadatka"
 
 #. module: project
 #: field:project.config.settings,time_unit:0
 msgid "Working time unit"
-msgstr ""
+msgstr "Jedinica radnog vremena"
 
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projekti kojih sam član"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1364,7 +1396,7 @@ msgstr "Nisko"
 #. module: project
 #: selection:project.project,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Zatvoreno"
 
 #. module: project
 #: view:project.project:0
@@ -1386,13 +1418,13 @@ msgstr "Na čekanju"
 #: view:project.category:0
 #: field:project.task,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Oznake"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Povijest zadataka"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1404,7 +1436,7 @@ msgstr ""
 #. module: project
 #: help:project.config.settings,group_manage_delegation_task:0
 msgid "Allows you to delegate tasks to other users."
-msgstr ""
+msgstr "Omogućuje delegiranje zadataka korisnicima."
 
 #. module: project
 #: field:project.project,active:0
@@ -1414,7 +1446,7 @@ msgstr "Aktivan"
 #. module: project
 #: model:ir.model,name:project.model_project_category
 msgid "Category of project's task, issue, ..."
-msgstr ""
+msgstr "Kategorije projektnih zadataka, problema,..."
 
 #. module: project
 #: help:project.project,resource_calendar_id:0
@@ -1427,16 +1459,18 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Izračunato kao razlika između planiranih sati voditelja projekta i ukupno "
+"provedenih sati na zadatku."
 
 #. module: project
 #: view:project.config.settings:0
 msgid "Helpdesk & Support"
-msgstr ""
+msgstr "Helpdesk i podrška"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Broj dana do otvaranja zadatka"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1456,12 +1490,12 @@ msgstr ""
 #: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
-msgstr ""
+msgstr "Privitci"
 
 #. module: project
 #: view:project.category:0
 msgid "Issue Version"
-msgstr ""
+msgstr "Verize problema"
 
 #. module: project
 #: code:addons/project/project.py:182
@@ -1470,6 +1504,8 @@ msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
 "project's tasks and then delete the project or simply deactivate the project."
 msgstr ""
+"Nije moguće brisati projekt koji sadrži zadatke. Ili obrišite sve zadatke u "
+"projektu i onda obrišite projekt, ili jednostavno deaktivirajte projekt."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1480,7 +1516,7 @@ msgstr "Otvori"
 #. module: project
 #: field:project.project,privacy_visibility:0
 msgid "Privacy / Visibility"
-msgstr ""
+msgstr "Privatnost / vidljivost"
 
 #. module: project
 #: view:project.task:0
@@ -1494,28 +1530,28 @@ msgstr "Preostali Sati"
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "Stanje izmjenjeno"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Pogreška! Datum završetka zadatka mora biti veći od datuma početka."
 
 #. module: project
 #: field:project.task.history,user_id:0
 #: field:project.task.history.cumulative,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odgovoran"
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Traži projekt"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Delegated Task"
-msgstr "Delegirani Zadaci"
+msgstr "Delegirani zadatak"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1531,7 +1567,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Razvoj"
 
 #. module: project
 #: help:project.task,active:0
@@ -1540,6 +1576,9 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Ovo polje je automatski izračunato i ima isto ponašanje kao i polje "
+"'aktivan': ako je zadatak povezan na predložak ili deaktivirani projekt, on "
+"će bitii sakriven osim ako se specifično ne traži suprotno."
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
@@ -1563,12 +1602,12 @@ msgstr ""
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Prekoračeni zadaci"
 
 #. module: project
 #: code:addons/project/project.py:932
@@ -1577,21 +1616,23 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Podreženi zadatak je još otvoren.\n"
+"Molimo prvo otkažite ili zatvorite podređeni zadatak."
 
 #. module: project
 #: field:project.task.delegate,user_id:0
 msgid "Assign To"
-msgstr "Dodijeli"
+msgstr "Dodjeljen"
 
 #. module: project
 #: model:res.groups,name:project.group_time_work_estimation_tasks
 msgid "Time Estimation on Tasks"
-msgstr ""
+msgstr "Procjena vremena na zadacima"
 
 #. module: project
 #: field:project.task,total_hours:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1601,12 +1642,12 @@ msgstr "Delegirajte zadatak drugom korisniku."
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_started
 msgid "Task started"
-msgstr ""
+msgstr "Zadatak započet"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Unesite ovdje preostale sate potrebne da se završi zadatak."
 
 #. module: project
 #: help:project.task.type,fold:0
@@ -1618,7 +1659,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Krajnji rokovi"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:69
@@ -1627,13 +1668,13 @@ msgstr ""
 #: code:addons/project/wizard/project_task_delegate.py:78
 #, python-format
 msgid "CHECK: "
-msgstr ""
+msgstr "PROVJERI : "
 
 #. module: project
 #: code:addons/project/project.py:432
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Morate dodijeliti članove projektu '%s' !"
 
 #. module: project
 #: view:project.project:0
@@ -1643,12 +1684,12 @@ msgstr "Projekti na čekanju"
 #. module: project
 #: view:project.task:0
 msgid "Remaining"
-msgstr ""
+msgstr "Preostalo"
 
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr "Progres (%)"
+msgstr "Napredak (%="
 
 #. module: project
 #: field:project.task,company_id:0
@@ -1656,7 +1697,7 @@ msgstr "Progres (%)"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr "Tvrtka"
+msgstr "Organizacija"
 
 #. module: project
 #: help:project.config.settings,module_project_timesheet:0
@@ -1672,17 +1713,17 @@ msgstr ""
 #. module: project
 #: field:project.config.settings,module_project_issue:0
 msgid "Track issues and bugs"
-msgstr ""
+msgstr "Praćenje problema i bugova"
 
 #. module: project
 #: field:project.config.settings,module_project_mrp:0
 msgid "Generate tasks from sale orders"
-msgstr ""
+msgstr "Generiraj zadatke iz prodajnih naloga"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Važno"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -1693,13 +1734,13 @@ msgstr "Odredite zahtjeve i postavite planirane sate."
 #: field:project.project,message_ids:0
 #: field:project.task,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Poruke"
 
 #. module: project
 #: field:project.project,color:0
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Indeks boje"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
@@ -1726,7 +1767,7 @@ msgstr "Projekt"
 #: selection:project.task.type,state:0
 #: selection:report.project.task.user,state:0
 msgid "Cancelled"
-msgstr "Poništeno"
+msgstr "Otkazano"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.act_project_project_2_project_task_all
@@ -1747,34 +1788,34 @@ msgstr ""
 #: field:project.task,date_end:0
 #: field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: project
 #: field:project.task.type,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Povezani status"
 
 #. module: project
 #: view:project.project:0
 msgid "Documents"
-msgstr ""
+msgstr "Dokumenti"
 
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_new
 msgid "Task created"
-msgstr ""
+msgstr "Zadatak kreiran"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "# dana"
 
 #. module: project
 #: field:project.project,message_follower_ids:0
 #: field:project.task,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Pratitelji"
 
 #. module: project
 #: selection:project.project,state:0
@@ -1785,13 +1826,13 @@ msgstr ""
 #: selection:project.task.type,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Novi"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Kumulativni tok"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1812,7 +1853,7 @@ msgstr "Zadatak vrednovanja"
 #. module: project
 #: field:project.config.settings,module_project_long_term:0
 msgid "Manage resources planning on gantt view"
-msgstr ""
+msgstr "Upravljanje resursima na gantogramu"
 
 #. module: project
 #: view:project.task:0
@@ -1826,16 +1867,18 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Suma planiranih sati svih zadataka povezanih na ovaj projekt i njegove "
+"podprojekte"
 
 #. module: project
 #: view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Za izmjenu u stanje 'Učinjeno'"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Moj zadatak"
 
 #. module: project
 #: view:project.task:0
@@ -1847,7 +1890,7 @@ msgstr "Moji Projekti"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Zadaje redosljed za prikaz popisa zadataka."
 
 #. module: project
 #: field:project.task,date_start:0
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index d68093f11e2..9e5e169bb33 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-02 07:42+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 10:32+0000\n"
+"Last-Translator: wsubuntu <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 05:59+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -1326,7 +1326,7 @@ msgstr "Уншаагүй Зурвасууд"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "Unit of Measure Categories"
-msgstr "Ангилалын Хэмжих Нэгж"
+msgstr "Хэмжих Нэгжийн Ангилалууд"
 
 #. module: purchase
 #: view:purchase.order:0
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index 3381d2ed079..f2f53ab8c7c 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-02-26 09:40+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 10:20+0000\n"
+"Last-Translator: wsubuntu <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 06:01+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
@@ -249,7 +249,7 @@ msgstr "Буруу өгөгдөл"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Cancel Line"
-msgstr ""
+msgstr "Захиалгын Мөрийг Цуцлах"
 
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
@@ -410,7 +410,7 @@ msgstr "Худал"
 #. module: sale
 #: view:sale.order:0
 msgid "Terms and conditions..."
-msgstr ""
+msgstr "Гэрээний нөхцлүүд..."
 
 #. module: sale
 #: help:sale.advance.payment.inv,advance_payment_method:0
@@ -1610,7 +1610,7 @@ msgstr "Миний Борлуулалтын Захиалгын Мөрүүд"
 #. module: sale
 #: view:sale.order:0
 msgid "Cancel Quotation"
-msgstr ""
+msgstr "Үнийн санал Цуцлах"
 
 #. module: sale
 #: field:sale.order,message_follower_ids:0
@@ -1717,6 +1717,8 @@ msgstr ""
 #, python-format
 msgid "There is no default shop for the current user's company!"
 msgstr ""
+"Идэвхтэй байгаа хэрэглэгчийн компанид дэлгүүрийн анхны утга "
+"тодорхойлогдоогүй байна."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
diff --git a/addons/sale_stock/i18n/mn.po b/addons/sale_stock/i18n/mn.po
index a63a49600c7..8d51fe04ae5 100644
--- a/addons/sale_stock/i18n/mn.po
+++ b/addons/sale_stock/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2013-03-04 12:07+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 09:58+0000\n"
+"Last-Translator: wsubuntu <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 06:02+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -80,7 +80,7 @@ msgstr "Батлах"
 #. module: sale_stock
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Захиалга Цуцлах"
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:207
@@ -177,7 +177,7 @@ msgstr "Нөхөн дүүргэлтийн захиалга"
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.res_partner_rule_children
 msgid "Contact Details"
-msgstr ""
+msgstr "Холбоо барих мэдээлэл"
 
 #. module: sale_stock
 #: selection:sale.config.settings,default_order_policy:0
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index 5a7c7ef5d32..7196766a872 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-02 09:51+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2013-03-13 10:30+0000\n"
+"Last-Translator: wsubuntu <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-08 06:03+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n"
+"X-Generator: Launchpad (build 16532)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -167,7 +167,7 @@ msgstr "Бэлтгэх Жагсаалт"
 #. module: stock
 #: view:stock.inventory:0
 msgid "e.g. Annual inventory"
-msgstr ""
+msgstr "Жилийн тооллого гэх мэт"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -722,7 +722,7 @@ msgstr "Захиалга(Эх сурвалж)"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
 msgid "Unit of Measure Categories"
-msgstr "Ангилалын Хэмжих Нэгж"
+msgstr "Хэмжих Нэгжийн Ангилалууд"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -873,7 +873,7 @@ msgstr "Татан авалтын байрлал"
 #. module: stock
 #: view:stock.picking:0
 msgid "e.g. PO0032"
-msgstr ""
+msgstr "PO0032 гэх мэт"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
@@ -2914,7 +2914,7 @@ msgstr "Тооллого цуцлах"
 #. module: stock
 #: view:stock.move:0
 msgid "Cancel Move"
-msgstr ""
+msgstr "Хөдөлгөөнийг Цуцлах"
 
 #. module: stock
 #: code:addons/stock/stock.py:2246
@@ -2970,7 +2970,7 @@ msgstr "Барааны тайлан серийн дугаараар"
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Transfer"
-msgstr ""
+msgstr "Шилжилтийг Цуцлах"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0

From f5a5e326a4a2853364b6ae4b3b28e3121354d37e Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Thu, 14 Mar 2013 11:09:47 +0100
Subject: [PATCH 42/43] [FIX]auth_signup: rewording reset password, which is
 not a reset password actually

bzr revid: dle@openerp.com-20130314100947-infr7ew5h3r4xt3w
---
 addons/auth_signup/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml
index be9942feac2..27559ea5198 100644
--- a/addons/auth_signup/res_users_view.xml
+++ b/addons/auth_signup/res_users_view.xml
@@ -21,7 +21,7 @@
                 <!-- add Reset Password button -->
                 <xpath expr="//div[@class='oe_right oe_button_box']" position="replace">
                     <div class="oe_right oe_button_box">
-                        <button string="Send reset password instructions by email"
+                        <button string="Send invitation to connect by email"
                                 type="object" name="action_reset_password" />
                     </div>
                 </xpath>

From 1b8891dd955c3789754e9b2b450732097e0cbf1c Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Thu, 14 Mar 2013 11:30:17 +0100
Subject: [PATCH 43/43] [Revert]auth_signup: should be done here

bzr revid: dle@openerp.com-20130314103017-g0dps4lx151unu6o
---
 addons/auth_signup/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml
index 27559ea5198..be9942feac2 100644
--- a/addons/auth_signup/res_users_view.xml
+++ b/addons/auth_signup/res_users_view.xml
@@ -21,7 +21,7 @@
                 <!-- add Reset Password button -->
                 <xpath expr="//div[@class='oe_right oe_button_box']" position="replace">
                     <div class="oe_right oe_button_box">
-                        <button string="Send invitation to connect by email"
+                        <button string="Send reset password instructions by email"
                                 type="object" name="action_reset_password" />
                     </div>
                 </xpath>