openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01188
[Merge] lp:~openerp-dev/openobject-addons/ssi-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1
Harry (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/ssi-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
Requested reviews:
Numérigraphe (numerigraphe)
Harry (Open ERP) (hmo-tinyerp)
Related bugs:
#635705 [v6][trunk] Calendars collection not linked when creating a new one
https://bugs.launchpad.net/bugs/635705
#673050 Schedule a meeting is not linked with the associated partner
https://bugs.launchpad.net/bugs/673050
#674411 undefined search screen on m2o "Stages"
https://bugs.launchpad.net/bugs/674411
#680577 Warning message about UL can't be translated in sale
https://bugs.launchpad.net/bugs/680577
Hello,
1)Pot file updated
2)few changes in py
Kindly review
Thanks
ssi
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~openerp-dev/openobject-addons/ssi-dev-addons1/+merge/43417
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/ssi-dev-addons1.
=== modified file 'account/account.py'
--- account/account.py 2010-11-26 16:13:59 +0000
+++ account/account.py 2010-12-11 04:13:59 +0000
@@ -103,9 +103,8 @@
required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be threated."""),
'value_amount': fields.float('Value Amount', help="For Value percent enter % ratio between 0-1."),
- 'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
- "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
- 'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
+ 'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month.If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
+ 'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month.Set 0 for net days (otherwise it's based on the beginning of the month)."),
'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True),
}
_defaults = {
@@ -353,13 +352,9 @@
('liquidity','Liquidity'),
('consolidation', 'Consolidation'),
('closed', 'Closed'),
- ], 'Internal Type', required=True, help="This type is used to differentiate types with "\
- "special effects in OpenERP: view can not have entries, consolidation are accounts that "\
- "can have children accounts for multi-company consolidations, payable/receivable are for "\
- "partners accounts (for debit/credit computations), closed for depreciated accounts."),
+ ], 'Internal Type', required=True, help="This type is used to differentiate types with special effects in OpenERP: view can not have entries, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for depreciated accounts."),
'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
- help="These types are defined according to your country. The type contains more information "\
- "about the account and its specificities."),
+ help="These types are defined according to your country. The type contains more information about the account and its specificities."),
'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade', domain=[('type','=','view')]),
'child_parent_ids': fields.one2many('account.account','parent_id','Children'),
'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
@@ -380,11 +375,7 @@
'parent_right': fields.integer('Parent Right', select=1),
'currency_mode': fields.selection([('current', 'At Date'), ('average', 'Average Rate')], 'Outgoing Currencies Rate',
help=
- 'This will select how the current currency rate for outgoing transactions is computed. '\
- 'In most countries the legal method is "average" but only a few software systems are able to '\
- 'manage this. So if you import from another software system you may have to use the rate at date. ' \
- 'Incoming transactions always use the rate at date.', \
- required=True),
+ 'This will select how the current currency rate for outgoing transactions is computed.In most countries the legal method is "average" but only a few software systems are able to manage this. So if you import from another software system you may have to use the rate at date.Incoming transactions always use the rate at date.', required=True),
'level': fields.function(_get_level, string='Level', method=True, store=True, type='integer'),
}
@@ -418,10 +409,10 @@
return True
_constraints = [
- (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
+ (_check_recursion, 'Error! You can not create recursive accounts.', ['parent_id'])
]
_sql_constraints = [
- ('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company !')
+ ('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company!')
]
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
if not args:
@@ -496,14 +487,14 @@
if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
if method == 'write':
- raise osv.except_osv(_('Error !'), _('You cannot deactivate an account that contains account moves.'))
+ raise osv.except_osv(_('Error!'), _('You cannot deactivate an account that contains account moves.'))
elif method == 'unlink':
- raise osv.except_osv(_('Error !'), _('You cannot remove an account which has account entries!. '))
+ raise osv.except_osv(_('Error!'), _('You cannot remove an account which has account entries!.'))
#Checking whether the account is set as a property to any Partner or not
value = 'account.account,' + str(ids[0])
partner_prop_acc = self.pool.get('ir.property').search(cr, uid, [('value_reference','=',value)], context=context)
if partner_prop_acc:
- raise osv.except_osv(_('Warning !'), _('You cannot remove/deactivate an account which is set as a property to any Partner.'))
+ raise osv.except_osv(_('Warning!'), _('You cannot remove/deactivate an account which is set as a property to any Partner.'))
return True
def _check_allow_type_change(self, cr, uid, ids, new_type, context=None):
@@ -615,8 +606,8 @@
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
_sql_constraints = [
- ('code_company_uniq', 'unique (code, company_id)', 'The code of the journal must be unique per company !'),
- ('name_company_uniq', 'unique (name, company_id)', 'The name of the journal must be unique per company !'),
+ ('code_company_uniq', 'unique (code, company_id)', 'The code of the journal must be unique per company!'),
+ ('name_company_uniq', 'unique (name, company_id)', 'The name of the journal must be unique per company!'),
]
_order = 'code'
@@ -785,7 +776,7 @@
return True
_constraints = [
- (_check_duration, 'Error! The duration of the Fiscal Year is invalid. ', ['date_stop']),
+ (_check_duration, 'Error! The duration of the Fiscal Year is invalid.', ['date_stop']),
(_check_fiscal_year, 'Error! You cannot define overlapping fiscal years',['date_start', 'date_stop'])
]
@@ -817,7 +808,7 @@
ids = self.search(cr, uid, [('date_start', '<=', dt), ('date_stop', '>=', dt)])
if not ids:
if exception:
- raise osv.except_osv(_('Error !'), _('No fiscal year defined for this date !\nPlease create one.'))
+ raise osv.except_osv(_('Error!'), _('No fiscal year defined for this date! Please create one.'))
else:
return False
return ids[0]
@@ -880,8 +871,8 @@
return True
_constraints = [
- (_check_duration, 'Error ! The duration of the Period(s) is/are invalid. ', ['date_stop']),
- (_check_year_limit, 'Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. ', ['date_stop'])
+ (_check_duration, 'Error! The duration of the Period(s) is/are invalid. ', ['date_stop']),
+ (_check_year_limit, 'Invalid period! Some periods overlap or the date period is not in the scope of the fiscal year. ', ['date_stop'])
]
def next(self, cr, uid, period, step, context={}):
@@ -896,7 +887,7 @@
#CHECKME: shouldn't we check the state of the period?
ids = self.search(cr, uid, [('date_start','<=',dt),('date_stop','>=',dt)])
if not ids:
- raise osv.except_osv(_('Error !'), _('No period defined for this date: %s !\nPlease create a fiscal year.')%dt)
+ raise osv.except_osv(_('Error!'), _('No period defined for this date: %s! Please create a fiscal year.')%dt)
return ids
def action_draft(self, cr, uid, ids, *args):
@@ -960,8 +951,7 @@
'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
'icon': fields.function(_icon_get, method=True, string='Icon', type='char', size=32),
'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."),
- 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
- help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
+ 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True, help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company')
}
@@ -971,7 +961,7 @@
cr.execute('select * from account_move_line where journal_id=%s and period_id=%s limit 1', (obj.journal_id.id, obj.period_id.id))
res = cr.fetchall()
if res:
- raise osv.except_osv(_('Error !'), _('You can not modify/delete a journal with entries for this period !'))
+ raise osv.except_osv(_('Error!'), _('You can not modify/delete a journal with entries for this period!'))
return True
def write(self, cr, uid, ids, vals, context={}):
@@ -1164,7 +1154,7 @@
valid_moves = self.validate(cr, uid, ids, context)
if not valid_moves:
- raise osv.except_osv(_('Integrity Error !'), _('You cannot validate a non-balanced entry !\nMake sure you have configured Payment Term properly !\nIt should contain atleast one Payment Term Line with type "Balance" !'))
+ raise osv.except_osv(_('Integrity Error!'), _('You cannot validate a non-balanced entry! Make sure you have configured Payment Term properly! It should contain atleast one Payment Term Line with type "Balance"!'))
obj_sequence = self.pool.get('ir.sequence')
for move in self.browse(cr, uid, valid_moves):
if move.name =='/':
@@ -1178,7 +1168,7 @@
c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
new_name = obj_sequence.get_id(cr, uid, journal.sequence_id.id, context=c)
else:
- raise osv.except_osv(_('Error'), _('No sequence defined on the journal !'))
+ raise osv.except_osv(_('Error'), _('No sequence defined on the journal!'))
if new_name:
self.write(cr, uid, [move.id], {'name':new_name})
@@ -1201,13 +1191,13 @@
if not top:
top = account2.id
elif top<>account2.id:
- raise osv.except_osv(_('Error !'), _('You cannot validate a Journal Entry unless all journal items are in same chart of accounts !'))
+ raise osv.except_osv(_('Error!'), _('You cannot validate a Journal Entry unless all journal items are in same chart of accounts!'))
return self.post(cursor, user, ids, context=context)
def button_cancel(self, cr, uid, ids, context={}):
for line in self.browse(cr, uid, ids, context):
if not line.journal_id.update_posted:
- raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that.'))
+ raise osv.except_osv(_('Error!'), _('You can not modify a posted entry of this journal! You should set the journal to allow cancelling entries if you want to do that.'))
if ids:
cr.execute('UPDATE account_move '\
'SET state=%s '\
@@ -1311,15 +1301,13 @@
mode2 = 'debit'
if not account_id:
raise osv.except_osv(_('UserError'),
- _('There is no default default debit account defined \n' \
- 'on journal "%s"') % move.journal_id.name)
+ _('There is no default default debit account defined on journal "%s"') % move.journal_id.name)
else:
account_id = move.journal_id.default_credit_account_id.id
mode2 = 'credit'
if not account_id:
raise osv.except_osv(_('UserError'),
- _('There is no default default credit account defined \n' \
- 'on journal "%s"') % move.journal_id.name)
+ _('There is no default default credit account defined on journal "%s"') % move.journal_id.name)
# find the first line of this move with the current mode
# or create it if it doesn't exist
@@ -1639,7 +1627,7 @@
_check_recursion = check_cycle
_constraints = [
- (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
+ (_check_recursion, 'Error! You can not create recursive accounts.', ['parent_id'])
]
_order = 'code'
account_tax_code()
@@ -2059,7 +2047,7 @@
period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date', False))
if not period_id:
- raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
+ raise osv.except_osv(_('No period found!'), _('Unable to find a valid period!'))
period_id = period_id[0]
for model in self.browse(cr, uid, ids, context):
@@ -2075,7 +2063,7 @@
analytic_account_id = False
if line.analytic_account_id:
if not model.journal_id.analytic_journal_id:
- raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,))
+ raise osv.except_osv(_('No Analytic Journal!'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,))
analytic_account_id = line.analytic_account_id.id
val = {
'move_id': move_id,
@@ -2087,8 +2075,7 @@
date_maturity = time.strftime('%Y-%m-%d')
if line.date_maturity == 'partner':
if not line.partner_id:
- raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \
- "\nPlease define partner on it!")%(line.name, model.name))
+ raise osv.except_osv(_('Error!'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!Please define partner on it!")%(line.name, model.name))
if line.partner_id.property_payment_term:
payment_term_id = line.partner_id.property_payment_term.id
pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity)
@@ -2268,13 +2255,9 @@
('liquidity','Liquidity'),
('other','Regular'),
('closed','Closed'),
- ], 'Internal Type', required=True,help="This type is used to differentiate types with "\
- "special effects in OpenERP: view can not have entries, consolidation are accounts that "\
- "can have children accounts for multi-company consolidations, payable/receivable are for "\
- "partners accounts (for debit/credit computations), closed for depreciated accounts."),
+ ], 'Internal Type', required=True,help="This type is used to differentiate types with special effects in OpenERP: view can not have entries, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for depreciated accounts."),
'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
- help="These types are defined according to your country. The type contains more information "\
- "about the account and its specificities."),
+ help="These types are defined according to your country. The type contains more information about the account and its specificities."),
'reconcile': fields.boolean('Allow Reconciliation', help="Check this option if you want the user to reconcile entries in this account."),
'shortcut': fields.char('Shortcut', size=12),
'note': fields.text('Note'),
@@ -2292,7 +2275,7 @@
_check_recursion = check_cycle
_constraints = [
- (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id'])
+ (_check_recursion, 'Error! You can not create recursive account templates.', ['parent_id'])
]
@@ -2325,7 +2308,7 @@
ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]], ['code'])
res = None
if not ptids or not ptids[0]['code']:
- raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
+ raise osv.except_osv(_('Error!'), _('Cannot locate parent code for template account!'))
res = acc_obj.search(cr, uid, [('code','=',ptids[0]['code'])])
return res and res[0] or False
@@ -2395,7 +2378,7 @@
_check_recursion = check_cycle
_constraints = [
- (_check_recursion, 'Error ! You can not create recursive Tax Codes.', ['parent_id'])
+ (_check_recursion, 'Error! You can not create recursive Tax Codes.', ['parent_id'])
]
_order = 'code,name'
account_tax_code_template()
=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py 2010-11-26 15:14:46 +0000
+++ account/account_bank_statement.py 2010-12-11 04:13:59 +0000
@@ -302,7 +302,7 @@
st = self.browse(cr, uid, st_id, context)
if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
raise osv.except_osv(_('Error !'),
- _('The statement balance is incorrect !\n') +
+ _('The statement balance is incorrect!') +
_('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
return True
@@ -327,7 +327,7 @@
self.balance_check(cr, uid, st.id, journal_type=j_type, context=context)
if (not st.journal_id.default_credit_account_id) \
or (not st.journal_id.default_debit_account_id):
- raise osv.except_osv(_('Configuration Error !'),
+ raise osv.except_osv(_('Configuration Error!'),
_('Please verify that an account is defined in the journal.'))
if not st.name == '/':
@@ -341,12 +341,12 @@
for line in st.move_line_ids:
if line.state <> 'valid':
- raise osv.except_osv(_('Error !'),
+ raise osv.except_osv(_('Error!'),
_('The account entries lines are not in valid state.'))
for st_line in st.line_ids:
if st_line.analytic_account_id:
if not st.journal_id.analytic_journal_id:
- raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
+ raise osv.except_osv(_('No Analytic Journal!'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
if not st_line.amount:
continue
st_line_number = self.get_next_st_line_number(cr, uid, st_number, st_line, context)
@@ -387,7 +387,7 @@
if t['state'] in ('draft'):
unlink_ids.append(t['id'])
else:
- raise osv.except_osv(_('Invalid action !'), _('Cannot delete bank statement(s) which are already confirmed !'))
+ raise osv.except_osv(_('Invalid action!'), _('Cannot delete bank statement(s) which are already confirmed !'))
osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
return True
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot 2010-12-03 15:55:33 +0000
+++ account/i18n/account.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:49+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:49+0000\n"
+"POT-Creation-Date: 2010-12-10 09:26:32+0000\n"
+"PO-Revision-Date: 2010-12-10 09:26:32+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -68,11 +68,6 @@
msgstr ""
#. module: account
-#: constraint:account.period:0
-msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr ""
-
-#. module: account
#: field:account.analytic.line,currency_id:0
msgid "Account currency"
msgstr ""
@@ -164,6 +159,13 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: account
#: field:account.fiscal.position.account,account_src_id:0
#: field:account.fiscal.position.account.template,account_src_id:0
msgid "Account Source"
@@ -211,10 +213,9 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account_move_line.py:0
#, python-format
-msgid "No period defined for this date: %s !\n"
-"Please create a fiscal year."
+msgid "You can not use this general account in this journal !"
msgstr ""
#. module: account
@@ -304,15 +305,6 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_move_journal.py:0
-#, python-format
-msgid "Can't find any account journal of %s type for this company.\n"
-"\n"
-"You can create one in the menu: \n"
-"Configuration/Financial Accounting/Accounts/Journals."
-msgstr ""
-
-#. module: account
#: model:ir.model,name:account.model_account_unreconcile
msgid "Account Unreconcile"
msgstr ""
@@ -329,6 +321,12 @@
msgstr ""
#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "You must define an analytic journal of type '%s'!"
+msgstr ""
+
+#. module: account
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -530,6 +528,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You cannot remove an account which has account entries!."
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_installer_modules
msgid "account.installer.modules"
msgstr ""
@@ -597,6 +601,12 @@
msgstr ""
#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Cannot create the invoice! The payment term defined gives a computed amount greater than the total invoiced amount."
+msgstr ""
+
+#. module: account
#: field:account.invoice.tax,tax_amount:0
msgid "Tax Code Amount"
msgstr ""
@@ -641,9 +651,13 @@
msgstr ""
#. module: account
-#: constraint:account.account:0
-#: constraint:account.tax.code:0
-msgid "Error ! You can not create recursive accounts."
+#: view:account.account:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: model:ir.actions.act_window,name:account.action_aged_receivable
+msgid "Receivable Accounts"
msgstr ""
#. module: account
@@ -667,15 +681,8 @@
msgstr ""
#. module: account
-#: field:account.partner.reconcile.process,today_reconciled:0
-msgid "Partners Reconciled Today"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:0
-#, python-format
-msgid "The statement balance is incorrect !\n"
-""
+#: selection:account.tax,type:0
+msgid "Percentage"
msgstr ""
#. module: account
@@ -835,6 +842,12 @@
msgstr ""
#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Taxes missing!"
+msgstr ""
+
+#. module: account
#: view:account.invoice:0
#: view:account.move:0
#: view:validate.account.move:0
@@ -857,6 +870,16 @@
msgstr ""
#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Liability"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr ""
+
+#. module: account
#: view:account.analytic.line:0
#: view:account.entries.report:0
#: view:account.invoice.report:0
@@ -917,8 +940,6 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_bank_statement.py:0
#: code:addons/account/account_move_line.py:0
#: code:addons/account/invoice.py:0
#: code:addons/account/wizard/account_use_model.py:0
@@ -959,11 +980,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr ""
@@ -1086,12 +1102,6 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "You can not modify/delete a journal with entries for this period !"
-msgstr ""
-
-#. module: account
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
@@ -1186,6 +1196,11 @@
msgstr ""
#. module: account
+#: constraint:account.tax.code.template:0
+msgid "Error! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: account
#: model:ir.actions.report.xml,name:account.account_overdue
#: view:res.company:0
msgid "Overdue Payments"
@@ -1224,6 +1239,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "The statement balance is incorrect!"
+msgstr ""
+
+#. module: account
#: view:account.bank.statement:0
#: model:ir.model,name:account.model_account_bank_statement
#: model:process.node,name:account.process_node_accountingstatemententries0
@@ -1248,12 +1269,6 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
-#, python-format
-msgid "You can not use this general account in this journal !"
-msgstr ""
-
-#. module: account
#: selection:account.balance.report,display_account:0
#: selection:account.bs.report,display_account:0
#: selection:account.common.account.report,display_account:0
@@ -1304,6 +1319,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Integrity Error!"
+msgstr ""
+
+#. module: account
#: view:account.bank.statement:0
msgid "Entry encoding"
msgstr ""
@@ -1336,13 +1357,6 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Cannot create the invoice !\n"
-"The payment term defined gives a computed amount greater than the total invoiced amount."
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree1
msgid "Customer Invoices allows you create and manage invoices issued to your customers. OpenERP generates draft of invoices automatically so that you only have to confirm them before sending them to your customers."
msgstr ""
@@ -1389,6 +1403,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "There is no default default debit account defined on journal \"%s\""
+msgstr ""
+
+#. module: account
#: report:account.overdue:0
msgid "."
msgstr ""
@@ -1486,6 +1506,7 @@
msgstr ""
#. module: account
+#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@@ -1563,6 +1584,20 @@
msgstr ""
#. module: account
+#: help:account.account,currency_mode:0
+msgid "This will select how the current currency rate for outgoing transactions is computed.In most countries the legal method is \"average\" but only a few software systems are able to manage this. So if you import from another software system you may have to use the rate at date.Incoming transactions always use the rate at date."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account
#: view:res.partner:0
msgid "Supplier Debit"
msgstr ""
@@ -1641,6 +1676,12 @@
msgstr ""
#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Tax base different! Click on compute to update tax base"
+msgstr ""
+
+#. module: account
#: field:account.move.line.reconcile,credit:0
msgid "Credit amount"
msgstr ""
@@ -1803,16 +1844,6 @@
msgstr ""
#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
#: report:account.move.voucher:0
msgid "Canceled"
msgstr ""
@@ -1906,11 +1937,6 @@
msgstr ""
#. module: account
-#: constraint:account.period:0
-msgid "Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. "
-msgstr ""
-
-#. module: account
#: selection:account.invoice,state:0
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
@@ -1925,13 +1951,6 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "There is no default default debit account defined \n"
-"on journal \"%s\""
-msgstr ""
-
-#. module: account
#: help:account.account,type:0
#: help:account.account.template,type:0
#: help:account.entries.report,type:0
@@ -1989,6 +2008,12 @@
msgstr ""
#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error! You can not create recursive accounts."
+msgstr ""
+
+#. module: account
#: view:product.category:0
msgid "Accounting Properties"
msgstr ""
@@ -2127,12 +2152,8 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Can't find any account journal of %s type for this company.\n"
-"\n"
-"You can create one in the menu: \n"
-"Configuration\\Financial Accounting\\Accounts\\Journals."
+#: help:account.invoice,reconciled:0
+msgid "The Journal Entry of the invoice have been totally reconciled with one or several Journal Entries of payment."
msgstr ""
#. module: account
@@ -2268,7 +2289,9 @@
msgstr ""
#. module: account
+#: code:addons/account/account_bank_statement.py:0
#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_move_journal.py:0
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2422,14 +2445,8 @@
msgstr ""
#. module: account
-#: view:account.use.model:0
-msgid "This wizard will create recurring accounting entries"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "No sequence defined on the journal !"
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid "Cash Register allows you to manage cash entries in your cash journals."
msgstr ""
#. module: account
@@ -2482,6 +2499,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You can not modify a posted entry of this journal! You should set the journal to allow cancelling entries if you want to do that."
+msgstr ""
+
+#. module: account
#: report:account.move.voucher:0
msgid "Number:"
msgstr ""
@@ -2516,6 +2539,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "Invalid action!"
+msgstr ""
+
+#. module: account
#: view:account.chart.template:0
#: field:product.category,property_account_expense_categ:0
#: field:product.template,property_account_expense:0
@@ -2538,11 +2567,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
@@ -2591,13 +2615,6 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "No fiscal year defined for this date !\n"
-"Please create one."
-msgstr ""
-
-#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
#: model:process.process,name:account.process_process_invoiceprocess0
@@ -2646,11 +2663,6 @@
msgstr ""
#. module: account
-#: help:account.account,currency_mode:0
-msgid "This will select how the current currency rate for outgoing transactions is computed. In most countries the legal method is \"average\" but only a few software systems are able to manage this. So if you import from another software system you may have to use the rate at date. Incoming transactions always use the rate at date."
-msgstr ""
-
-#. module: account
#: help:wizard.multi.charts.accounts,code_digits:0
msgid "No. of Digits to use for account code"
msgstr ""
@@ -2723,6 +2735,17 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:0
+#, python-format
+msgid "You have to define the bank account in the journal definition for reconciliation."
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! The duration of the Fiscal Year is invalid."
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
msgid "Tax Code Template"
msgstr ""
@@ -2861,12 +2884,6 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "No Partner Defined !"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_account_period_close
#: model:ir.actions.act_window,name:account.action_account_period_tree
#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
@@ -3056,6 +3073,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "No sequence defined on the journal!"
+msgstr ""
+
+#. module: account
#: selection:account.account.type,close_method:0
msgid "Detail"
msgstr ""
@@ -3160,25 +3183,12 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n"
-"Please define partner on it!"
-msgstr ""
-
-#. module: account
#: code:addons/account/account_move_line.py:0
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts !"
-msgstr ""
-
-#. module: account
#: view:account.tax:0
msgid "Account Tax"
msgstr ""
@@ -3371,6 +3381,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "No period defined for this date: %s! Please create a fiscal year."
+msgstr ""
+
+#. module: account
#: help:account.central.journal,amount_currency:0
#: help:account.common.journal.report,amount_currency:0
#: help:account.general.journal,amount_currency:0
@@ -3418,6 +3434,11 @@
msgstr ""
#. module: account
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company!"
+msgstr ""
+
+#. module: account
#: view:account.invoice:0
msgid "Validate"
msgstr ""
@@ -3475,12 +3496,6 @@
msgstr ""
#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_configuration
-#: view:res.company:0
-msgid "Configuration"
-msgstr ""
-
-#. module: account
#: model:account.payment.term,name:account.account_payment_term
#: model:account.payment.term,note:account.account_payment_term
msgid "30 Days End of Month"
@@ -3527,12 +3542,8 @@
msgstr ""
#. module: account
-#: report:account.account.balance:0
-#: view:account.balance.report:0
-#: model:ir.actions.act_window,name:account.action_account_balance_menu
-#: model:ir.actions.report.xml,name:account.account_account_balance
-#: model:ir.ui.menu,name:account.menu_general_Balance_report
-msgid "Trial Balance"
+#: view:account.bank.statement:0
+msgid "Close CashBox"
msgstr ""
#. module: account
@@ -3551,8 +3562,12 @@
msgstr ""
#. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: report:account.account.balance:0
+#: view:account.balance.report:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.ui.menu,name:account.menu_general_Balance_report
+msgid "Trial Balance"
msgstr ""
#. module: account
@@ -3567,12 +3582,6 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Global taxes defined, but are not in invoice lines !"
-msgstr ""
-
-#. module: account
#: field:account.entries.report,month:0
#: view:account.invoice.report:0
#: field:account.invoice.report,month:0
@@ -3659,11 +3668,6 @@
msgstr ""
#. module: account
-#: constraint:account.fiscalyear:0
-msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr ""
-
-#. module: account
#: field:report.aged.receivable,name:0
msgid "Month Range"
msgstr ""
@@ -3744,12 +3748,6 @@
msgstr ""
#. module: account
-#: field:account.model.line,date_maturity:0
-#: report:account.overdue:0
-msgid "Maturity date"
-msgstr ""
-
-#. module: account
#: view:account.account.template:0
msgid "Account Template"
msgstr ""
@@ -3777,7 +3775,6 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
#: code:addons/account/wizard/account_use_model.py:0
#, python-format
msgid "Unable to find a valid period !"
@@ -3899,13 +3896,6 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Please verify the price of the invoice !\n"
-"The real total does not match the computed total."
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -3944,12 +3934,6 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "You must define an analytic journal of type '%s' !"
-msgstr ""
-
-#. module: account
#: code:addons/account/account.py:0
#, python-format
msgid "Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
@@ -3977,9 +3961,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Invoice "
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+#: view:res.company:0
+msgid "Configuration"
msgstr ""
#. module: account
@@ -4053,11 +4037,6 @@
msgstr ""
#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
-#. module: account
#: view:account.period.close:0
msgid "Are you sure ?"
msgstr ""
@@ -4146,9 +4125,8 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Taxes missing !"
+#: model:ir.actions.act_window,help:account.action_account_partner_balance
+msgid "This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance."
msgstr ""
#. module: account
@@ -4157,6 +4135,11 @@
msgstr ""
#. module: account
+#: constraint:account.period:0
+msgid "Error! The duration of the Period(s) is/are invalid. "
+msgstr ""
+
+#. module: account
#: help:account.journal,refund_journal:0
msgid "Fill this if the journal is to be used for refunds of invoices."
msgstr ""
@@ -4183,6 +4166,11 @@
msgstr ""
#. module: account
+#: constraint:account.account.template:0
+msgid "Error! You can not create recursive account templates."
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,name:account.action_account_vat_declaration
#: model:ir.model,name:account.model_account_vat_declaration
msgid "Account Vat Declaration"
@@ -4199,10 +4187,9 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/invoice.py:0
#, python-format
-msgid "You can not modify a posted entry of this journal !\n"
-"You should set the journal to allow cancelling entries if you want to do that."
+msgid "Invoice '%s' is validated"
msgstr ""
#. module: account
@@ -4332,12 +4319,6 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "Integrity Error !"
-msgstr ""
-
-#. module: account
#: field:account.tax.template,description:0
msgid "Internal Name"
msgstr ""
@@ -4450,6 +4431,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You cannot validate a non-balanced entry! Make sure you have configured Payment Term properly! It should contain atleast one Payment Term Line with type \"Balance\"!"
+msgstr ""
+
+#. module: account
#: model:process.transition,name:account.process_transition_customerinvoice0
#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
#: model:process.transition,name:account.process_transition_statemententries0
@@ -4460,11 +4447,6 @@
msgstr ""
#. module: account
-#: help:account.invoice,reconciled:0
-msgid "The Journal Entry of the invoice have been totally reconciled with one or several Journal Entries of payment."
-msgstr ""
-
-#. module: account
#: field:account.tax,child_depend:0
#: field:account.tax.template,child_depend:0
msgid "Tax on Children"
@@ -4476,7 +4458,6 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
#: code:addons/account/wizard/account_use_model.py:0
#, python-format
msgid "No period found !"
@@ -4498,6 +4479,11 @@
msgstr ""
#. module: account
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company!"
+msgstr ""
+
+#. module: account
#: view:account.bank.statement:0
msgid "Transaction"
msgstr ""
@@ -4636,9 +4622,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:0
#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_move_journal.py:0
#, python-format
msgid "Configuration Error !"
msgstr ""
@@ -4709,13 +4693,6 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "There is no default default credit account defined \n"
-"on journal \"%s\""
-msgstr ""
-
-#. module: account
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -4775,6 +4752,14 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "No Analytic Journal!"
+msgstr ""
+
+#. module: account
#: view:account.analytic.chart:0
#: view:account.chart:0
#: view:account.tax.chart:0
@@ -4893,6 +4878,11 @@
msgstr ""
#. module: account
+#: model:account.account.type,name:account.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: account
#: selection:account.bank.statement.line,type:0
#: view:account.invoice:0
#: code:addons/account/invoice.py:0
@@ -4901,11 +4891,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_asset
-msgid "Bilanzkonten - Aktiva - Vermögenskonten"
-msgstr ""
-
-#. module: account
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -5058,7 +5043,6 @@
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:0
#: code:addons/account/invoice.py:0
#, python-format
msgid "Invalid action !"
@@ -5194,12 +5178,6 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "is validated."
-msgstr ""
-
-#. module: account
#: view:account.chart.template:0
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
@@ -5226,6 +5204,12 @@
msgstr ""
#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "No Partner Defined!"
+msgstr ""
+
+#. module: account
#: view:account.account.type:0
#: view:account.tax.code:0
msgid "Reporting Configuration"
@@ -5389,6 +5373,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid "Maturity date of entry line generated by model line '%s' is based on partner payment term! Please define partner on it!"
+msgstr ""
+
+#. module: account
#: view:account.bank.statement:0
msgid "CashBox"
msgstr ""
@@ -5399,8 +5389,8 @@
msgstr ""
#. module: account
-#: selection:account.tax,type:0
-msgid "Percentage"
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company!"
msgstr ""
#. module: account
@@ -5445,8 +5435,8 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
-msgid "Reconciliation: Go to Next Partner"
+#: constraint:account.period:0
+msgid "Invalid period! Some periods overlap or the date period is not in the scope of the fiscal year. "
msgstr ""
#. module: account
@@ -5500,11 +5490,6 @@
msgstr ""
#. module: account
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
-msgstr ""
-
-#. module: account
#: field:account.account.template,nocreate:0
msgid "Optional create"
msgstr ""
@@ -5742,19 +5727,23 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
#: code:addons/account/account_analytic_line.py:0
#: code:addons/account/account_bank_statement.py:0
#: code:addons/account/account_cash_statement.py:0
#: code:addons/account/account_move_line.py:0
#: code:addons/account/invoice.py:0
#: code:addons/account/wizard/account_invoice_refund.py:0
-#: code:addons/account/wizard/account_use_model.py:0
#, python-format
msgid "Error !"
msgstr ""
#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Please verify the price of the invoice !The real total does not match the computed total."
+msgstr ""
+
+#. module: account
#: report:account.journal.period.print:0
msgid "o.journal_id.currency and formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ o.journal_id.currency and o.journal_id.currency.symbol"
msgstr ""
@@ -6007,8 +5996,8 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
-msgid "Unreconciled Entries"
+#: selection:account.journal,type:0
+msgid "Bank and Cheques"
msgstr ""
#. module: account
@@ -6022,6 +6011,12 @@
msgstr ""
#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Bad total!"
+msgstr ""
+
+#. module: account
#: help:account.tax,amount:0
msgid "For taxes of type percentage, enter % ratio between 0-1."
msgstr ""
@@ -6102,11 +6097,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_income
-msgid "Erfolgskonten - Erlöse"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: field:account.bank.statement.line,statement_id:0
#: field:account.move.line,statement_id:0
@@ -6166,8 +6156,8 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
-msgid "Cash Register allows you to manage cash entries in your cash journals."
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
msgstr ""
#. module: account
@@ -6183,11 +6173,6 @@
msgstr ""
#. module: account
-#: view:account.bank.statement:0
-msgid "Opening Balance"
-msgstr ""
-
-#. module: account
#: help:account.journal,centralisation:0
msgid "Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."
msgstr ""
@@ -6213,6 +6198,11 @@
msgstr ""
#. module: account
+#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
+msgid "Reconciliation: Go to Next Partner"
+msgstr ""
+
+#. module: account
#: field:wizard.multi.charts.accounts,purchase_tax:0
msgid "Default Purchase Tax"
msgstr ""
@@ -6255,8 +6245,13 @@
msgstr ""
#. module: account
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/wizard/account_invoice_state.py:0
+#: code:addons/account/wizard/account_report_balance_sheet.py:0
+#: code:addons/account/wizard/account_state_open.py:0
+#: code:addons/account/wizard/account_validate_account_move.py:0
+#, python-format
+msgid "Warning"
msgstr ""
#. module: account
@@ -6369,6 +6364,13 @@
msgstr ""
#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Can't find any account journal of %s type for this company.You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+msgstr ""
+
+#. module: account
#: selection:account.move.line,centralisation:0
msgid "Normal"
msgstr ""
@@ -6380,7 +6382,6 @@
#. module: account
#: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6581,6 +6582,16 @@
msgstr ""
#. module: account
+#: model:account.account.type,name:account.account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid " 7 Days "
+msgstr ""
+
+#. module: account
#: field:account.partner.reconcile.process,progress:0
msgid "Progress"
msgstr ""
@@ -6597,11 +6608,6 @@
msgstr ""
#. module: account
-#: help:account.payment.term.line,days2:0
-msgid "Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."
-msgstr ""
-
-#. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
msgid "Legal Reports"
msgstr ""
@@ -6644,7 +6650,6 @@
#. module: account
#: code:addons/account/account.py:0
#: code:addons/account/account_move_line.py:0
-#: code:addons/account/invoice.py:0
#, python-format
msgid "Warning !"
msgstr ""
@@ -6672,11 +6677,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_other
-msgid "Jahresabschlusskonten u. Statistik"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
@@ -6711,12 +6711,6 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "No Invoice Lines !"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: field:account.bank.statement,state:0
#: field:account.entries.report,move_state:0
@@ -6774,11 +6768,6 @@
msgstr ""
#. module: account
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: account
#: view:account.invoice.line:0
msgid "Line"
msgstr ""
@@ -6809,6 +6798,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period!"
+msgstr ""
+
+#. module: account
#: field:account.partner.ledger,page_split:0
msgid "One Partner Per Page"
msgstr ""
@@ -6854,6 +6849,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts!"
+msgstr ""
+
+#. module: account
#: report:account.analytic.account.cost_ledger:0
#: report:account.analytic.account.quantity_cost_ledger:0
#: model:ir.actions.act_window,name:account.action_account_analytic_cost
@@ -6904,11 +6905,6 @@
msgstr ""
#. module: account
-#: model:process.node,name:account.process_node_manually0
-msgid "Manually"
-msgstr ""
-
-#. module: account
#: field:account.automatic.reconcile,period_id:0
#: view:account.bank.statement:0
#: field:account.bank.statement,period_id:0
@@ -7193,6 +7189,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Unable to find a valid period!"
+msgstr ""
+
+#. module: account
#: view:account.payment.term.line:0
msgid " valuation: balance"
msgstr ""
@@ -7258,6 +7260,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "There is no default default credit account defined on journal \"%s\""
+msgstr ""
+
+#. module: account
#: model:ir.ui.menu,name:account.menu_configuration_misc
msgid "Miscellaneous"
msgstr ""
@@ -7291,6 +7299,11 @@
msgstr ""
#. module: account
+#: model:account.account.type,name:account.account_type_expense
+msgid "Expense"
+msgstr ""
+
+#. module: account
#: code:addons/account/account_move_line.py:0
#, python-format
msgid "Bad account!"
@@ -7415,6 +7428,13 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_move_journal.py:0
+#, python-format
+msgid "Can't find any account journal of %s type for this company.You can create one in the menu: \n"
+"Configuration/Financial Accounting/Accounts/Journals."
+msgstr ""
+
+#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
msgid "Cost Ledger for period"
msgstr ""
@@ -7520,6 +7540,12 @@
msgstr ""
#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines!"
+msgstr ""
+
+#. module: account
#: field:account.installer,purchase_tax:0
msgid "Purchase Tax(%)"
msgstr ""
@@ -7735,11 +7761,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_account_partner_balance
-msgid "This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance."
-msgstr ""
-
-#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: model:account.account.type,name:account.account_type_payable
@@ -7846,13 +7867,6 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_move_bank_reconcile.py:0
-#, python-format
-msgid "You have to define the bank account\n"
-"in the journal definition for reconciliation."
-msgstr ""
-
-#. module: account
#: view:account.move.line.reconcile:0
msgid "Reconciliation transactions"
msgstr ""
@@ -7953,10 +7967,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Tax base different !\n"
-"Click on compute to update tax base"
+#: field:account.model.line,date_maturity:0
+#: report:account.overdue:0
+msgid "Maturity date"
msgstr ""
#. module: account
@@ -8007,12 +8020,6 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Bad total !"
-msgstr ""
-
-#. module: account
#: field:account.journal,sequence_id:0
msgid "Entry Sequence"
msgstr ""
@@ -8064,14 +8071,6 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "You cannot validate a non-balanced entry !\n"
-"Make sure you have configured Payment Term properly !\n"
-"It should contain atleast one Payment Term Line with type \"Balance\" !"
-msgstr ""
-
-#. module: account
#: help:res.partner,property_account_payable:0
msgid "This account will be used instead of the default one as the payable account for the current partner"
msgstr ""
@@ -8139,13 +8138,6 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_use_model.py:0
-#, python-format
-msgid "Maturity date of entry line generated by model line '%s' is based on partner payment term!\n"
-"Please define partner on it!"
-msgstr ""
-
-#. module: account
#: field:account.cashbox.line,number:0
#: field:account.invoice,number:0
#: field:account.move,name:0
@@ -8436,6 +8428,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "No period found!"
+msgstr ""
+
+#. module: account
#: field:account.account,company_id:0
#: field:account.analytic.journal,company_id:0
#: field:account.bank.statement,company_id:0
@@ -8476,8 +8474,20 @@
msgstr ""
#. module: account
-#: help:account.bank.statement,total_entry_encoding:0
-msgid "Total cash transactions"
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "No fiscal year defined for this date! Please create one."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+msgid "Unreconciled Entries"
msgstr ""
#. module: account
@@ -8536,13 +8546,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/wizard/account_invoice_state.py:0
-#: code:addons/account/wizard/account_report_balance_sheet.py:0
-#: code:addons/account/wizard/account_state_open.py:0
-#: code:addons/account/wizard/account_validate_account_move.py:0
-#, python-format
-msgid "Warning"
+#: view:account.bank.statement:0
+msgid "Opening Balance"
msgstr ""
#. module: account
@@ -8621,11 +8626,6 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
@@ -8679,8 +8679,8 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_expense
-msgid "Erfolgskonten - Aufwendungen"
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
msgstr ""
#. module: account
@@ -8788,8 +8788,9 @@
msgstr ""
#. module: account
-#: sql_constraint:account.account:0
-msgid "The code of the account must be unique per company !"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "No Invoice Lines!"
msgstr ""
#. module: account
@@ -8880,11 +8881,21 @@
msgstr ""
#. module: account
+#: help:account.payment.term.line,days2:0
+msgid "Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month.Set 0 for net days (otherwise it's based on the beginning of the month)."
+msgstr ""
+
+#. module: account
#: view:account.invoice.tax:0
msgid "Manual Invoice Taxes"
msgstr ""
#. module: account
+#: help:account.bank.statement,total_entry_encoding:0
+msgid "Total cash transactions"
+msgstr ""
+
+#. module: account
#: report:account.analytic.account.cost_ledger:0
#: report:account.analytic.account.quantity_cost_ledger:0
#: report:account.central.journal:0
@@ -9011,9 +9022,3 @@
msgid "You must enter a period length that cannot be 0 or below !"
msgstr ""
-#. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "You cannot remove an account which has account entries!. "
-msgstr ""
-
=== modified file 'account/invoice.py'
--- account/invoice.py 2010-11-27 20:16:05 +0000
+++ account/invoice.py 2010-12-11 04:13:59 +0000
@@ -70,7 +70,7 @@
tt = type2journal.get(type_inv, 'sale')
result = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=',tt)], context=context)
if not result:
- raise osv.except_osv(_('No Analytic Journal !'),_("You must define an analytic journal of type '%s' !") % (tt,))
+ raise osv.except_osv(_('No Analytic Journal!'),_("You must define an analytic journal of type '%s'!") % (tt,))
return result[0]
def _get_type(self, cr, uid, context=None):
@@ -576,7 +576,7 @@
if journal_ids:
val['journal_id'] = journal_ids[0]
else:
- raise osv.except_osv(_('Configuration Error !'), (_('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.') % (journal_type)))
+ raise osv.except_osv(_('Configuration Error !'), (_('Can\'t find any account journal of %s type for this company.You can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.') % (journal_type)))
dom = {'journal_id': [('id', 'in', journal_ids)]}
else:
journal_ids = obj_journal.search(cr, uid, [])
@@ -745,13 +745,13 @@
key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id)
tax_key.append(key)
if not key in compute_taxes:
- raise osv.except_osv(_('Warning !'), _('Global taxes defined, but are not in invoice lines !'))
+ raise osv.except_osv(_('Warning!'), _('Global taxes defined, but are not in invoice lines!'))
base = compute_taxes[key]['base']
if abs(base - tax.base) > inv.company_id.currency_id.rounding:
- raise osv.except_osv(_('Warning !'), _('Tax base different !\nClick on compute to update tax base'))
+ raise osv.except_osv(_('Warning!'), _('Tax base different! Click on compute to update tax base'))
for key in compute_taxes:
if not key in tax_key:
- raise osv.except_osv(_('Warning !'), _('Taxes missing !'))
+ raise osv.except_osv(_('Warning!'), _('Taxes missing!'))
def compute_invoice_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines):
total = 0
@@ -816,9 +816,9 @@
context = {}
for inv in self.browse(cr, uid, ids):
if not inv.journal_id.sequence_id:
- raise osv.except_osv(_('Error !'), _('Please define sequence on invoice journal'))
+ raise osv.except_osv(_('Error!'), _('Please define sequence on invoice journal'))
if not inv.invoice_line:
- raise osv.except_osv(_('No Invoice Lines !'), _('Please create some invoice lines.'))
+ raise osv.except_osv(_('No Invoice Lines!'), _('Please create some invoice lines.'))
if inv.move_id:
continue
@@ -835,7 +835,7 @@
self.check_tax_lines(cr, uid, inv, compute_taxes, ait_obj)
if inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0):
- raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe real total does not match the computed total.'))
+ raise osv.except_osv(_('Bad total!'), _('Please verify the price of the invoice !The real total does not match the computed total.'))
if inv.payment_term:
total_fixed = total_percent = 0
@@ -846,7 +846,7 @@
total_percent += line.value_amount
total_fixed = (total_fixed * 100) / (inv.amount_total or 1.0)
if (total_fixed + total_percent) > 100:
- raise osv.except_osv(_('Error !'), _("Cannot create the invoice !\nThe payment term defined gives a computed amount greater than the total invoiced amount."))
+ raise osv.except_osv(_('Error !'), _("Cannot create the invoice! The payment term defined gives a computed amount greater than the total invoiced amount."))
# one move line per tax line
iml += ait_obj.move_line_get(cr, uid, inv.id)
@@ -1020,7 +1020,7 @@
ctx = context.copy()
if obj_inv.type in ('out_invoice', 'out_refund'):
ctx = self.get_log_context(cr, uid, context=ctx)
- message = _('Invoice ') + " '" + name + "' "+ _("is validated.")
+ message = (_("Invoice '%s' is validated") %(name))
self.log(cr, uid, inv_id, message, context=ctx)
return True
@@ -1039,7 +1039,7 @@
pay_ids = account_move_line_obj.browse(cr, uid, i['payment_ids'])
for move_line in pay_ids:
if move_line.reconcile_partial_id and move_line.reconcile_partial_id.line_partial_ids:
- raise osv.except_osv(_('Error !'), _('You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!'))
+ raise osv.except_osv(_('Error!'), _('You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!'))
self.write(cr, uid, ids, {'state':'cancel', 'move_id':False})
self._log_event(cr, uid, ids, -1.0, 'Cancel Invoice')
@@ -1313,7 +1313,7 @@
context = {}
company_id = context.get('company_id',False)
if not partner_id:
- raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
+ raise osv.except_osv(_('No Partner Defined!'),_("You must first select a partner !") )
if not product:
if type in ('in_invoice', 'in_refund'):
return {'value': {'categ_id': False}, 'domain':{'product_uom':[]}}
@@ -1376,7 +1376,7 @@
in_res_id = account_obj.search(cr, uid, [('name','=',app_acc_in.name),('company_id','=',company_id)])
exp_res_id = account_obj.search(cr, uid, [('name','=',app_acc_exp.name),('company_id','=',company_id)])
if not in_res_id and not exp_res_id:
- raise osv.except_osv(_('Configuration Error !'),
+ raise osv.except_osv(_('Configuration Error!'),
_('Can not find account chart for this company, Please Create account.'))
in_obj_acc = account_obj.browse(cr, uid, in_res_id)
exp_obj_acc = account_obj.browse(cr, uid, exp_res_id)
=== modified file 'account/wizard/account_move_bank_reconcile.py'
--- account/wizard/account_move_bank_reconcile.py 2010-10-18 06:49:23 +0000
+++ account/wizard/account_move_bank_reconcile.py 2010-12-11 04:13:59 +0000
@@ -44,8 +44,7 @@
from account_journal where id=%s', (data['journal_id'],))
account_id = cr.fetchone()[0]
if not account_id:
- raise osv.except_osv(_('Error'), _('You have to define \
-the bank account\nin the journal definition for reconciliation.'))
+ raise osv.except_osv(_('Error'), _('You have to define the bank account in the journal definition for reconciliation.'))
return {
'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (data['journal_id'], account_id),
'name': _('Standard Encoding'),
=== modified file 'account/wizard/account_move_journal.py'
--- account/wizard/account_move_journal.py 2010-11-15 18:46:17 +0000
+++ account/wizard/account_move_journal.py 2010-12-11 04:13:59 +0000
@@ -51,7 +51,7 @@
if context.get('journal_type', False):
jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
if not jids:
- raise osv.except_osv(_('Configuration Error !'), _('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Financial Accounting/Accounts/Journals.') % context.get('journal_type'))
+ raise osv.except_osv(_('Configuration Error!'), _('Can\'t find any account journal of %s type for this company.You can create one in the menu: \nConfiguration/Financial Accounting/Accounts/Journals.') % context.get('journal_type'))
journal_id = jids[0]
return journal_id
=== modified file 'account/wizard/account_use_model.py'
--- account/wizard/account_use_model.py 2010-11-15 18:46:17 +0000
+++ account/wizard/account_use_model.py 2010-12-11 04:13:59 +0000
@@ -41,8 +41,7 @@
for line in model.lines_id:
if line.date_maturity == 'partner':
if not line.partner_id:
- raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' is based on partner payment term!"\
- "\nPlease define partner on it!")%line.name)
+ raise osv.except_osv(_('Error!'), _("Maturity date of entry line generated by model line '%s' is based on partner payment term! Please define partner on it!")%line.name)
pass
def create_entries(self, cr, uid, ids, context=None):
=== modified file 'account_accountant/i18n/account_accountant.pot'
--- account_accountant/i18n/account_accountant.pot 2010-12-03 15:55:33 +0000
+++ account_accountant/i18n/account_accountant.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:49+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:49+0000\n"
+"POT-Creation-Date: 2010-12-10 09:27:00+0000\n"
+"PO-Revision-Date: 2010-12-10 09:27:00+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,14 @@
"Plural-Forms: \n"
#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid "\n"
+"This module gives the admin user the access to all the accounting features like the journal\n"
+"items and the chart of accounts.\n"
+" "
+msgstr ""
+
+#. module: account_accountant
#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
msgid "Accountant"
msgstr ""
=== modified file 'account_analytic_analysis/i18n/account_analytic_analysis.pot'
--- account_analytic_analysis/i18n/account_analytic_analysis.pot 2010-12-03 15:55:33 +0000
+++ account_analytic_analysis/i18n/account_analytic_analysis.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:50+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:50+0000\n"
+"POT-Creation-Date: 2010-12-10 09:27:10+0000\n"
+"PO-Revision-Date: 2010-12-10 09:27:10+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -47,6 +47,18 @@
msgstr ""
#. module: account_analytic_analysis
+#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
+msgid "\n"
+"This module is for modifying account analytic view to show\n"
+"important data to project manager of services companies.\n"
+"Adds menu to show relevant information to each manager..\n"
+"\n"
+"You can also view the report of account analytic summary\n"
+"user-wise as well as month wise.\n"
+""
+msgstr ""
+
+#. module: account_analytic_analysis
#: field:account.analytic.account,last_invoice_date:0
msgid "Last Invoice Date"
msgstr ""
=== modified file 'account_analytic_default/i18n/account_analytic_default.pot'
--- account_analytic_default/i18n/account_analytic_default.pot 2010-12-03 15:55:33 +0000
+++ account_analytic_default/i18n/account_analytic_default.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:50+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:50+0000\n"
+"POT-Creation-Date: 2010-12-10 09:27:29+0000\n"
+"PO-Revision-Date: 2010-12-10 09:27:29+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -123,6 +123,18 @@
msgstr ""
#. module: account_analytic_default
+#: model:ir.module.module,description:account_analytic_default.module_meta_information
+msgid "\n"
+"Allows to automatically select analytic accounts based on criterions:\n"
+"* Product\n"
+"* Partner\n"
+"* User\n"
+"* Company\n"
+"* Date\n"
+" "
+msgstr ""
+
+#. module: account_analytic_default
#: help:account.analytic.default,product_id:0
msgid "select a product which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this product, it will automatically take this as an analytical account)"
msgstr ""
=== modified file 'account_analytic_plans/i18n/account_analytic_plans.pot'
--- account_analytic_plans/i18n/account_analytic_plans.pot 2010-12-03 15:55:33 +0000
+++ account_analytic_plans/i18n/account_analytic_plans.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:51+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:51+0000\n"
+"POT-Creation-Date: 2010-12-10 09:27:44+0000\n"
+"PO-Revision-Date: 2010-12-10 09:27:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,18 @@
"Plural-Forms: \n"
#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account4_ids:0
-msgid "Account4 Id"
+#: view:analytic.plan.create.model:0
+msgid "This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
msgstr ""
#. module: account_analytic_plans
@@ -29,26 +39,6 @@
msgstr ""
#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account5_ids:0
-msgid "Account5 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.crossovered.analytic,date2:0
-msgid "End Date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account3_ids:0
-msgid "Account3 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,rate:0
-msgid "Rate (%)"
-msgstr ""
-
-#. module: account_analytic_plans
#: view:account.analytic.plan:0
#: field:account.analytic.plan,name:0
#: field:account.analytic.plan.line,plan_id:0
@@ -59,95 +49,8 @@
msgstr ""
#. module: account_analytic_plans
-#: view:analytic.plan.create.model:0
-msgid "This distribution model has been saved.You will be able to reuse it later."
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
-#, python-format
-msgid "Please put a name and a code before saving the model !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
-msgid "Analytic Instance Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.instance.line:0
-msgid "Analytic Distribution Lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.crossovered.analytic:0
-msgid "Print"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "To Date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,plan_id:0
-msgid "Plan Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
-msgid "Analytic Distribution's Models"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Account Name"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.instance.line:0
-msgid "Analytic Distribution Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,code:0
-msgid "Distribution Code"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Percentage"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Printing date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_sale_order_line
-msgid "Sale Order Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.crossovered.analytic,empty_line:0
-msgid "Dont show empty lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
-msgid "analytic.plan.create.model.action"
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#, python-format
-msgid "A model having this name and code already exists !"
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
msgstr ""
#. module: account_analytic_plans
@@ -158,142 +61,24 @@
msgstr ""
#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "100.00%"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Currency"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Analytic Account :"
-msgstr ""
-
-#. module: account_analytic_plans
#: view:account.analytic.plan.line:0
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
msgid "Analytic Plan Line"
msgstr ""
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
-#, python-format
-msgid "No analytic plan defined !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Analytic Account Reference:"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,name:0
-msgid "Plan Name"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan,default_instance_id:0
-msgid "Default Entries"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on closed account."
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan:0
-#: field:account.analytic.plan,plan_ids:0
-#: field:account.journal,plan_id:0
-msgid "Analytic Plans"
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0
-#, python-format
-msgid "User Error"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
-msgid "analytic.plan.create.model"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account1_ids:0
-msgid "Account1 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,max_required:0
-msgid "Maximum Allowed (%)"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,root_analytic_id:0
-msgid "Root Account"
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
-#: view:analytic.plan.create.model:0
-#, python-format
-msgid "Distribution Model Saved"
-msgstr ""
-
-#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
msgid "Analytic Plan Instance"
msgstr ""
#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
-msgid "Distribution Models"
-msgstr ""
-
-#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
msgid "Ok"
msgstr ""
#. module: account_analytic_plans
#: constraint:account.move.line:0
-msgid "You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
-msgid "Multiple-plans management in Analytic Accounting"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.line:0
-msgid "Analytic Plan Lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,min_required:0
-msgid "Minimum Allowed (%)"
+msgid "You can not create move line on closed account."
msgstr ""
#. module: account_analytic_plans
@@ -307,14 +92,8 @@
msgstr ""
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#, python-format
-msgid "The Total Should be Between %s and %s"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
-msgid "Bank Statement Line"
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
msgstr ""
#. module: account_analytic_plans
@@ -323,8 +102,8 @@
msgstr ""
#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
-msgid "Print Crossovered Analytic"
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
msgstr ""
#. module: account_analytic_plans
@@ -338,6 +117,175 @@
msgstr ""
#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#: view:analytic.plan.create.model:0
+#, python-format
+msgid "Distribution Model Saved"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company!"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sale Order Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "No analytic plan defined !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+msgid "Analytic Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0
+#, python-format
+msgid "There are no Analytic lines related to Account %s"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr ""
+
+#. module: account_analytic_plans
#: model:ir.module.module,description:account_analytic_plans.module_meta_information
msgid "This module allows to use several analytic plans, according to the general journal,\n"
"so that multiple analytic lines are created when the invoice or the entries\n"
@@ -372,6 +320,53 @@
msgstr ""
#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
msgid "Save This Distribution as a Model"
msgstr ""
@@ -382,29 +377,14 @@
msgstr ""
#. module: account_analytic_plans
-#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
-msgid "Multi Plans"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account_ids:0
-msgid "Account Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Code"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_journal
-msgid "Journal"
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#, python-format
-msgid "You have to define an analytic journal on the '%s' journal!"
+msgid "Please put a name and a code before saving the model !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
msgstr ""
#. module: account_analytic_plans
@@ -414,23 +394,75 @@
msgstr ""
#. module: account_analytic_plans
-#: field:account.analytic.plan.line,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
-msgid "Invoice Line"
-msgstr ""
-
-#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
msgid "Bank Statement"
msgstr ""
#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,analytic_account_id:0
-msgid "Analytic Account"
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company!"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
msgstr ""
#. module: account_analytic_plans
@@ -445,59 +477,38 @@
msgstr ""
#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#, python-format
msgid "Value Error"
msgstr ""
#. module: account_analytic_plans
-#: help:account.analytic.plan.line,root_analytic_id:0
-msgid "Root account of this plan."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.crossovered.analytic,ref:0
-msgid "Analytic Account Reference"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: account_analytic_plans
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.crossovered.analytic:0
-#: view:analytic.plan.create.model:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.crossovered.analytic,date1:0
-msgid "Start Date"
-msgstr ""
-
-#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "You can not create move line on view account."
msgstr ""
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "at"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Company"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "From Date"
-msgstr ""
-
=== modified file 'account_analytic_plans/wizard/account_crossovered_analytic.py'
--- account_analytic_plans/wizard/account_crossovered_analytic.py 2010-11-04 12:42:42 +0000
+++ account_analytic_plans/wizard/account_crossovered_analytic.py 2010-12-11 04:13:59 +0000
@@ -57,7 +57,7 @@
flag = False
break
if flag:
- raise osv.except_osv(_('User Error'),_('There are no Analytic lines related to Account %s' % name))
+ raise osv.except_osv(_('User Error'),_('There are no Analytic lines related to Account %s') % name)
datas = {
'ids': [],
=== modified file 'account_anglo_saxon/i18n/account_anglo_saxon.pot'
--- account_anglo_saxon/i18n/account_anglo_saxon.pot 2010-12-03 15:55:33 +0000
+++ account_anglo_saxon/i18n/account_anglo_saxon.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:51+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:51+0000\n"
+"POT-Creation-Date: 2010-12-10 09:27:58+0000\n"
+"PO-Revision-Date: 2010-12-10 09:27:58+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@
"Plural-Forms: \n"
#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_category
msgid "Product Category"
msgstr ""
=== modified file 'account_budget/i18n/account_budget.pot'
--- account_budget/i18n/account_budget.pot 2010-12-03 15:55:33 +0000
+++ account_budget/i18n/account_budget.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:52+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:52+0000\n"
+"POT-Creation-Date: 2010-12-10 09:28:10+0000\n"
+"PO-Revision-Date: 2010-12-10 09:28:10+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -118,6 +118,7 @@
msgstr ""
#. module: account_budget
+#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "%"
msgstr ""
=== modified file 'account_cancel/i18n/account_cancel.pot'
--- account_cancel/i18n/account_cancel.pot 2010-12-03 15:55:33 +0000
+++ account_cancel/i18n/account_cancel.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:52+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:52+0000\n"
+"POT-Creation-Date: 2010-12-10 09:29:26+0000\n"
+"PO-Revision-Date: 2010-12-10 09:29:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,13 @@
"Plural-Forms: \n"
#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid "\n"
+" Module adds 'Allow cancelling entries' field on form view of account journal. If set to true it allows user to cancel entries & invoices.\n"
+" "
+msgstr ""
+
+#. module: account_cancel
#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
msgid "Account Cancel"
msgstr ""
=== modified file 'account_chart/i18n/account_chart.pot'
--- account_chart/i18n/account_chart.pot 2010-12-03 15:55:33 +0000
+++ account_chart/i18n/account_chart.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:53+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:53+0000\n"
+"POT-Creation-Date: 2010-12-10 09:29:51+0000\n"
+"PO-Revision-Date: 2010-12-10 09:29:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,3 +20,8 @@
msgid "Remove minimal account chart"
msgstr ""
+#. module: account_chart
+#: model:ir.module.module,shortdesc:account_chart.module_meta_information
+msgid "Charts of Accounts"
+msgstr ""
+
=== modified file 'account_coda/i18n/account_coda.pot'
--- account_coda/i18n/account_coda.pot 2010-12-03 15:55:33 +0000
+++ account_coda/i18n/account_coda.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:53+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:53+0000\n"
+"POT-Creation-Date: 2010-12-10 09:30:06+0000\n"
+"PO-Revision-Date: 2010-12-10 09:30:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -112,6 +112,12 @@
msgstr ""
#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "The bank account %s is not defined for the partner %s"
+msgstr ""
+
+#. module: account_coda
#: model:ir.model,name:account_coda.model_account_coda
msgid "coda for an Account"
msgstr ""
@@ -137,13 +143,6 @@
msgstr ""
#. module: account_coda
-#: code:addons/account_coda/wizard/account_coda_import.py:0
-#, python-format
-msgid "The bank account %s is not defined for the partner %s.\n"
-""
-msgstr ""
-
-#. module: account_coda
#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
msgid "Import Coda Statements"
msgstr ""
@@ -155,6 +154,14 @@
msgstr ""
#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid "\n"
+" Module provides functionality to import\n"
+" bank statements from coda files.\n"
+" "
+msgstr ""
+
+#. module: account_coda
#: view:account.coda:0
msgid "Statements"
msgstr ""
=== modified file 'account_coda/wizard/account_coda_import.py'
--- account_coda/wizard/account_coda_import.py 2010-10-28 06:54:18 +0000
+++ account_coda/wizard/account_coda_import.py 2010-12-11 04:13:59 +0000
@@ -164,7 +164,7 @@
bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_receivable.id})
else:
nb_err += 1
- err_log += _('The bank account %s is not defined for the partner %s.\n')%(cntry_number, contry_name)
+ err_log += _('The bank account %s is not defined for the partner %s')%(cntry_number, contry_name)
bank_statement_lines[st_line_name].update({'account_id': data['awaiting_account']})
bank_statement["bank_statement_line"]=bank_statement_lines
=== modified file 'account_followup/i18n/account_followup.pot'
--- account_followup/i18n/account_followup.pot 2010-12-03 15:55:33 +0000
+++ account_followup/i18n/account_followup.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:54+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:54+0000\n"
+"POT-Creation-Date: 2010-12-10 09:30:19+0000\n"
+"PO-Revision-Date: 2010-12-10 09:30:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -184,6 +184,12 @@
msgstr ""
#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "E-Mail not sent to following Partners, Email not available %s!"
+msgstr ""
+
+#. module: account_followup
#: selection:account_followup.followup.line,start:0
msgid "End of Month"
msgstr ""
@@ -324,6 +330,12 @@
msgstr ""
#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "All E-mails have been successfully sent to Partners: %s."
+msgstr ""
+
+#. module: account_followup
#: view:account.followup.print.all:0
msgid "Send Mails"
msgstr ""
@@ -420,14 +432,6 @@
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid "All E-mails have been successfully sent to Partners:.\n"
-"\n"
-""
-msgstr ""
-
-#. module: account_followup
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
msgstr ""
@@ -544,6 +548,12 @@
msgstr ""
#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "E-Mail sent to following Partners successfully %s!"
+msgstr ""
+
+#. module: account_followup
#: view:account_followup.stat:0
msgid "Followup Level"
msgstr ""
@@ -605,14 +615,6 @@
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid "E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-""
-msgstr ""
-
-#. module: account_followup
#: view:account.followup.print:0
msgid "Continue"
msgstr ""
=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py 2010-11-16 06:07:20 +0000
+++ account_followup/wizard/account_followup_print.py 2010-12-11 04:13:59 +0000
@@ -281,10 +281,10 @@
msg += partner.name + '\n'
msg_unsent += msg
if not msg_unsent:
- summary = _("All E-mails have been successfully sent to Partners:.\n\n") + msg_sent
+ summary = (_("All E-mails have been successfully sent to Partners: %s.") % ('\n\n' + msg_sent))
else:
- msg_unsent = _("E-Mail not sent to following Partners, Email not available !\n\n") + msg_unsent
- msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n") + msg_sent
+ msg_unsent = (_("E-Mail not sent to following Partners, Email not available %s!") % ('\n\n' + msg_unsent))
+ msg_sent = msg_sent and (_("E-Mail sent to following Partners successfully %s!") % ('\n\n' + msg_sent))
line = '=========================================================================='
summary = msg_unsent + line + msg_sent
context.update({'summary': summary})
=== modified file 'account_invoice_layout/i18n/account_invoice_layout.pot'
--- account_invoice_layout/i18n/account_invoice_layout.pot 2010-12-03 15:55:33 +0000
+++ account_invoice_layout/i18n/account_invoice_layout.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:54+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:54+0000\n"
+"POT-Creation-Date: 2010-12-10 09:30:34+0000\n"
+"PO-Revision-Date: 2010-12-10 09:30:34+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -72,8 +72,18 @@
msgstr ""
#. module: account_invoice_layout
-#: model:notify.message,msg:account_invoice_layout.demo_message1
-msgid "Be Expert with the Experts..."
+#: model:ir.module.module,description:account_invoice_layout.module_meta_information
+msgid "\n"
+" This module provides some features to improve the layout of the invoices.\n"
+"\n"
+" It gives you the possibility to\n"
+" * order all the lines of an invoice\n"
+" * add titles, comment lines, sub total lines\n"
+" * draw horizontal lines and put page breaks\n"
+"\n"
+" Moreover, there is one option which allows you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions...\n"
+"\n"
+" "
msgstr ""
#. module: account_invoice_layout
@@ -115,6 +125,11 @@
msgstr ""
#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr ""
+
+#. module: account_invoice_layout
#: help:account.invoice.line,sequence:0
msgid "Gives the sequence order when displaying a list of invoice lines."
msgstr ""
@@ -143,8 +158,8 @@
msgstr ""
#. module: account_invoice_layout
-#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
-msgid "Write Messages"
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
msgstr ""
#. module: account_invoice_layout
@@ -304,8 +319,8 @@
msgstr ""
#. module: account_invoice_layout
-#: view:account.invoice.special.msg:0
-msgid "Cancel"
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "Be Expert with the Experts..."
msgstr ""
#. module: account_invoice_layout
=== modified file 'account_payment/account_invoice.py'
--- account_payment/account_invoice.py 2010-10-22 12:08:56 +0000
+++ account_payment/account_invoice.py 2010-12-11 04:13:59 +0000
@@ -44,8 +44,7 @@
_columns = {
'amount_to_pay': fields.function(_amount_to_pay, method=True,
type='float', string='Amount to be paid',
- help='The amount which should be paid at the current date\n' \
- 'minus the amount which is already in payment order'),
+ help='The amount which should be paid at the current date minus the amount which is already in payment order'),
}
Invoice()
=== modified file 'account_payment/i18n/account_payment.pot'
--- account_payment/i18n/account_payment.pot 2010-12-03 15:55:33 +0000
+++ account_payment/i18n/account_payment.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:55+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:55+0000\n"
+"POT-Creation-Date: 2010-12-10 09:30:52+0000\n"
+"PO-Revision-Date: 2010-12-10 09:30:52+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -42,6 +42,15 @@
msgstr ""
#. module: account_payment
+#: model:ir.module.module,description:account_payment.module_meta_information
+msgid "\n"
+"This module provides :\n"
+"* a more efficient way to manage invoice payment.\n"
+"* a basic mechanism to easily plug various automated payment.\n"
+" "
+msgstr ""
+
+#. module: account_payment
#: field:payment.order,line_ids:0
msgid "Payment lines"
msgstr ""
@@ -61,12 +70,6 @@
msgstr ""
#. module: account_payment
-#: help:account.invoice,amount_to_pay:0
-msgid "The amount which should be paid at the current date\n"
-"minus the amount which is already in payment order"
-msgstr ""
-
-#. module: account_payment
#: field:payment.mode,company_id:0
msgid "Company"
msgstr ""
@@ -665,6 +668,11 @@
msgstr ""
#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid "The amount which should be paid at the current date minus the amount which is already in payment order"
+msgstr ""
+
+#. module: account_payment
#: field:payment.line,partner_id:0
#: report:payment.order:0
msgid "Partner"
=== modified file 'account_sequence/i18n/account_sequence.pot'
--- account_sequence/i18n/account_sequence.pot 2010-12-03 15:55:33 +0000
+++ account_sequence/i18n/account_sequence.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:55+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:55+0000\n"
+"POT-Creation-Date: 2010-12-10 09:31:08+0000\n"
+"PO-Revision-Date: 2010-12-10 09:31:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -42,16 +42,33 @@
msgstr ""
#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company!"
+msgstr ""
+
+#. module: account_sequence
#: field:account.sequence.installer,number_increment:0
msgid "Increment Number"
msgstr ""
#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid "\n"
+" This module maintains internal sequence number for accounting entries.\n"
+" "
+msgstr ""
+
+#. module: account_sequence
#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
msgid "Entries Sequence Numbering"
msgstr ""
#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company!"
+msgstr ""
+
+#. module: account_sequence
#: help:account.sequence.installer,number_increment:0
msgid "The next number of the sequence will be incremented by this number"
msgstr ""
@@ -72,11 +89,6 @@
msgstr ""
#. module: account_sequence
-#: help:account.journal,internal_sequence_id:0
-msgid "This sequence will be used to maintain the internal number for the journal entries related to this journal."
-msgstr ""
-
-#. module: account_sequence
#: field:account.sequence.installer,padding:0
msgid "Number padding"
msgstr ""
@@ -158,18 +170,13 @@
msgstr ""
#. module: account_sequence
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
-msgstr ""
-
-#. module: account_sequence
#: field:account.sequence.installer,prefix:0
msgid "Prefix"
msgstr ""
#. module: account_sequence
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
+#: help:account.journal,internal_sequence_id:0
+msgid "This sequence will be used to maintain the internal number for the journal entries related to this journal."
msgstr ""
#. module: account_sequence
=== modified file 'account_voucher/i18n/account_voucher.pot'
--- account_voucher/i18n/account_voucher.pot 2010-12-03 15:55:33 +0000
+++ account_voucher/i18n/account_voucher.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:56+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:56+0000\n"
+"POT-Creation-Date: 2010-12-10 09:32:16+0000\n"
+"PO-Revision-Date: 2010-12-10 09:32:16+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -281,8 +281,11 @@
msgstr ""
#. module: account_voucher
-#: view:account.voucher:0
-msgid "Payment Information"
+#: help:account.voucher,state:0
+msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed Voucher. \n"
+"* The 'Pro-forma' when voucher is in Pro-forma state,voucher does not have an voucher number. \n"
+"* The 'Posted' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \n"
+"* The 'Cancelled' state is used when user cancel voucher."
msgstr ""
#. module: account_voucher
@@ -303,12 +306,6 @@
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
-#, python-format
-msgid "You have to configure account base code and account tax code on the '%s' tax!"
-msgstr ""
-
-#. module: account_voucher
#: report:voucher.print:0
msgid "Account :"
msgstr ""
@@ -404,6 +401,11 @@
msgstr ""
#. module: account_voucher
+#: field:account.voucher,tax_amount:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
msgid "Vendor Payment"
@@ -423,8 +425,8 @@
msgstr ""
#. module: account_voucher
-#: field:account.voucher,tax_amount:0
-msgid "Tax Amount"
+#: view:account.voucher:0
+msgid "Payment Information"
msgstr ""
#. module: account_voucher
@@ -438,8 +440,8 @@
msgstr ""
#. module: account_voucher
-#: selection:account.voucher,pay_now:0
-msgid "Pay Directly"
+#: view:account.voucher:0
+msgid "Expense Lines"
msgstr ""
#. module: account_voucher
@@ -550,8 +552,9 @@
msgstr ""
#. module: account_voucher
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "Number:"
msgstr ""
#. module: account_voucher
@@ -560,8 +563,8 @@
msgstr ""
#. module: account_voucher
-#: view:account.voucher:0
-msgid "Expense Lines"
+#: selection:account.voucher,pay_now:0
+msgid "Pay Directly"
msgstr ""
#. module: account_voucher
@@ -624,9 +627,8 @@
msgstr ""
#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-#: report:voucher.print:0
-msgid "Number:"
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
msgstr ""
#. module: account_voucher
@@ -728,6 +730,12 @@
msgstr ""
#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "You have to configure account base code and account tax code on the '%s' tax!"
+msgstr ""
+
+#. module: account_voucher
#: view:account.voucher:0
msgid "Are you sure to confirm this record ?"
msgstr ""
=== modified file 'analytic/i18n/analytic.pot'
--- analytic/i18n/analytic.pot 2010-12-03 15:55:33 +0000
+++ analytic/i18n/analytic.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:56+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:56+0000\n"
+"POT-Creation-Date: 2010-12-10 09:32:31+0000\n"
+"PO-Revision-Date: 2010-12-10 09:32:31+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -62,6 +62,18 @@
msgstr ""
#. module: analytic
+#: help:account.analytic.account,state:0
+msgid "* When an account is created its in 'Draft' state. \n"
+"* If any associated partner is there, it can be in 'Open' state. \n"
+"* If any pending balance is there it can be in 'Pending'. \n"
+"* And finally when all the transactions are over, it can be in 'Close' state. \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. If its in 'Running' state it is a normal project. \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
#: field:account.analytic.account,type:0
msgid "Account Type"
msgstr ""
=== modified file 'analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot'
--- analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot 2010-12-03 15:55:33 +0000
+++ analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:57+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:57+0000\n"
+"POT-Creation-Date: 2010-12-10 09:32:46+0000\n"
+"PO-Revision-Date: 2010-12-10 09:32:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,17 @@
"Plural-Forms: \n"
#. module: analytic_journal_billing_rate
+#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
+msgid "\n"
+"\n"
+" This module allows you to define what is the default invoicing rate for a specific journal on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.\n"
+"\n"
+" Obviously if no data has been recorded for the current account, the default value is given as usual by the account data so that this module is perfectly compatible with older configurations.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: analytic_journal_billing_rate
#: field:analytic_journal_rate_grid,journal_id:0
msgid "Analytic Journal"
msgstr ""
=== modified file 'analytic_user_function/i18n/analytic_user_function.pot'
--- analytic_user_function/i18n/analytic_user_function.pot 2010-12-03 15:55:33 +0000
+++ analytic_user_function/i18n/analytic_user_function.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:57+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:57+0000\n"
+"POT-Creation-Date: 2010-12-10 09:32:58+0000\n"
+"PO-Revision-Date: 2010-12-10 09:32:58+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -60,16 +60,27 @@
msgstr ""
#. module: analytic_user_function
+#: model:ir.module.module,description:analytic_user_function.module_meta_information
+msgid "\n"
+"\n"
+" This module allows you to define what is the default function of a specific user on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.\n"
+"\n"
+" Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
+msgid "Analytic User Function"
+msgstr ""
+
+#. module: analytic_user_function
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr ""
#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr ""
-
-#. module: analytic_user_function
#: view:analytic_user_funct_grid:0
msgid "User's Product for this Analytic Account"
msgstr ""
=== modified file 'association/i18n/association.pot'
--- association/i18n/association.pot 2010-12-03 15:55:33 +0000
+++ association/i18n/association.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:42:57+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:57+0000\n"
+"POT-Creation-Date: 2010-12-10 09:33:14+0000\n"
+"PO-Revision-Date: 2010-12-10 09:33:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,6 +66,11 @@
msgstr ""
#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr ""
+
+#. module: association
#: model:ir.module.module,shortdesc:association.module_meta_information
msgid "Association profile"
msgstr ""
@@ -76,8 +81,8 @@
msgstr ""
#. module: association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
+#: model:ir.actions.act_window,name:association.action_config_install_module
+msgid "Association Application Configuration"
msgstr ""
#. module: association
=== modified file 'auction/i18n/auction.pot'
--- auction/i18n/auction.pot 2010-12-03 15:55:33 +0000
+++ auction/i18n/auction.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:00+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:00+0000\n"
+"POT-Creation-Date: 2010-12-10 09:33:36+0000\n"
+"PO-Revision-Date: 2010-12-10 09:33:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -246,6 +246,12 @@
msgstr ""
#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:0
+#, python-format
+msgid "Two different buyers for the same invoice! Please correct this problem before invoicing"
+msgstr ""
+
+#. module: auction
#: help:auction.lots,lot_num:0
msgid "List number in depositer inventory"
msgstr ""
@@ -1545,13 +1551,6 @@
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_lots_invoice.py:0
-#, python-format
-msgid "Two different buyers for the same invoice !\n"
-"Please correct this problem before invoicing"
-msgstr ""
-
-#. module: auction
#: view:auction.dates:0
msgid "Invoice"
msgstr ""
@@ -1796,6 +1795,24 @@
msgstr ""
#. module: auction
+#: model:ir.module.module,description:auction.module_meta_information
+msgid "\n"
+" This module manages the records of the artists,\n"
+" the articles to be put up for auction,the buyers and\n"
+" sellers.\n"
+"\n"
+" It completely manages an auction such as managing bids,\n"
+" keeping track of the sold articles along with the paid\n"
+" and unpaid objects including delivery of the articles.\n"
+" Dashboards for auction that includes:\n"
+" * My Latest Objects (list)\n"
+" * My Latest Deposits (list)\n"
+" * Objects Statistics (list)\n"
+" * My Objects By Day (list)\n"
+" "
+msgstr ""
+
+#. module: auction
#: view:auction.taken:0
msgid "OK"
msgstr ""
=== modified file 'auction/wizard/auction_lots_invoice.py'
--- auction/wizard/auction_lots_invoice.py 2010-08-19 11:51:57 +0000
+++ auction/wizard/auction_lots_invoice.py 2010-12-11 04:13:59 +0000
@@ -63,7 +63,7 @@
if lot['ach_uid']:
if uid and (lot['ach_uid'][0]<>uid):
- raise osv.except_osv(_('UserError'), _('Two different buyers for the same invoice !\nPlease correct this problem before invoicing'))
+ raise osv.except_osv(_('UserError'), _('Two different buyers for the same invoice! Please correct this problem before invoicing'))
uid = lot['ach_uid'][0]
elif lot['ach_login']:
refs = service.execute(uid, 'res.partner', 'search', [('ref','=',lot['ach_login'])])
=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py 2010-11-23 10:08:10 +0000
+++ audittrail/audittrail.py 2010-12-11 04:13:59 +0000
@@ -210,7 +210,7 @@
else:
field_ids = field_pool.search(cr, uid, [('name', '=', field_name), ('model_id', '=', model.id)])
field_id = field_ids and field_ids[0] or False
- assert field_id, _("'%s' field does not exist in '%s' model" %(field_name, model.model))
+ assert field_id, (_("'%s' field does not exist in '%s' model") % (field_name, model.model))
field = field_pool.read(cr, uid, field_id)
relation_model = field['relation']
@@ -258,7 +258,7 @@
else:
field_ids = field_pool.search(cr, uid, [('name', '=', line['name']), ('model_id', '=', model.id)])
field_id = field_ids and field_ids[0] or False
- assert field_id, _("'%s' field does not exist in '%s' model" %(line['name'], model.model))
+ assert field_id, (_("'%s' field does not exist in '%s' model") %(line['name'], model.model))
field = field_pool.read(cr, uid, field_id)
old_value = 'old_value' in line and line['old_value'] or ''
@@ -308,7 +308,7 @@
model_ids = model_pool.search(cr, uid, [('model', '=', model)])
model_id = model_ids and model_ids[0] or False
- assert model_id, _("'%s' Model does not exist..." %(model))
+ assert model_id, (_("'%s' Model does not exist...")%(model))
model = model_pool.browse(cr, uid, model_id)
if method in ('create'):
=== modified file 'audittrail/i18n/audittrail.pot'
--- audittrail/i18n/audittrail.pot 2010-12-03 15:55:33 +0000
+++ audittrail/i18n/audittrail.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:00+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:00+0000\n"
+"POT-Creation-Date: 2010-12-10 09:33:55+0000\n"
+"PO-Revision-Date: 2010-12-10 09:33:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -38,6 +38,12 @@
msgstr ""
#. module: audittrail
+#: code:addons/audittrail/audittrail.py:0
+#, python-format
+msgid "'%s' Model does not exist..."
+msgstr ""
+
+#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_rule
msgid "Audittrail Rule"
msgstr ""
@@ -186,8 +192,8 @@
msgstr ""
#. module: audittrail
-#: field:audittrail.rule,log_create:0
-msgid "Log Creates"
+#: view:audittrail.rule:0
+msgid "AuditTrail Rules"
msgstr ""
#. module: audittrail
@@ -206,6 +212,18 @@
msgstr ""
#. module: audittrail
+#: model:ir.module.module,description:audittrail.module_meta_information
+msgid "\n"
+" This module gives the administrator the rights\n"
+" to track every user operation on all the objects\n"
+" of the system.\n"
+"\n"
+" Administrator can subscribe rules for read,write and\n"
+" delete on objects and can check logs.\n"
+" "
+msgstr ""
+
+#. module: audittrail
#: field:audittrail.rule,log_read:0
msgid "Log Reads"
msgstr ""
@@ -227,8 +245,8 @@
msgstr ""
#. module: audittrail
-#: view:audittrail.rule:0
-msgid "AuditTrail Rules"
+#: field:audittrail.rule,log_create:0
+msgid "Log Creates"
msgstr ""
#. module: audittrail
@@ -298,6 +316,12 @@
msgstr ""
#. module: audittrail
+#: code:addons/audittrail/audittrail.py:0
+#, python-format
+msgid "'%s' field does not exist in '%s' model"
+msgstr ""
+
+#. module: audittrail
#: view:audittrail.log:0
msgid "AuditTrail Logs"
msgstr ""
=== modified file 'base_action_rule/i18n/base_action_rule.pot'
--- base_action_rule/i18n/base_action_rule.pot 2010-12-03 15:55:33 +0000
+++ base_action_rule/i18n/base_action_rule.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:13+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:13+0000\n"
+"POT-Creation-Date: 2010-12-10 09:34:48+0000\n"
+"PO-Revision-Date: 2010-12-10 09:34:48+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -368,6 +368,11 @@
#. module: base_action_rule
#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
msgid "%(object_user_email)s = Responsible Email"
msgstr ""
=== modified file 'base_calendar/i18n/base_calendar.pot'
--- base_calendar/i18n/base_calendar.pot 2010-12-03 15:55:33 +0000
+++ base_calendar/i18n/base_calendar.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:14+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:14+0000\n"
+"POT-Creation-Date: 2010-12-10 09:35:01+0000\n"
+"PO-Revision-Date: 2010-12-10 09:35:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -661,12 +661,6 @@
msgstr ""
#. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr ""
-
-#. module: base_calendar
#: view:calendar.event:0
msgid "Subject"
msgstr ""
@@ -913,11 +907,9 @@
msgstr ""
#. module: base_calendar
-#: field:calendar.alarm,active:0
-#: field:calendar.event,active:0
-#: field:calendar.todo,active:0
-#: field:res.alarm,active:0
-msgid "Active"
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
msgstr ""
#. module: base_calendar
@@ -1024,9 +1016,11 @@
msgstr ""
#. module: base_calendar
-#: view:calendar.event:0
-#: field:calendar.event,date:0
-msgid "Date"
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
msgstr ""
#. module: base_calendar
@@ -1499,6 +1493,12 @@
msgstr ""
#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
#: help:calendar.event,alarm_id:0
#: help:calendar.todo,alarm_id:0
msgid "Set an alarm at this time, before the event occurs"
@@ -1516,6 +1516,13 @@
msgstr ""
#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: base_calendar
#: view:calendar.attendee:0
msgid "Invitation To"
msgstr ""
@@ -1555,10 +1562,10 @@
msgstr ""
#. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
-#: selection:calendar.event,week_list:0
-#: selection:calendar.todo,week_list:0
-msgid "Saturday"
+#: help:calendar.alarm,attach:0
+msgid "* Points to a sound resource, which is rendered when the alarm is triggered for audio,\n"
+" * File which is intended to be sent as message attachments for email,\n"
+" * Points to a procedure resource, which is invoked when the alarm is triggered for procedure."
msgstr ""
#. module: base_calendar
=== modified file 'base_contact/i18n/base_contact.pot'
--- base_contact/i18n/base_contact.pot 2010-12-03 15:55:33 +0000
+++ base_contact/i18n/base_contact.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:15+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:15+0000\n"
+"POT-Creation-Date: 2010-12-10 09:35:14+0000\n"
+"PO-Revision-Date: 2010-12-10 09:35:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,73 +16,8 @@
"Plural-Forms: \n"
#. module: base_contact
-#: field:res.partner.job,sequence_contact:0
-msgid "Contact Seq."
-msgstr ""
-
-#. module: base_contact
-#: help:base.contact.installer,migrate:0
-msgid "If you select this, all addresses will be migrated."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.address:0
-msgid "Search Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: view:res.partner:0
-#: field:res.partner.address,job_ids:0
-msgid "Contacts"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.job,sequence_partner:0
-msgid "Partner Seq."
-msgstr ""
-
-#. module: base_contact
-#: selection:res.partner.job,state:0
-msgid "Current"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_job
-msgid "Contact Partner Function"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.job,other:0
-msgid "Other"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,state:0
-msgid "Status of Address"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_contacttofunction0
-msgid "Contact to function"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.job,function:0
-msgid "Partner Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
+#: field:res.partner.contact,title:0
+msgid "Title"
msgstr ""
#. module: base_contact
@@ -91,58 +26,18 @@
msgstr ""
#. module: base_contact
-#: help:res.partner.job,other:0
-msgid "Additional phone field"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid "If the active field is set to False, it will allow you to hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Seq."
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_function0
-msgid "Function"
-msgstr ""
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
-
-#. module: base_contact
#: field:res.partner.job,fax:0
msgid "Fax"
msgstr ""
#. module: base_contact
-#: field:base.contact.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.job,phone:0
-msgid "Phone"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_contacttofunction0
-msgid "Defines contacts and functions."
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_base_contact_installer
-msgid "base.contact.installer"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
+#: view:base.contact.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,date_start:0
+msgid "Start date of job(Joining Date)"
msgstr ""
#. module: base_contact
@@ -151,8 +46,94 @@
msgstr ""
#. module: base_contact
-#: view:res.partner.job:0
-msgid "Contact Functions"
+#: help:res.partner.job,state:0
+msgid "Status of Address"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,name:0
+msgid "You may enter Address first,Partner will be linked automatically if any."
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,fax:0
+msgid "Job FAX no."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,date_stop:0
+msgid "Last date of job"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+#: field:base.contact.installer,migrate:0
+msgid "Migrate"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.contact,active:0
+msgid "If the active field is set to False, it will allow you to hide the partner contact without removing it."
+msgstr ""
+
+#. module: base_contact
+#: model:ir.module.module,description:base_contact.module_meta_information
+msgid "\n"
+" This module allows you to manage your contacts entirely.\n"
+"\n"
+" It lets you define\n"
+" *contacts unrelated to a partner,\n"
+" *contacts working at several addresses (possibly for different partners),\n"
+" *contacts with possibly different functions for each of its job's addresses\n"
+"\n"
+" It also adds new menu items located in\n"
+" Partners \\ Contacts\n"
+" Partners \\ Functions\n"
+"\n"
+" Pay attention that this module converts the existing addresses into \"addresses + contacts\". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object.\n"
+" "
msgstr ""
#. module: base_contact
@@ -162,81 +143,23 @@
msgstr ""
#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Due to changes in Address and Partner's relation, some of the details from address are needed to be migrated into contact information."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-#: field:res.partner.job,email:0
-msgid "E-Mail"
-msgstr ""
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr ""
-
-#. module: base_contact
#: field:res.partner.job,date_stop:0
msgid "Date Stop"
msgstr ""
#. module: base_contact
-#: view:res.partner:0
-#: field:res.partner.job,address_id:0
-msgid "Address"
-msgstr ""
-
-#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
msgid "Contact's Jobs"
msgstr ""
#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.address,job_id:0
-#: field:res.partner.contact,job_id:0
-msgid "Main Job"
-msgstr ""
-
-#. module: base_contact
#: view:res.partner:0
msgid "Categories"
msgstr ""
#. module: base_contact
-#: help:res.partner.job,name:0
-msgid "You may enter Address first,Partner will be linked automatically if any."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:base.contact.installer,name:0
-msgid "Name"
+#: help:res.partner.job,sequence_partner:0
+msgid "Order of importance of this job title in the list of job title of the linked partner"
msgstr ""
#. module: base_contact
@@ -245,34 +168,13 @@
msgstr ""
#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
#: help:res.partner.job,extension:0
msgid "Internal/External extension phone number"
msgstr ""
#. module: base_contact
-#: help:res.partner.job,sequence_partner:0
-msgid "Order of importance of this job title in the list of job title of the linked partner"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
+#: help:res.partner.job,phone:0
+msgid "Job Phone no."
msgstr ""
#. module: base_contact
@@ -282,39 +184,19 @@
msgstr ""
#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,phone:0
-msgid "Job Phone no."
-msgstr ""
-
-#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_contact
#: field:res.partner.job,contact_id:0
msgid "Contact"
msgstr ""
#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
#: help:res.partner.job,email:0
msgid "Job E-Mail"
msgstr ""
#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
msgstr ""
#. module: base_contact
@@ -323,47 +205,6 @@
msgstr ""
#. module: base_contact
-#: help:res.partner.job,date_stop:0
-msgid "Last date of job"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
-msgid "Address Migration"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
-msgid "Open Jobs"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-#: view:res.partner:0
-msgid "Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.job,state:0
-msgid "State"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
#: field:res.partner.contact,name:0
msgid "Last Name"
msgstr ""
@@ -381,13 +222,43 @@
msgstr ""
#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_address
+msgid "Partner Addresses"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,sequence_contact:0
+msgid "Contact Seq."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "Search Contact"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
+#: model:process.node,name:base_contact.process_node_contacts0
+#: view:res.partner:0
+#: field:res.partner.address,job_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_contact
#: view:base.contact.installer:0
-msgid "title"
+msgid "Due to changes in Address and Partner's relation, some of the details from address are needed to be migrated into contact information."
msgstr ""
#. module: base_contact
-#: help:res.partner.job,date_start:0
-msgid "Start date of job(Joining Date)"
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
msgstr ""
#. module: base_contact
@@ -396,40 +267,202 @@
msgstr ""
#. module: base_contact
+#: field:res.partner.job,function:0
+msgid "Partner Function"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Otherwise these details will not be visible from address/contact."
+msgstr ""
+
+#. module: base_contact
+#: field:base.contact.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_base_contact_installer
+msgid "base.contact.installer"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Do you want to migrate your Address data in Contact Data?"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,function:0
+msgid "Main Function"
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: base_contact
#: view:res.partner.contact:0
msgid "General"
msgstr ""
#. module: base_contact
-#: selection:res.partner.job,state:0
-msgid "Past"
-msgstr ""
-
-#. module: base_contact
-#: view:base.contact.installer:0
-#: field:base.contact.installer,migrate:0
-msgid "Migrate"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,fax:0
-msgid "Job FAX no."
-msgstr ""
-
-#. module: base_contact
#: view:res.partner.contact:0
msgid "Photo"
msgstr ""
#. module: base_contact
-#: model:process.node,note:base_contact.process_node_function0
-msgid "Jobs at a same partner address."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.job,name:0
-msgid "Partner"
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr ""
+
+#. module: base_contact
+#: help:base.contact.installer,migrate:0
+msgid "If you select this, all addresses will be migrated."
+msgstr ""
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Current"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,first_name:0
+msgid "First Name"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_job
+msgid "Contact Partner Function"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,other:0
+msgid "Other"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_function0
+msgid "Function"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.address,job_id:0
+#: field:res.partner.contact,job_id:0
+msgid "Main Job"
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_contacttofunction0
+msgid "Defines contacts and functions."
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner:0
+#: field:res.partner.job,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,country_id:0
+msgid "Nationality"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
+msgid "Open Jobs"
+msgstr ""
+
+#. module: base_contact
+#: field:base.contact.installer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,partner_id:0
+msgid "Main Employer"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
+msgid "Address Migration"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Postal Address"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_addresses0
+#: view:res.partner:0
+msgid "Addresses"
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
msgstr ""
#. module: base_contact
@@ -438,22 +471,7 @@
msgstr ""
#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
-msgid "Define functions and address."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr ""
-
-#. module: base_contact
#: help:res.partner.job,sequence_contact:0
msgid "Order of importance of this address in the list of addresses of the linked contact"
msgstr ""
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr ""
-
=== modified file 'base_iban/i18n/base_iban.pot'
--- base_iban/i18n/base_iban.pot 2010-12-03 15:55:33 +0000
+++ base_iban/i18n/base_iban.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:15+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:15+0000\n"
+"POT-Creation-Date: 2010-12-10 09:35:43+0000\n"
+"PO-Revision-Date: 2010-12-10 09:35:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -52,6 +52,14 @@
msgstr ""
#. module: base_iban
+#: model:ir.module.module,description:base_iban.module_meta_information
+msgid "\n"
+"This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity\n"
+"\n"
+" "
+msgstr ""
+
+#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
msgid "iban"
msgstr ""
=== modified file 'base_module_doc_rst/i18n/base_module_doc_rst.pot'
--- base_module_doc_rst/i18n/base_module_doc_rst.pot 2010-12-03 15:55:33 +0000
+++ base_module_doc_rst/i18n/base_module_doc_rst.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:16+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:16+0000\n"
+"POT-Creation-Date: 2010-12-10 09:36:19+0000\n"
+"PO-Revision-Date: 2010-12-10 09:36:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,8 +41,13 @@
msgstr ""
#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
+#: model:ir.module.module,description:base_module_doc_rst.module_meta_information
+msgid "\n"
+" * This module generates the Technical Guides of selected modules in Restructured Text format (RST)\n"
+" * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
+" * It creates a tarball (.tgz file suffix) containing an index file and one file per module\n"
+" * Generates Relationship Graph\n"
+" "
msgstr ""
#. module: base_module_doc_rst
@@ -68,6 +73,11 @@
msgstr ""
#. module: base_module_doc_rst
+#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
+msgid "Module"
+msgstr ""
+
+#. module: base_module_doc_rst
#: wizard_field:tech.guide.rst,init,rst_file:0
msgid "file"
msgstr ""
=== modified file 'base_module_quality/i18n/base_module_quality.pot'
--- base_module_quality/i18n/base_module_quality.pot 2010-12-03 15:55:33 +0000
+++ base_module_quality/i18n/base_module_quality.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:16+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:16+0000\n"
+"POT-Creation-Date: 2010-12-10 09:36:54+0000\n"
+"PO-Revision-Date: 2010-12-10 09:36:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -159,6 +159,12 @@
msgstr ""
#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#, python-format
+msgid "Feedback about structure of module"
+msgstr ""
+
+#. module: base_module_quality
#: code:addons/base_module_quality/unit_test/unit_test.py:0
#, python-format
msgid "Unit Test"
@@ -387,9 +393,9 @@
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
#, python-format
-msgid "Feedback about structure of module"
+msgid "Feed back About Workflow of Module"
msgstr ""
#. module: base_module_quality
@@ -406,9 +412,9 @@
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:0
#, python-format
-msgid "Feed back About Workflow of Module"
+msgid "Error in Read method: %s"
msgstr ""
#. module: base_module_quality
@@ -428,6 +434,14 @@
msgstr ""
#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#, python-format
+msgid "\n"
+"PEP-8 Test , copyright of py files check, method can not call from loops\n"
+""
+msgstr ""
+
+#. module: base_module_quality
#: field:module.quality.check,final_score:0
msgid "Final Score (%)"
msgstr ""
=== modified file 'base_module_quality/speed_test/speed_test.py'
--- base_module_quality/speed_test/speed_test.py 2010-11-19 12:20:03 +0000
+++ base_module_quality/speed_test/speed_test.py 2010-12-11 04:13:59 +0000
@@ -113,7 +113,7 @@
except Exception, e:
self.log.warning('Error in read method', exc_info=True)
list2 = [obj, _("Error in Read method")]
- speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Error in Read method") + ": %s " % e]
+ speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Error in Read method: %s") % (e)]
else:
if size < 5:
speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Warning! Not enough demo data")]
=== modified file 'base_module_record/i18n/base_module_record.pot'
--- base_module_record/i18n/base_module_record.pot 2010-12-03 15:55:33 +0000
+++ base_module_record/i18n/base_module_record.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:17+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:17+0000\n"
+"POT-Creation-Date: 2010-12-10 09:39:03+0000\n"
+"PO-Revision-Date: 2010-12-10 09:39:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -264,3 +264,24 @@
msgid "Created & Modified"
msgstr ""
+#. module: base_module_record
+#: model:ir.module.module,description:base_module_record.module_meta_information
+msgid "\n"
+"This module allows you to create a new module without any development.\n"
+"It records all operations on objects during the recording session and\n"
+"produce a .ZIP module. So you can create your own module directly from\n"
+"the OpenERP client.\n"
+"\n"
+"This version works for creating and updating existing records. It recomputes\n"
+"dependencies and links for all types of widgets (many2one, many2many, ...).\n"
+"It also support workflows and demo/update data.\n"
+"\n"
+"This should help you to easily create reusable and publishable modules\n"
+"for custom configurations and demo/testing data.\n"
+"\n"
+"How to use it:\n"
+"Run Administration/Customization/Module Creation/Export Customizations As a Module wizard.\n"
+"Select datetime criteria of recording and objects to be recorded and Record module.\n"
+" "
+msgstr ""
+
=== modified file 'base_report_creator/i18n/base_report_creator.pot'
--- base_report_creator/i18n/base_report_creator.pot 2010-12-03 15:55:33 +0000
+++ base_report_creator/i18n/base_report_creator.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:17+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:17+0000\n"
+"POT-Creation-Date: 2010-12-10 09:39:22+0000\n"
+"PO-Revision-Date: 2010-12-10 09:39:22+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -169,6 +169,7 @@
msgstr ""
#. module: base_report_creator
+#: selection:base_report_creator.report,view_type2:0
#: selection:base_report_creator.report,view_type3:0
#: selection:base_report_creator.report.fields,calendar_mode:0
#: selection:base_report_creator.report.fields,graph_mode:0
=== modified file 'base_report_designer/i18n/base_report_designer.pot'
--- base_report_designer/i18n/base_report_designer.pot 2010-12-03 15:55:33 +0000
+++ base_report_designer/i18n/base_report_designer.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:18+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:18+0000\n"
+"POT-Creation-Date: 2010-12-10 09:40:03+0000\n"
+"PO-Revision-Date: 2010-12-10 09:40:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,6 +31,19 @@
msgstr ""
#. module: base_report_designer
+#: model:ir.module.module,description:base_report_designer.module_meta_information
+msgid "\n"
+"This module is used along with OpenERP OpenOffice plugin.\n"
+"You have to first install the plugin which is available at\n"
+"http://www.openerp.com\n";
+"\n"
+"This module adds wizards to Import/Export .sxw report that\n"
+"you can modify in OpenOffice.Once you have modified it you can\n"
+"upload the report using the same wizard.\n"
+""
+msgstr ""
+
+#. module: base_report_designer
#: view:base.report.file.sxw:0
msgid "The .SXW report"
msgstr ""
=== modified file 'base_setup/__init__.py'
--- base_setup/__init__.py 2010-10-09 09:36:34 +0000
+++ base_setup/__init__.py 2010-12-11 04:13:59 +0000
@@ -47,7 +47,8 @@
user_ids = user_obj.search(cr, uid, [])
users = user_obj.browse(cr, uid, user_ids)
user_str = '\n'.join(map(lambda x: ' - %s :\n\t\tLogin : %s \n\t\tPassword : %s' % (x.name, x.login, x.password), users))
- return _('The following users have been installed : \n')+ user_str
+ return _('The following users have been installed : %s') % ('\n' + user_str)
+
_columns = {
'installed_users':fields.text('Installed Users', readonly=True),
=== modified file 'base_setup/i18n/base_setup.pot'
--- base_setup/i18n/base_setup.pot 2010-12-03 15:55:33 +0000
+++ base_setup/i18n/base_setup.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:18+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:18+0000\n"
+"POT-Creation-Date: 2010-12-10 09:41:05+0000\n"
+"PO-Revision-Date: 2010-12-10 09:41:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@
msgstr ""
#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
+#: field:base.setup.installer,hr:0
+msgid "Human Resources"
msgstr ""
#. module: base_setup
@@ -81,10 +81,8 @@
msgstr ""
#. module: base_setup
-#: code:addons/base_setup/__init__.py:0
-#, python-format
-msgid "The following users have been installed : \n"
-""
+#: view:base.setup.config:0
+msgid "You can start configuring the system or connect directly to the database as an administrator."
msgstr ""
#. module: base_setup
@@ -130,11 +128,6 @@
msgstr ""
#. module: base_setup
-#: view:base.setup.config:0
-msgid "You can start configuring the system or connect directly to the database as an administrator."
-msgstr ""
-
-#. module: base_setup
#: field:base.setup.installer,report_designer:0
msgid "Advanced Reporting"
msgstr ""
@@ -160,6 +153,23 @@
msgstr ""
#. module: base_setup
+#: model:ir.module.module,description:base_setup.module_meta_information
+msgid "\n"
+" This module implements a configuration system that helps user\n"
+" to configure the system at the installation of a new database.\n"
+"\n"
+" It allows you to select between a list of profiles to install:\n"
+" * Minimal profile\n"
+" * Accounting only\n"
+" * Services companies\n"
+" * Manufacturing companies\n"
+"\n"
+" It also asks screens to help easily configure your company, the header and\n"
+" footer, the account chart to install and the language.\n"
+" "
+msgstr ""
+
+#. module: base_setup
#: help:base.setup.installer,product_expiry:0
msgid "Installs a preselected set of OpenERP applications which will help you manage your industry."
msgstr ""
@@ -170,8 +180,8 @@
msgstr ""
#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-msgid "Helps you get the most out of your points of sales with fast sale encoding, simplified payment mode encoding, automatic picking lists generation and more."
+#: field:base.setup.company,name:0
+msgid "Company Name"
msgstr ""
#. module: base_setup
@@ -190,8 +200,8 @@
msgstr ""
#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
+#: model:ir.model,name:base_setup.model_base_setup_company
+msgid "base.setup.company"
msgstr ""
#. module: base_setup
@@ -262,6 +272,17 @@
msgstr ""
#. module: base_setup
+#: code:addons/base_setup/__init__.py:0
+#, python-format
+msgid "The following users have been installed : %s"
+msgstr ""
+
+#. module: base_setup
+#: help:base.setup.installer,point_of_sale:0
+msgid "Helps you get the most out of your points of sales with fast sale encoding, simplified payment mode encoding, automatic picking lists generation and more."
+msgstr ""
+
+#. module: base_setup
#: field:base.setup.installer,purchase:0
msgid "Purchase Management"
msgstr ""
@@ -368,11 +389,6 @@
msgstr ""
#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr ""
-
-#. module: base_setup
#: help:base.setup.company,website:0
msgid "Example: http://openerp.com";
msgstr ""
=== modified file 'base_synchro/i18n/base_synchro.pot'
--- base_synchro/i18n/base_synchro.pot 2010-12-03 15:55:33 +0000
+++ base_synchro/i18n/base_synchro.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:19+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:19+0000\n"
+"POT-Creation-Date: 2010-12-10 09:41:26+0000\n"
+"PO-Revision-Date: 2010-12-10 09:41:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -165,6 +165,11 @@
msgstr ""
#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_synchro
#: view:base.synchro.obj:0
#: field:base.synchro.obj,model_id:0
msgid "Object to synchronize"
=== modified file 'base_tools/i18n/base_tools.pot'
--- base_tools/i18n/base_tools.pot 2010-12-03 15:55:33 +0000
+++ base_tools/i18n/base_tools.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:19+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:19+0000\n"
+"POT-Creation-Date: 2010-12-10 09:41:57+0000\n"
+"PO-Revision-Date: 2010-12-10 09:41:57+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,3 +20,9 @@
msgid "Common base for tools modules"
msgstr ""
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid "\n"
+" "
+msgstr ""
+
=== modified file 'base_vat/i18n/base_vat.pot'
--- base_vat/i18n/base_vat.pot 2010-12-03 15:55:33 +0000
+++ base_vat/i18n/base_vat.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:20+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:20+0000\n"
+"POT-Creation-Date: 2010-12-10 09:42:13+0000\n"
+"PO-Revision-Date: 2010-12-10 09:42:13+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,6 +22,16 @@
msgstr ""
#. module: base_vat
+#: model:ir.module.module,description:base_vat.module_meta_information
+msgid "\n"
+" Enable the VAT Number for the partner. Check the validity of that VAT Number.\n"
+"\n"
+" This module follows the methods stated at http://sima-pc.com/nif.php for\n"
+" checking the validity of VAT Number assigned to partners in European countries.\n"
+" "
+msgstr ""
+
+#. module: base_vat
#: model:ir.module.module,shortdesc:base_vat.module_meta_information
msgid "Base VAT - To check VAT number validity"
msgstr ""
=== modified file 'board/i18n/board.pot'
--- board/i18n/board.pot 2010-12-03 15:55:33 +0000
+++ board/i18n/board.pot 2010-12-11 04:13:59 +0000
@@ -241,7 +241,7 @@
#. module: board
#: help:board.board.line,sequence:0
-msgid "Gives the sequence order when displaying a list of board lines."
+msgid "Gives the sequence order when displaying a list of board lines."
msgstr ""
#. module: board
=== modified file 'caldav/calendar.py'
--- caldav/calendar.py 2010-11-19 06:10:09 +0000
+++ caldav/calendar.py 2010-12-11 04:13:59 +0000
@@ -527,7 +527,7 @@
self.create_ics(cr, uid, datas, vobj, ical, context=context)
return ical
except:
- raise # osv.except_osv(('Error !'), (str(e)))
+ raise # osv.except_osv(('Error!'), (str(e)))
def import_cal(self, cr, uid, content, data_id=None, context=None):
""" Import Calendar
@@ -769,7 +769,7 @@
res = cr.fetchone()
if res:
if res[0] > 0:
- raise osv.except_osv(_('Warning !'), _('Can not create line "%s" more than once') % (vals.get('name')))
+ raise osv.except_osv(_('Warning !'), _('Can not create line "%s" more than once' % (vals.get('name'))))
return super(basic_calendar_line, self).create(cr, uid, vals, context=context)
basic_calendar_line()
@@ -1266,7 +1266,7 @@
attendee_add.params['CN'] = cn_val
if not attendee['email']:
attendee_add.value = 'MAILTO:'
- #raise osv.except_osv(_('Error !'), _('Attendee must have an Email Id'))
+ #raise osv.except_osv(_('Error!'), _('Attendee must have an Email Id'))
elif attendee['email']:
attendee_add.value = 'MAILTO:' + attendee['email']
return vevent
=== modified file 'caldav/i18n/caldav.pot'
--- caldav/i18n/caldav.pot 2010-12-03 15:55:33 +0000
+++ caldav/i18n/caldav.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:21+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:21+0000\n"
+"POT-Creation-Date: 2010-12-10 09:46:19+0000\n"
+"PO-Revision-Date: 2010-12-10 09:46:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -57,6 +57,12 @@
msgstr ""
#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Can not create line \"%s\" more than once' % (vals.get('name"
+msgstr ""
+
+#. module: caldav
#: selection:basic.calendar,type:0
#: selection:basic.calendar.attributes,type:0
#: selection:basic.calendar.lines,name:0
@@ -91,6 +97,7 @@
msgstr ""
#. module: caldav
+#: code:addons/caldav/calendar.py:0
#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
#, python-format
msgid "Error!"
@@ -114,12 +121,6 @@
msgstr ""
#. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
#: view:basic.calendar:0
#: field:basic.calendar,line_ids:0
#: model:ir.model,name:caldav.model_basic_calendar_lines
@@ -184,17 +185,34 @@
msgstr ""
#. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: caldav
#: model:ir.model,name:caldav.model_basic_calendar_attributes
msgid "Calendar attributes"
msgstr ""
#. module: caldav
+#: model:ir.module.module,description:caldav.module_meta_information
+msgid "\n"
+" This module Contains basic functionality for caldav system like: \n"
+" - Webdav server that provides remote access to calendar\n"
+" - Synchronisation of calendar using WebDAV\n"
+" - Customize calendar event and todo attribute with any of OpenERP model\n"
+" - Provides iCal Import/Export functionality\n"
+"\n"
+" To access Calendars using CalDAV clients, point them to:\n"
+" http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n";
+"\n"
+" To access OpenERP Calendar using WebCal to remote site use the URL like:\n"
+" http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n";
+"\n"
+" Where,\n"
+" HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+" PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+" DATABASE_NAME: Name of database on which OpenERP Calendar is created\n"
+" CALENDAR_NAME: Name of calendar to access\n"
+""
+msgstr ""
+
+#. module: caldav
#: field:basic.calendar,create_date:0
msgid "Created Date"
msgstr ""
=== modified file 'claim_from_delivery/i18n/claim_from_delivery.pot'
--- claim_from_delivery/i18n/claim_from_delivery.pot 2010-12-03 15:55:33 +0000
+++ claim_from_delivery/i18n/claim_from_delivery.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:21+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:21+0000\n"
+"POT-Creation-Date: 2010-12-10 09:46:31+0000\n"
+"PO-Revision-Date: 2010-12-10 09:46:31+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@
"Plural-Forms: \n"
#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr ""
+
+#. module: claim_from_delivery
#: model:ir.module.module,description:claim_from_delivery.module_meta_information
msgid "Create Claim from delivery order:\n"
""
=== modified file 'crm/crm_action_rule.py'
--- crm/crm_action_rule.py 2010-09-17 05:54:54 +0000
+++ crm/crm_action_rule.py 2010-12-11 04:13:59 +0000
@@ -124,8 +124,7 @@
# Put state change by rule in communication history
if hasattr(obj, 'state') and action.act_state:
- model_obj._history(cr, uid, [obj], _(action.act_state))
-
+ model_obj._history(cr, uid, [obj], action.act_state)
model_obj.write(cr, uid, [obj.id], write, context)
emails = []
=== modified file 'crm/crm_segmentation.py'
--- crm/crm_segmentation.py 2010-05-19 15:57:31 +0000
+++ crm/crm_segmentation.py 2010-12-11 04:13:59 +0000
@@ -35,11 +35,8 @@
_columns = {
'name': fields.char('Name', size=64, required=True, help='The name of the segmentation.'),
'description': fields.text('Description'),
- 'categ_id': fields.many2one('res.partner.category', 'Partner Category',\
- required=True, help='The partner category that will be \
-added to partners that match the segmentation criterions after computation.'),
- 'exclusif': fields.boolean('Exclusive', help='Check if the category is limited to partners that match the segmentation criterions.\
- \nIf checked, remove the category from partners that doesn\'t match segmentation criterions'),
+ 'categ_id': fields.many2one('res.partner.category', 'Partner Category', required=True, help='The partner category that will be added to partners that match the segmentation criterions after computation.'),
+ 'exclusif': fields.boolean('Exclusive', help='Check if the category is limited to partners that match the segmentation criterions.If checked, remove the category from partners that doesn\'t match segmentation criterions'),
'state': fields.selection([('not running','Not Running'),\
('running','Running')], 'Execution Status', readonly=True),
'partner_id': fields.integer('Max Partner ID processed'),
=== modified file 'crm/i18n/crm.pot'
--- crm/i18n/crm.pot 2010-12-03 15:55:33 +0000
+++ crm/i18n/crm.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:24+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:24+0000\n"
+"POT-Creation-Date: 2010-12-10 09:46:46+0000\n"
+"PO-Revision-Date: 2010-12-10 09:46:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -75,11 +75,12 @@
msgstr ""
#. module: crm
-#: view:crm.merge.opportunity:0
-msgid "Select Opportunities"
+#: field:crm.lead.report,email:0
+msgid "# Emails"
msgstr ""
#. module: crm
+#: view:crm.phonecall2opportunity:0
#: view:crm.phonecall2phonecall:0
#: view:crm.send.mail:0
msgid " "
@@ -307,6 +308,11 @@
msgstr ""
#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "Select Opportunities"
+msgstr ""
+
+#. module: crm
#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
msgid "Create specific phone call categories to better sort the type of calls tracked in the system."
msgstr ""
@@ -1001,6 +1007,12 @@
msgstr ""
#. module: crm
+#: code:addons/crm/wizard/crm_send_email.py:0
+#, python-format
+msgid "%s"
+msgstr ""
+
+#. module: crm
#: field:crm.lead,ref:0
msgid "Reference"
msgstr ""
@@ -1528,12 +1540,6 @@
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_send_email.py:0
-#, python-format
-msgid "Unable to send mail. Please check SMTP is configured properly."
-msgstr ""
-
-#. module: crm
#: selection:crm.segmentation.line,expr_operator:0
msgid "="
msgstr ""
@@ -2634,8 +2640,8 @@
msgstr ""
#. module: crm
-#: field:crm.lead.report,email:0
-msgid "# Emails"
+#: help:crm.segmentation,exclusif:0
+msgid "Check if the category is limited to partners that match the segmentation criterions.If checked, remove the category from partners that doesn't match segmentation criterions"
msgstr ""
#. module: crm
@@ -2900,12 +2906,6 @@
msgstr ""
#. module: crm
-#: help:crm.segmentation,exclusif:0
-msgid "Check if the category is limited to partners that match the segmentation criterions. \n"
-"If checked, remove the category from partners that doesn't match segmentation criterions"
-msgstr ""
-
-#. module: crm
#: field:crm.meeting,exdate:0
msgid "Exception Date/Times"
msgstr ""
@@ -2992,6 +2992,12 @@
msgstr ""
#. module: crm
+#: code:addons/crm/wizard/crm_send_email.py:0
+#, python-format
+msgid "Unable to send mail.Please check SMTP is configured properly."
+msgstr ""
+
+#. module: crm
#: model:crm.case.stage,name:crm.stage_lead2
msgid "Qualification"
msgstr ""
=== modified file 'crm/wizard/crm_send_email.py'
--- crm/wizard/crm_send_email.py 2010-11-15 10:13:54 +0000
+++ crm/wizard/crm_send_email.py 2010-12-11 04:13:59 +0000
@@ -138,10 +138,10 @@
)
if not flag:
- raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
+ raise osv.except_osv(_('Error!'), _('Unable to send mail.Please check SMTP is configured properly.'))
msg_dict = {'new': 'Send', 'reply': 'Reply', 'forward': 'Forward'}
- case_pool.history(cr, uid, [case], _(msg_dict[context.get('mail', 'new')]), history=True, \
+ case_pool.history(cr, uid, [case], (_('%s') %msg_dict[context.get('mail', 'new')]), history=True, \
email=obj.email_to, details=body, \
subject=obj.subject, email_from=email_from, \
email_cc=', '.join(email_cc), message_id=message_id, \
=== modified file 'crm_caldav/i18n/crm_caldav.pot'
--- crm_caldav/i18n/crm_caldav.pot 2010-12-03 15:55:33 +0000
+++ crm_caldav/i18n/crm_caldav.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:24+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:24+0000\n"
+"POT-Creation-Date: 2010-12-10 09:47:01+0000\n"
+"PO-Revision-Date: 2010-12-10 09:47:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,3 +25,11 @@
msgid "Meeting"
msgstr ""
+#. module: crm_caldav
+#: model:ir.module.module,description:crm_caldav.module_meta_information
+msgid "\n"
+" New Futures in Meeting:\n"
+" * Share meeting with other calendar clients like sunbird\n"
+""
+msgstr ""
+
=== modified file 'crm_claim/i18n/crm_claim.pot'
--- crm_claim/i18n/crm_claim.pot 2010-12-03 15:55:33 +0000
+++ crm_claim/i18n/crm_claim.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:25+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:25+0000\n"
+"POT-Creation-Date: 2010-12-10 09:47:14+0000\n"
+"PO-Revision-Date: 2010-12-10 09:47:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -429,6 +429,15 @@
msgstr ""
#. module: crm_claim
+#: model:ir.module.module,description:crm_claim.module_meta_information
+msgid "\n"
+"This modules allows you to track your customers/suppliers claims and flames.\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+" "
+msgstr ""
+
+#. module: crm_claim
#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
msgid "Claim Categories"
msgstr ""
=== modified file 'crm_fundraising/i18n/crm_fundraising.pot'
--- crm_fundraising/i18n/crm_fundraising.pot 2010-12-03 15:55:33 +0000
+++ crm_fundraising/i18n/crm_fundraising.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:26+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:26+0000\n"
+"POT-Creation-Date: 2010-12-10 09:47:30+0000\n"
+"PO-Revision-Date: 2010-12-10 09:47:30+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -263,6 +263,11 @@
msgstr ""
#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: crm_fundraising
#: selection:crm.fundraising,state:0
#: selection:crm.fundraising.report,state:0
msgid "Cancelled"
=== modified file 'crm_helpdesk/i18n/crm_helpdesk.pot'
--- crm_helpdesk/i18n/crm_helpdesk.pot 2010-12-03 15:55:33 +0000
+++ crm_helpdesk/i18n/crm_helpdesk.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:26+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:26+0000\n"
+"POT-Creation-Date: 2010-12-10 09:47:42+0000\n"
+"PO-Revision-Date: 2010-12-10 09:47:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -249,6 +249,11 @@
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
msgid "#Helpdesk"
msgstr ""
=== modified file 'crm_partner_assign/i18n/crm_partner_assign.pot'
--- crm_partner_assign/i18n/crm_partner_assign.pot 2010-12-03 15:55:33 +0000
+++ crm_partner_assign/i18n/crm_partner_assign.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:27+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:27+0000\n"
+"POT-Creation-Date: 2010-12-10 09:47:56+0000\n"
+"PO-Revision-Date: 2010-12-10 09:47:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -138,6 +138,14 @@
msgstr ""
#. module: crm_partner_assign
+#: model:ir.module.module,description:crm_partner_assign.module_meta_information
+msgid "\n"
+"This is the module used by OpenERP SA to redirect customers to his partners,\n"
+"based on geolocalization.\n"
+" "
+msgstr ""
+
+#. module: crm_partner_assign
#: selection:crm.lead.forward.to.partner,state:0
#: selection:crm.lead.report.assign,state:0
msgid "Pending"
=== modified file 'crm_partner_assign/i18n/partner_geo_assign.pot'
--- crm_partner_assign/i18n/partner_geo_assign.pot 2010-08-23 06:26:09 +0000
+++ crm_partner_assign/i18n/partner_geo_assign.pot 2010-12-11 04:13:59 +0000
@@ -34,8 +34,8 @@
#. module: partner_geo_assign
#: model:ir.module.module,description:partner_geo_assign.module_meta_information
msgid "\n"
-"This is the module used by OpenERP SA to redirect customers to his partners,\n"
-"based on geolocalization.\n"
+"This is the module used by OpenERP SA to redirect customers to his partners,"
+"based on geolocalization."
" "
msgstr ""
=== modified file 'crm_profiling/i18n/crm_profiling.pot'
--- crm_profiling/i18n/crm_profiling.pot 2010-12-03 15:55:33 +0000
+++ crm_profiling/i18n/crm_profiling.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:27+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:27+0000\n"
+"POT-Creation-Date: 2010-12-10 09:48:08+0000\n"
+"PO-Revision-Date: 2010-12-10 09:48:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,21 @@
msgstr ""
#. module: crm_profiling
+#: model:ir.module.module,description:crm_profiling.module_meta_information
+msgid "\n"
+" This module allows users to perform segmentation within partners.\n"
+" It uses the profiles criteria from the earlier segmentation module and improve it. Thanks to the new concept of questionnaire. You can now regroup questions into a questionnaire and directly use it on a partner.\n"
+"\n"
+" It also has been merged with the earlier CRM & SRM segmentation tool because they were overlapping.\n"
+"\n"
+" The menu items related are in \"CRM & SRM\\Configuration\\Segmentations\"\n"
+"\n"
+"\n"
+" * Note: this module is not compatible with the module segmentation, since it's the same which has been renamed.\n"
+" "
+msgstr ""
+
+#. module: crm_profiling
#: field:crm_profiling.answer,question_id:0
#: field:crm_profiling.question,name:0
#: model:ir.model,name:crm_profiling.model_crm_profiling_question
=== modified file 'decimal_precision/i18n/decimal_precision.pot'
--- decimal_precision/i18n/decimal_precision.pot 2010-12-03 15:55:33 +0000
+++ decimal_precision/i18n/decimal_precision.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:28+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:28+0000\n"
+"POT-Creation-Date: 2010-12-10 09:48:36+0000\n"
+"PO-Revision-Date: 2010-12-10 09:48:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,6 +32,16 @@
msgstr ""
#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid "\n"
+"This module allows to configure the price accuracy you need for different kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+""
+msgstr ""
+
+#. module: decimal_precision
#: field:decimal.precision,name:0
msgid "Usage"
msgstr ""
=== modified file 'delivery/i18n/delivery.pot'
--- delivery/i18n/delivery.pot 2010-12-03 15:55:33 +0000
+++ delivery/i18n/delivery.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:28+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:28+0000\n"
+"POT-Creation-Date: 2010-12-10 09:49:14+0000\n"
+"PO-Revision-Date: 2010-12-10 09:49:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -368,6 +368,11 @@
msgstr ""
#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr ""
+
+#. module: delivery
#: field:delivery.grid.line,standard_price:0
msgid "Cost Price"
msgstr ""
=== modified file 'document/directory_content.py'
--- document/directory_content.py 2010-08-10 12:29:57 +0000
+++ document/directory_content.py 2010-12-11 04:13:59 +0000
@@ -56,8 +56,7 @@
'report_id': fields.many2one('ir.actions.report.xml', 'Report'),
'extension': fields.selection(_extension_get, 'Document Type', required=True, size=4),
'include_name': fields.boolean('Include Record Name',
- help="Check this field if you want that the name of the file to contain the record name." \
- "\nIf set, the directory will have to be a resource one."),
+ help="Check this field if you want that the name of the file to contain the record name.If set, the directory will have to be a resource one."),
'directory_id': fields.many2one('document.directory', 'Directory'),
}
_defaults = {
=== modified file 'document/i18n/document.pot'
--- document/i18n/document.pot 2010-12-03 15:55:33 +0000
+++ document/i18n/document.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:29+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:29+0000\n"
+"POT-Creation-Date: 2010-12-10 09:49:27+0000\n"
+"PO-Revision-Date: 2010-12-10 09:49:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -270,11 +270,8 @@
msgstr ""
#. module: document
-#: view:document.directory:0
-#: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
-msgid "Type"
+#: help:document.directory.content,include_name:0
+msgid "Check this field if you want that the name of the file to contain the record name.If set, the directory will have to be a resource one."
msgstr ""
#. module: document
@@ -386,8 +383,9 @@
msgstr ""
#. module: document
-#: field:document.configuration,progress:0
-msgid "Configuration Progress"
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "August"
msgstr ""
#. module: document
@@ -497,12 +495,6 @@
msgstr ""
#. module: document
-#: help:document.directory.content,include_name:0
-msgid "Check this field if you want that the name of the file to contain the record name.\n"
-"If set, the directory will have to be a resource one."
-msgstr ""
-
-#. module: document
#: model:ir.actions.act_window,name:document.action_config_auto_directory
msgid "Auto Configure Directory"
msgstr ""
@@ -543,9 +535,8 @@
msgstr ""
#. module: document
-#: selection:report.document.user,month:0
-#: selection:report.files.partner,month:0
-msgid "August"
+#: field:document.configuration,progress:0
+msgid "Configuration Progress"
msgstr ""
#. module: document
@@ -776,6 +767,14 @@
msgstr ""
#. module: document
+#: view:document.directory:0
+#: field:document.directory,type:0
+#: view:document.storage:0
+#: field:document.storage,type:0
+msgid "Type"
+msgstr ""
+
+#. module: document
#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
msgid "All Users files"
msgstr ""
@@ -886,6 +885,7 @@
msgstr ""
#. module: document
+#: field:report.document.file,nbr:0
#: field:report.document.user,nbr:0
#: field:report.files.partner,nbr:0
msgid "# of Files"
=== modified file 'document_ftp/i18n/document_ftp.pot'
--- document_ftp/i18n/document_ftp.pot 2010-12-03 15:55:33 +0000
+++ document_ftp/i18n/document_ftp.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:30+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:30+0000\n"
+"POT-Creation-Date: 2010-12-10 09:49:41+0000\n"
+"PO-Revision-Date: 2010-12-10 09:49:41+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -85,6 +85,11 @@
msgstr ""
#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr ""
+
+#. module: document_ftp
#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
msgid "Integrated FTP Server with Document Management System"
msgstr ""
=== modified file 'document_ics/i18n/document_ics.pot'
--- document_ics/i18n/document_ics.pot 2010-12-03 15:55:33 +0000
+++ document_ics/i18n/document_ics.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:30+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:30+0000\n"
+"POT-Creation-Date: 2010-12-10 09:49:55+0000\n"
+"PO-Revision-Date: 2010-12-10 09:49:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -156,6 +156,11 @@
msgstr ""
#. module: document_ics
+#: help:document.ics.crm.wizard,document_ics:0
+msgid " Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."
+msgstr ""
+
+#. module: document_ics
#: field:document.directory.ics.fields,field_id:0
msgid "OpenERP Field"
msgstr ""
=== modified file 'document_webdav/i18n/document_webdav.pot'
--- document_webdav/i18n/document_webdav.pot 2010-12-03 15:55:33 +0000
+++ document_webdav/i18n/document_webdav.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:30+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:30+0000\n"
+"POT-Creation-Date: 2010-12-10 09:50:10+0000\n"
+"PO-Revision-Date: 2010-12-10 09:50:10+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -48,6 +48,26 @@
msgstr ""
#. module: document_webdav
+#: model:ir.module.module,description:document_webdav.module_meta_information
+msgid " With this module, the WebDAV server for the documents is activated.\n"
+" You can then use any compatible browser to remotely see the attachments of OpenObject.\n"
+"\n"
+" After installation, the webDAV server can be controlled by a [webdav] section in the server's config.\n"
+" Server Configuration Parameter:\n"
+" [webdav]\n"
+" ; enable = True ; Serve webdav over the http(s) servers\n"
+" ; vdir = webdav ; the directory that webdav will be served at\n"
+" ; this default val means that webdav will be\n"
+" ; on \"http://localhost:8069/webdav/\n";
+" ; verbose = True ; Turn on the verbose messages of webdav\n"
+" ; debug = True ; Turn on the debugging messages of webdav\n"
+" ; since the messages are routed to the python logging, with\n"
+" ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+" ; these options on\n"
+""
+msgstr ""
+
+#. module: document_webdav
#: sql_constraint:document.directory:0
msgid "Directory cannot be parent of itself!"
msgstr ""
=== modified file 'email_template/email_template_mailbox.py'
--- email_template/email_template_mailbox.py 2010-11-18 16:21:31 +0000
+++ email_template/email_template_mailbox.py 2010-12-11 04:13:59 +0000
@@ -43,9 +43,9 @@
self.send_all_mail(cursor, user, context)
except Exception, e:
LOGGER.notifyChannel(
- "Email Template",
+ _("Email Template"),
netsvc.LOG_ERROR,
- _("Error sending mail: %s") % e)
+ (_("Error sending mail: %s") % str(e)))
def send_all_mail(self, cr, uid, ids=None, context=None):
if ids is None:
=== modified file 'email_template/i18n/email_template.pot'
--- email_template/i18n/email_template.pot 2010-12-03 15:55:33 +0000
+++ email_template/i18n/email_template.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:31+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:31+0000\n"
+"POT-Creation-Date: 2010-12-10 09:51:19+0000\n"
+"PO-Revision-Date: 2010-12-10 09:51:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,13 +32,6 @@
msgstr ""
#. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
-#, python-format
-msgid "No personal email accounts are configured for you. \n"
-"Either ask admin to enforce an account for this template or get yourself a personal email account."
-msgstr ""
-
-#. module: email_template
#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
msgid "An email template is an email document that will be sent as part of a marketing campaign. You can personalize it based on specific customer profile fields so that their names or other partner related information can be automatically inserted in it."
msgstr ""
@@ -245,13 +238,18 @@
msgstr ""
#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr ""
+
+#. module: email_template
#: field:email.template,attachment_ids:0
msgid "Attached Files"
msgstr ""
#. module: email_template
-#: view:email_template.mailbox:0
-msgid "Standard Body"
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
msgstr ""
#. module: email_template
@@ -383,6 +381,11 @@
msgstr ""
#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr ""
+
+#. module: email_template
#: selection:email.template,template_language:0
msgid "Mako Templates"
msgstr ""
@@ -760,6 +763,7 @@
#. module: email_template
#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_mailbox.py:0
#: code:addons/email_template/wizard/email_template_send_wizard.py:0
#: model:ir.ui.menu,name:email_template.menu_email_template
#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
@@ -901,11 +905,6 @@
msgstr ""
#. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr ""
-
-#. module: email_template
#: code:addons/email_template/email_template_account.py:0
#, python-format
msgid "Server Send Error\n"
@@ -918,22 +917,22 @@
msgstr ""
#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr ""
+
+#. module: email_template
#: help:email_template.mailbox,date_mail:0
msgid "Date on which Email Sent or Received"
msgstr ""
#. module: email_template
-#: view:email_template.mailbox:0
-#: selection:email_template.mailbox,folder:0
-msgid "Trash"
-msgstr ""
-
-#. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr ""
-
-#. module: email_template
#: code:addons/email_template/email_template_mailbox.py:0
#, python-format
msgid "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
@@ -994,6 +993,11 @@
msgstr ""
#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
+#. module: email_template
#: field:email.template,template_language:0
msgid "Templating Language"
msgstr ""
@@ -1007,8 +1011,9 @@
msgstr ""
#. module: email_template
-#: view:email_template.mailbox:0
-msgid "Sent"
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "No personal email accounts are configured for you.Either ask admin to enforce an account for this template or get yourself a personal email account."
msgstr ""
#. module: email_template
@@ -1081,8 +1086,10 @@
msgstr ""
#. module: email_template
-#: field:email_template.account,smtpssl:0
-msgid "SSL/TLS (only in python 2.6)"
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid "\n"
+" Email Template is extraction of Power Email basically just to send the emails.\n"
+" "
msgstr ""
#. module: email_template
@@ -1145,8 +1152,8 @@
msgstr ""
#. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
+#: view:email.template:0
+msgid "Actions"
msgstr ""
#. module: email_template
=== modified file 'email_template/wizard/email_template_send_wizard.py'
--- email_template/wizard/email_template_send_wizard.py 2010-09-15 12:33:48 +0000
+++ email_template/wizard/email_template_send_wizard.py 2010-12-11 04:13:59 +0000
@@ -56,8 +56,8 @@
account = self.pool.get('email_template.account').browse(cr,uid,account_id, context)
return [(r.id,r.name + " (" + r.email_id + ")") for r in account]
else:
- logger.notifyChannel(_("email-template"), netsvc.LOG_ERROR, _("No personal email accounts are configured for you. \nEither ask admin to enforce an account for this template or get yourself a personal email account."))
- raise osv.except_osv(_("Missing mail account"),_("No personal email accounts are configured for you. \nEither ask admin to enforce an account for this template or get yourself a personal email account."))
+ logger.notifyChannel(_("email-template"), netsvc.LOG_ERROR, _("No personal email accounts are configured for you.Either ask admin to enforce an account for this template or get yourself a personal email account."))
+ raise osv.except_osv(_("Missing mail account"),_("No personal email accounts are configured for you.Either ask admin to enforce an account for this template or get yourself a personal email account."))
def get_value(self, cursor, user, template, message, context=None, id=None):
"""Gets the value of the message parsed with the content of object id (or the first 'src_rec_ids' if id is not given)"""
=== modified file 'event/i18n/event.pot'
--- event/i18n/event.pot 2010-12-03 15:55:33 +0000
+++ event/i18n/event.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:32+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:32+0000\n"
+"POT-Creation-Date: 2010-12-10 09:51:03+0000\n"
+"PO-Revision-Date: 2010-12-10 09:51:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -1040,6 +1040,11 @@
msgstr ""
#. module: event
+#: model:ir.model,name:event.model_partner_event_registration
+msgid " event Registration "
+msgstr ""
+
+#. module: event
#: help:event.event,date_begin:0
#: help:partner.event.registration,start_date:0
msgid "Beginning Date of Event"
=== modified file 'event_project/i18n/event_project.pot'
--- event_project/i18n/event_project.pot 2010-12-03 15:55:33 +0000
+++ event_project/i18n/event_project.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:33+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:33+0000\n"
+"POT-Creation-Date: 2010-12-10 09:51:39+0000\n"
+"PO-Revision-Date: 2010-12-10 09:51:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -50,11 +50,6 @@
msgstr ""
#. module: event_project
-#: view:event.event:0
-msgid "Create Retro-Planning"
-msgstr ""
-
-#. module: event_project
#: constraint:event.event:0
msgid "Error ! Closing Date cannot be set before Beginning Date."
msgstr ""
@@ -65,19 +60,29 @@
msgstr ""
#. module: event_project
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event_project.act_event_task
+msgid "Tasks"
+msgstr ""
+
+#. module: event_project
+#: view:event.event:0
+msgid "All tasks"
+msgstr ""
+
+#. module: event_project
+#: model:ir.module.module,shortdesc:event_project.module_meta_information
+msgid "Event Project - Create Retro-Planning to manage your Events"
+msgstr ""
+
+#. module: event_project
#: field:event.project,project_id:0
msgid "Template of Project"
msgstr ""
#. module: event_project
-#: model:ir.module.module,shortdesc:event_project.module_meta_information
-msgid "Event Project - Create Retro-Planning to manage your Events"
-msgstr ""
-
-#. module: event_project
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event_project.act_event_task
-msgid "Tasks"
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
msgstr ""
#. module: event_project
@@ -96,8 +101,8 @@
msgstr ""
#. module: event_project
-#: constraint:event.event:0
-msgid "Error ! You cannot create recursive event."
+#: view:event.event:0
+msgid "Create Retro-Planning"
msgstr ""
#. module: event_project
=== modified file 'fetchmail/fetchmail.py'
--- fetchmail/fetchmail.py 2010-12-09 12:52:28 +0000
+++ fetchmail/fetchmail.py 2010-12-11 04:13:59 +0000
@@ -58,7 +58,7 @@
'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}),
'note': fields.text('Description'),
'action_id':fields.many2one('ir.actions.server', 'Email Server Action', required=False, domain="[('state','=','email')]", help="An Email Server Action. It will be run whenever an e-mail is fetched from server."),
- 'object_id': fields.many2one('ir.model', "Model", required=True, help="OpenObject Model. Generates a record of this model.\nSelect Object with message_new attrbutes."),
+ 'object_id': fields.many2one('ir.model', "Model", required=True, help="OpenObject Model.Generates a record of this model.Select Object with message_new attrbutes."),
'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"),
'user_id':fields.many2one('res.users', 'User', required=False),
'message_ids': fields.one2many('mailgate.message', 'server_id', 'Messages', readonly=True),
@@ -135,7 +135,7 @@
#TODO: use this to remove only unread messages
#pop_server.user("recent:"+server.user)
pop_server.user(server.user)
- pop_server.pass_(server.password)
+ pop_server.pass_('%s') % server.password
ret_server = pop_server
self.write(cr, uid, [server.id], {'state':'done'})
=== modified file 'fetchmail/i18n/fetchmail.pot'
--- fetchmail/i18n/fetchmail.pot 2010-12-03 15:55:33 +0000
+++ fetchmail/i18n/fetchmail.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:33+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:33+0000\n"
+"POT-Creation-Date: 2010-12-10 09:52:59+0000\n"
+"PO-Revision-Date: 2010-12-10 09:52:59+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,12 @@
"Plural-Forms: \n"
#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+
+#. module: fetchmail
#: selection:email.server,state:0
msgid "Confirmed"
msgstr ""
@@ -26,11 +32,6 @@
msgstr ""
#. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Reply Email"
-msgstr ""
-
-#. module: fetchmail
#: view:email.server:0
msgid "Group By..."
msgstr ""
@@ -43,7 +44,7 @@
#. module: fetchmail
#: view:email.server:0
-msgid "Set to Draft"
+msgid "POP"
msgstr ""
#. module: fetchmail
@@ -67,6 +68,11 @@
msgstr ""
#. module: fetchmail
+#: help:email.server,object_id:0
+msgid "OpenObject Model.Generates a record of this model.Select Object with message_new attrbutes."
+msgstr ""
+
+#. module: fetchmail
#: view:email.server:0
#: field:email.server,note:0
msgid "Description"
@@ -84,7 +90,7 @@
#. module: fetchmail
#: view:email.server:0
-msgid "POP"
+msgid "# of emails"
msgstr ""
#. module: fetchmail
@@ -108,8 +114,8 @@
msgstr ""
#. module: fetchmail
-#: help:email.server,object_id:0
-msgid "OpenObject Model. Generates a record of this model."
+#: field:email.server,password:0
+msgid "Password"
msgstr ""
#. module: fetchmail
@@ -144,6 +150,11 @@
msgstr ""
#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: fetchmail
#: field:email.server,message_ids:0
#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
msgid "Messages"
@@ -198,11 +209,6 @@
msgstr ""
#. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr ""
-
-#. module: fetchmail
#: constraint:email.server:0
msgid "Warning! Can't have duplicate server configuration!"
msgstr ""
@@ -266,6 +272,11 @@
msgstr ""
#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr ""
+
+#. module: fetchmail
#: view:mailgate.message:0
#: field:mailgate.message,server_id:0
msgid "Mail Server"
=== modified file 'google_map/i18n/google_map.pot'
--- google_map/i18n/google_map.pot 2010-12-03 15:55:33 +0000
+++ google_map/i18n/google_map.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:34+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:34+0000\n"
+"POT-Creation-Date: 2010-12-10 09:53:33+0000\n"
+"PO-Revision-Date: 2010-12-10 09:53:33+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,23 @@
"Plural-Forms: \n"
#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr ""
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Street2 : "
+msgstr ""
+
+#. module: google_map
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr ""
+
+#. module: google_map
#: model:ir.module.module,description:google_map.module_meta_information
msgid "The module adds google map field in partner address\n"
"so that we can directly open google map from the\n"
@@ -23,8 +40,8 @@
msgstr ""
#. module: google_map
-#: model:ir.actions.wizard,name:google_map.wizard_google_map
-msgid "Launch Google Map"
+#: model:ir.module.module,shortdesc:google_map.module_meta_information
+msgid "Google Map"
msgstr ""
#. module: google_map
@@ -32,15 +49,3 @@
msgid "Partner Addresses"
msgstr ""
-#. module: google_map
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Street2 : "
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Map"
-msgstr ""
-
=== modified file 'hr/i18n/hr.pot'
--- hr/i18n/hr.pot 2010-12-03 15:55:33 +0000
+++ hr/i18n/hr.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:34+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:34+0000\n"
+"POT-Creation-Date: 2010-12-10 09:53:51+0000\n"
+"PO-Revision-Date: 2010-12-10 09:53:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -492,6 +492,16 @@
msgstr ""
#. module: hr
+#: model:ir.module.module,description:hr.module_meta_information
+msgid "\n"
+" Module for human resource management. You can manage:\n"
+" * Employees and hierarchies : You can define your employee with User and display hierarchies\n"
+" * HR Departments\n"
+" * HR Jobs\n"
+" "
+msgstr ""
+
+#. module: hr
#: model:process.transition,note:hr.process_transition_contactofemployee0
msgid "In the Employee form, there are different kind of information like Contact information."
msgstr ""
=== modified file 'hr_attendance/hr_attendance.py'
--- hr_attendance/hr_attendance.py 2010-11-01 06:07:10 +0000
+++ hr_attendance/hr_attendance.py 2010-12-11 04:13:59 +0000
@@ -143,7 +143,7 @@
warning_sign = "Sign Out"
for emp in self.read(cr, uid, ids, ['id'], context=context):
if not self._action_check(cr, uid, emp['id'], dt, context):
- raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
+ raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !Try to contact the administrator to correct attendances.') % ('\n' + warning_sign))
res = {'action': type, 'employee_id': emp['id']}
if dt:
=== modified file 'hr_attendance/i18n/hr_attendance.pot'
--- hr_attendance/i18n/hr_attendance.pot 2010-12-03 15:55:33 +0000
+++ hr_attendance/i18n/hr_attendance.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:35+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:35+0000\n"
+"POT-Creation-Date: 2010-12-10 09:54:05+0000\n"
+"PO-Revision-Date: 2010-12-10 09:54:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -183,6 +183,15 @@
msgstr ""
#. module: hr_attendance
+#: model:ir.module.module,description:hr_attendance.module_meta_information
+msgid "\n"
+" This module aims to manage employee's attendances.\n"
+" Keeps account of the attendances of the employees on the basis of the\n"
+" actions(Sign in/Sign out) performed by them.\n"
+" "
+msgstr ""
+
+#. module: hr_attendance
#: constraint:hr.attendance:0
msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
msgstr ""
@@ -307,6 +316,12 @@
msgstr ""
#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid "You tried to %s with a date anterior to another event !Try to contact the administrator to correct attendances."
+msgstr ""
+
+#. module: hr_attendance
#: field:hr.attendance,name:0
msgid "Date"
msgstr ""
@@ -422,13 +437,6 @@
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid "You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
-#. module: hr_attendance
#: view:hr.sign.in.out.ask:0
#: field:hr.sign.in.out.ask,last_time:0
msgid "Your last sign out"
=== modified file 'hr_contract/i18n/hr_contract.pot'
--- hr_contract/i18n/hr_contract.pot 2010-12-03 15:55:33 +0000
+++ hr_contract/i18n/hr_contract.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:36+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:36+0000\n"
+"POT-Creation-Date: 2010-12-10 09:55:20+0000\n"
+"PO-Revision-Date: 2010-12-10 09:55:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -181,8 +181,14 @@
msgstr ""
#. module: hr_contract
-#: field:hr.contract.wage.type.period,name:0
-msgid "Period Name"
+#: model:ir.module.module,description:hr_contract.module_meta_information
+msgid "\n"
+" Add all information on the employee form to manage contracts:\n"
+" * Marital status,\n"
+" * Security number,\n"
+" * Place of birth, birth date, ...\n"
+" You can assign several contracts per employee.\n"
+" "
msgstr ""
#. module: hr_contract
@@ -258,15 +264,6 @@
msgstr ""
#. module: hr_contract
-#: field:hr.contract,wage_type_id:0
-#: view:hr.contract.wage.type:0
-#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
-#: model:ir.model,name:hr_contract.model_hr_contract_wage_type
-#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
-msgid "Wage Type"
-msgstr ""
-
-#. module: hr_contract
#: view:hr.contract:0
#: field:hr.employee,contract_id:0
#: model:ir.model,name:hr_contract.model_hr_contract
@@ -347,11 +344,25 @@
msgstr ""
#. module: hr_contract
+#: field:hr.contract.wage.type.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: hr_contract
#: view:hr.contract.wage.type:0
msgid "Period"
msgstr ""
#. module: hr_contract
+#: field:hr.contract,wage_type_id:0
+#: view:hr.contract.wage.type:0
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
+#: model:ir.model,name:hr_contract.model_hr_contract_wage_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
+msgid "Wage Type"
+msgstr ""
+
+#. module: hr_contract
#: view:hr.employee:0
msgid "Payslip Line"
msgstr ""
=== modified file 'hr_evaluation/i18n/hr_evaluation.pot'
--- hr_evaluation/i18n/hr_evaluation.pot 2010-12-03 15:55:33 +0000
+++ hr_evaluation/i18n/hr_evaluation.pot 2010-12-11 04:13:59 +0000
@@ -187,26 +187,6 @@
msgstr ""
#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
-#, python-format
-msgid "\n"
-"Date: %(date)s\n"
-"\n"
-"Dear %(employee_name)s,\n"
-"\n"
-"I am doing an evaluation regarding %(eval_name)s.\n"
-"\n"
-"Kindly submit your response.\n"
-"\n"
-"\n"
-"Thanks,\n"
-"--\n"
-"%(user_signature)s\n"
-"\n"
-" "
-msgstr ""
-
-#. module: hr_evaluation
#: view:hr_evaluation.plan.phase:0
msgid "Send to Employees"
msgstr ""
=== modified file 'hr_expense/i18n/hr_expense.pot'
--- hr_expense/i18n/hr_expense.pot 2010-12-03 15:55:33 +0000
+++ hr_expense/i18n/hr_expense.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:37+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:37+0000\n"
+"POT-Creation-Date: 2010-12-10 09:55:41+0000\n"
+"PO-Revision-Date: 2010-12-10 09:55:41+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -115,6 +115,24 @@
msgstr ""
#. module: hr_expense
+#: model:ir.module.module,description:hr_expense.module_meta_information
+msgid "\n"
+" This module aims to manage employee's expenses.\n"
+"\n"
+" The whole workflow is implemented:\n"
+" * Draft expense\n"
+" * Confirmation of the sheet by the employee\n"
+" * Validation by his manager\n"
+" * Validation by the accountant and invoice creation\n"
+" * Payment of the invoice to the employee\n"
+"\n"
+" This module also uses the analytic accounting and is compatible with\n"
+" the invoice on timesheet module so that you will be able to automatically\n"
+" re-invoice your customer's expenses if your work by project.\n"
+" "
+msgstr ""
+
+#. module: hr_expense
#: selection:hr.expense.report,state:0
msgid "Cancelled"
msgstr ""
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2010-11-19 12:20:03 +0000
+++ hr_holidays/hr_holidays.py 2010-12-11 04:13:59 +0000
@@ -156,7 +156,7 @@
'number_of_days': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
'case_id': fields.many2one('crm.meeting', 'Case'),
- 'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone"),
+ 'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day.Choose 'Allocation Request' if you want to increase the number of leaves available for someone"),
'allocation_type': fields.selection([('employee','Employee Request'),('company','Company Allocation')], 'Allocation Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help='This field is only for informative purposes, to depict if the leave request/allocation comes from an employee or from the company'),
'parent_id': fields.many2one('hr.holidays', 'Parent'),
'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
@@ -364,15 +364,15 @@
leave_asked = record.number_of_days_temp
if record.holiday_type == 'employee' and record.type == 'remove':
if record.employee_id and not record.holiday_status_id.limit:
- leaves_rest = obj_hr_holiday_status.get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
+ leaves_rest = self.pool.get('hr.holidays.status').get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
if leaves_rest < leave_asked:
- raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for employee %s while there are too few remaining leave days.') % (record.employee_id.name))
+ raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for %s while available leaves are less than asked leaves.') %(record.employee_id.name))
nb = -(record.number_of_days_temp)
elif record.holiday_type == 'category' and record.type == 'remove':
if record.category_id and not record.holiday_status_id.limit:
leaves_rest = obj_hr_holiday_status.get_days_cat( cr, uid, [record.holiday_status_id.id], record.category_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
if leaves_rest < leave_asked:
- raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for category %s while there are too few remaining leave days.') % (record.category_id.name))
+ raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for %s while available leaves are less than asked leaves.') %(record.category_id.name))
nb = -(record.number_of_days_temp)
else:
nb = record.number_of_days_temp
=== modified file 'hr_holidays/i18n/hr_holidays.pot'
--- hr_holidays/i18n/hr_holidays.pot 2010-12-03 15:55:33 +0000
+++ hr_holidays/i18n/hr_holidays.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:38+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:38+0000\n"
+"POT-Creation-Date: 2010-12-10 09:55:54+0000\n"
+"PO-Revision-Date: 2010-12-10 09:55:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -49,6 +49,12 @@
msgstr ""
#. module: hr_holidays
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,categ_id:0
+msgid "Meeting Category"
+msgstr ""
+
+#. module: hr_holidays
#: view:available.holidays.report:0
#: view:hr.holidays:0
#: view:hr.holidays.status:0
@@ -56,11 +62,6 @@
msgstr ""
#. module: hr_holidays
-#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
-msgid "Sick Leave"
-msgstr ""
-
-#. module: hr_holidays
#: view:available.holidays.report:0
#: field:available.holidays.report,department_id:0
#: view:hr.holidays:0
@@ -180,9 +181,8 @@
msgstr ""
#. module: hr_holidays
-#: help:hr.holidays,type:0
-msgid "Choose 'Leave Request' if someone wants to take an off-day. \n"
-"Choose 'Allocation Request' if you want to increase the number of leaves available for someone"
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leave"
msgstr ""
#. module: hr_holidays
@@ -197,12 +197,6 @@
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "You cannot validate leaves for category %s while there are too few remaining leave days."
-msgstr ""
-
-#. module: hr_holidays
#: field:hr.holidays.status,color_name:0
msgid "Color in Report"
msgstr ""
@@ -415,6 +409,11 @@
msgstr ""
#. module: hr_holidays
+#: view:available.holidays.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Waiting Approval"
msgstr ""
@@ -435,12 +434,6 @@
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "You cannot validate leaves for employee %s while there are too few remaining leave days."
-msgstr ""
-
-#. module: hr_holidays
#: help:hr.holidays.status,categ_id:0
msgid "If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example."
msgstr ""
@@ -665,6 +658,12 @@
msgstr ""
#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid "You cannot validate leaves for %s while available leaves are less than asked leaves."
+msgstr ""
+
+#. module: hr_holidays
#: field:hr.holidays,type:0
msgid "Request Type"
msgstr ""
@@ -773,9 +772,8 @@
msgstr ""
#. module: hr_holidays
-#: view:hr.holidays.status:0
-#: field:hr.holidays.status,categ_id:0
-msgid "Meeting Category"
+#: help:hr.holidays,type:0
+msgid "Choose 'Leave Request' if someone wants to take an off-day.Choose 'Allocation Request' if you want to increase the number of leaves available for someone"
msgstr ""
#. module: hr_holidays
=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py 2010-11-19 12:20:03 +0000
+++ hr_payroll/hr_payroll.py 2010-12-11 04:13:59 +0000
@@ -176,7 +176,7 @@
exp = line.category_id.condition
calculate = eval(exp, obj)
except Exception, e:
- raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s') % (e))
if not calculate:
continue
@@ -191,7 +191,7 @@
#Please have a look at the configuration guide.
amt = eval(base, obj)
except Exception, e:
- raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s') % (e))
if sal_type in ('gross', 'net'):
if line.amount_type == 'per':
@@ -281,7 +281,7 @@
try:
amount = line.amount * eval(str(line.category_id.base), obj)
except Exception, e:
- raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ' % (e)))
elif line.amount_type in ('fix', 'func'):
amount = line.amount
cd = line.category_id.code.lower()
@@ -1147,7 +1147,7 @@
exp = line.category_id.condition
calculate = eval(exp, obj)
except Exception, e:
- raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s') % (e))
if not calculate:
continue
@@ -1162,7 +1162,7 @@
#Please have a look at the configuration guide.
amt = eval(base, obj)
except Exception, e:
- raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s') % (e))
if sal_type in ('gross', 'net'):
if line.amount_type == 'per':
@@ -1261,7 +1261,7 @@
paid_leave = 0.0
for hday in holiday_pool.browse(cr, uid, leave_ids, context=context):
if not hday.holiday_status_id.head_id:
- raise osv.except_osv(_('Error !'), _('Please check configuration of %s, payroll head is missing') % (hday.holiday_status_id.name))
+ raise osv.except_osv(_('Error !'), _('Please check configuration of %s, payroll head is missing' % (hday.holiday_status_id.name)))
res = {
'slip_id':slip.id,
@@ -1448,7 +1448,7 @@
try:
amt = eval(base, obj)
except Exception, e:
- raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s')% (e))
amount = 0.0
if line.amount_type == 'per':
amount = amt * line.amount
=== modified file 'hr_payroll/i18n/hr_payroll.pot'
--- hr_payroll/i18n/hr_payroll.pot 2010-12-03 15:55:33 +0000
+++ hr_payroll/i18n/hr_payroll.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:39+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:39+0000\n"
+"POT-Creation-Date: 2010-12-10 09:56:18+0000\n"
+"PO-Revision-Date: 2010-12-10 09:56:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -40,6 +40,11 @@
msgstr ""
#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
+msgid "Wage Type"
+msgstr ""
+
+#. module: hr_payroll
#: report:employees.salary:0
msgid "Employees Salary Details"
msgstr ""
@@ -254,12 +259,6 @@
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
#: selection:company.contribution,amount_type:0
msgid "Percentage"
msgstr ""
@@ -281,6 +280,13 @@
msgstr ""
#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Variable Error: %s ' % (e)))\n"
+" elif line.amount_type in ('fix', 'func"
+msgstr ""
+
+#. module: hr_payroll
#: selection:hr.allounce.deduction.categoty,type:0
#: selection:hr.payslip.line,type:0
msgid "Other Deduction"
@@ -305,6 +311,12 @@
msgstr ""
#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Variable Error: %s"
+msgstr ""
+
+#. module: hr_payroll
#: selection:hr.holidays.status,type:0
msgid "Un-Paid Holiday"
msgstr ""
@@ -529,6 +541,11 @@
msgstr ""
#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "#"
+msgstr ""
+
+#. module: hr_payroll
#: code:addons/hr_payroll/hr_payroll.py:0
#, python-format
msgid "Error !"
@@ -1349,8 +1366,73 @@
msgstr ""
#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please check configuration of %s, payroll head is missing' % (hday.holiday_status_id.name)))\n"
+"\n"
+" res = {\n"
+" 'slip_id':slip.id,\n"
+" 'name':hday.holiday_status_id.name + '-%s' % (hday.number_of_days),\n"
+" 'code':hday.holiday_status_id.code,\n"
+" 'amount_type':'fix',\n"
+" 'category_id':hday.holiday_status_id.head_id.id,\n"
+" 'sequence':hday.holiday_status_id.head_id.sequence\n"
+" }\n"
+" days = hday.number_of_days\n"
+" if hday.number_of_days < 0:\n"
+" days = hday.number_of_days * -1\n"
+" total_leave += days\n"
+" if hday.holiday_status_id.type == 'paid':\n"
+" paid_leave += days\n"
+" continue\n"
+"# res['name'] = hday.holiday_status_id.name + '-%s' % (days)\n"
+"# res['amount'] = perday * days\n"
+"# res['type'] = 'allowance'\n"
+"# leave += days\n"
+"# total += perday * days\n"
+"\n"
+" elif hday.holiday_status_id.type == 'halfpaid':\n"
+" paid_leave += (days / 2)\n"
+" res['name'] = hday.holiday_status_id.name + '-%s/2' % (days)\n"
+" res['amount'] = perday * (days/2)\n"
+" total += perday * (days/2)\n"
+" leave += days / 2\n"
+" res['type'] = 'deduction'\n"
+" else:\n"
+" res['name'] = hday.holiday_status_id.name + '-%s' % (days)\n"
+" res['amount'] = perday * days\n"
+" res['type'] = 'deduction'\n"
+" leave += days\n"
+" total += perday * days\n"
+"\n"
+" slip_line_pool.create(cr, uid, res, context=context)\n"
+" basic = basic - total\n"
+"# leaves = total\n"
+" update.update({\n"
+" 'basic':basic,\n"
+" 'basic_before_leaves': round(basic_before_leaves),\n"
+" 'leaves':total,\n"
+" 'holiday_days':leave,\n"
+" 'worked_days':working_day - leave,\n"
+" 'working_days':working_day,\n"
+" })\n"
+" self.write(cr, uid, [slip.id], update, context=context)\n"
+" return True\n"
+"hr_payslip()\n"
+"\n"
+"class hr_payslip_line(osv.osv):\n"
+" '\n"
+" Payslip Line\n"
+" '\n"
+"\n"
+" _name = 'hr.payslip.line'\n"
+" _description = 'Payslip Line'\n"
+"\n"
+" def onchange_category(self, cr, uid, ids, category_id):\n"
+" res = {\n"
+" }\n"
+" if category_id:\n"
+" category = self.pool.get('hr.allounce.deduction.categoty"
msgstr ""
#. module: hr_payroll
=== modified file 'hr_payroll_account/hr_payroll_account.py'
--- hr_payroll_account/hr_payroll_account.py 2010-11-18 16:21:31 +0000
+++ hr_payroll_account/hr_payroll_account.py 2010-12-11 04:13:59 +0000
@@ -277,10 +277,10 @@
if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
year_exist = True
if not year_exist:
- raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s') % slip.date)
+ raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s') %slip.date)
search_periods = period_pool.search(cr, uid, [('date_start','<=',slip.date),('date_stop','>=',slip.date)], context=context)
if not search_periods:
- raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s') % slip.date)
+ raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s') %slip.date)
period_id = search_periods[0]
name = 'Payment of Salary to %s' % (slip.employee_id.name)
move = {
@@ -428,10 +428,10 @@
partner_id = False
if not slip.employee_id.bank_account_id:
- raise osv.except_osv(_('Integrity Error !'), _('Please defined bank account for %s !') % (slip.employee_id.name))
+ raise osv.except_osv(_('Integrity Error !'), _('Please define bank account for %s !' % (slip.employee_id.name)))
if not slip.employee_id.bank_account_id.partner_id:
- raise osv.except_osv(_('Integrity Error !'), _('Please defined partner in bank account for %s !') % (slip.employee_id.name))
+ raise osv.except_osv(_('Integrity Error !'), _('Please define partner in bank account for %s !') % (slip.employee_id.name))
partner = slip.employee_id.bank_account_id.partner_id
partner_id = slip.employee_id.bank_account_id.partner_id.id
@@ -450,10 +450,10 @@
if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
year_exist = True
if not year_exist:
- raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s') % slip.date)
+ raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s')%slip.date)
search_periods = period_pool.search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)], context=context)
if not search_periods:
- raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s') % slip.date)
+ raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s')%slip.date)
period_id = search_periods[0]
move = {
@@ -667,4 +667,4 @@
}
account_move_link_slip()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
=== modified file 'hr_payroll_account/i18n/hr_payroll_account.pot'
--- hr_payroll_account/i18n/hr_payroll_account.pot 2010-12-03 15:55:33 +0000
+++ hr_payroll_account/i18n/hr_payroll_account.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:40+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:40+0000\n"
+"POT-Creation-Date: 2010-12-10 09:56:34+0000\n"
+"PO-Revision-Date: 2010-12-10 09:56:34+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -89,12 +89,6 @@
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
-#, python-format
-msgid "Please defined partner in bank account for %s !"
-msgstr ""
-
-#. module: hr_payroll_account
#: view:hr.payslip:0
msgid "Accounting Informations"
msgstr ""
@@ -102,7 +96,7 @@
#. module: hr_payroll_account
#: code:addons/hr_payroll_account/hr_payroll_account.py:0
#, python-format
-msgid "Please defined bank account for %s !"
+msgid "Please define partner in bank account for %s !"
msgstr ""
#. module: hr_payroll_account
@@ -143,6 +137,7 @@
msgstr ""
#. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
#: field:hr.holidays.status,account_id:0
#: field:hr.payroll.advice,account_id:0
msgid "Account"
@@ -315,3 +310,12 @@
msgid "Integrity Error !"
msgstr ""
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please define bank account for %s !' % (slip.employee_id.name)))\n"
+"\n"
+" if not slip.employee_id.bank_account_id.partner_id:\n"
+" raise osv.except_osv(_('Integrity Error !"
+msgstr ""
+
=== modified file 'hr_recruitment/i18n/hr_recruitment.pot'
--- hr_recruitment/i18n/hr_recruitment.pot 2010-12-03 15:55:33 +0000
+++ hr_recruitment/i18n/hr_recruitment.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:41+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:41+0000\n"
+"POT-Creation-Date: 2010-12-10 09:56:50+0000\n"
+"PO-Revision-Date: 2010-12-10 09:56:50+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -596,6 +596,11 @@
#. module: hr_recruitment
#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
msgid "June"
msgstr ""
@@ -764,8 +769,15 @@
msgstr ""
#. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "October"
+#: model:ir.module.module,description:hr_recruitment.module_meta_information
+msgid "\n"
+"Manages job positions and the recruitement process. It's integrated with the\n"
+"survey module to allow you to define interview for different jobs.\n"
+"\n"
+"This module is integrated with the mail gateway to automatically tracks email\n"
+"sent to jobs@xxxxxxxxxxxxxxx. It's also integrated with the document management\n"
+"system to store and search in your CV base.\n"
+" "
msgstr ""
#. module: hr_recruitment
=== modified file 'hr_timesheet/hr_timesheet.py'
--- hr_timesheet/hr_timesheet.py 2010-10-27 12:49:59 +0000
+++ hr_timesheet/hr_timesheet.py 2010-12-11 04:13:59 +0000
@@ -175,9 +175,9 @@
if emp_id:
ename = emp_obj.browse(cr, uid, emp_id[0], context=context).name
if not vals.get('journal_id',False):
- raise osv.except_osv(_('Warning !'), _('Analytic journal is not defined for employee %s \nDefine an employee for the selected user and assign an analytic journal!')%(ename,))
+ raise osv.except_osv(_('Warning!'), _('Analytic journal is not defined for employee %s \nDefine an employee for the selected user and assign an analytic journal!')%(ename,))
if not vals.get('account_id',False):
- raise osv.except_osv(_('Warning !'), _('No analytic account defined on the project.\nPlease set one or we can not automatically fill the timesheet.'))
+ raise osv.except_osv(_('Warning!'), _('No analytic account defined on the project.Please set one or we can not automatically fill the timesheet.'))
return super(hr_analytic_timesheet, self).create(cr, uid, vals, context=context)
def on_change_user_id(self, cr, uid, ids, user_id):
=== modified file 'hr_timesheet/i18n/hr_timesheet.pot'
--- hr_timesheet/i18n/hr_timesheet.pot 2010-12-03 15:55:33 +0000
+++ hr_timesheet/i18n/hr_timesheet.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:41+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:41+0000\n"
+"POT-Creation-Date: 2010-12-10 09:57:07+0000\n"
+"PO-Revision-Date: 2010-12-10 09:57:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -81,12 +81,6 @@
msgstr ""
#. module: hr_timesheet
-#: selection:hr.analytical.timesheet.employee,month:0
-#: selection:hr.analytical.timesheet.users,month:0
-msgid "janvier"
-msgstr ""
-
-#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:0
#: code:addons/hr_timesheet/report/users_timesheet.py:0
#, python-format
@@ -141,12 +135,6 @@
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:0
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: hr_timesheet
#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
#, python-format
msgid "UserError"
@@ -159,6 +147,12 @@
msgstr ""
#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:0
+#, python-format
+msgid "No analytic account defined on the project.Please set one or we can not automatically fill the timesheet."
+msgstr ""
+
+#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:0
#: code:addons/hr_timesheet/report/users_timesheet.py:0
#, python-format
@@ -177,6 +171,12 @@
msgstr ""
#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:0
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
msgid "Human Resources (Timesheet encoding)"
msgstr ""
@@ -218,12 +218,6 @@
msgstr ""
#. module: hr_timesheet
-#: selection:hr.analytical.timesheet.employee,month:0
-#: selection:hr.analytical.timesheet.users,month:0
-msgid "juillet"
-msgstr ""
-
-#. module: hr_timesheet
#: view:hr.analytical.timesheet.users:0
msgid "Monthly Employees Timesheet"
msgstr ""
@@ -231,6 +225,8 @@
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:0
#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
#, python-format
msgid "July"
msgstr ""
@@ -247,14 +243,25 @@
msgstr ""
#. module: hr_timesheet
+#: model:ir.module.module,description:hr_timesheet.module_meta_information
+msgid "\n"
+"This module implements a timesheet system. Each employee can encode and\n"
+"track their time spent on the different projects. A project is an\n"
+"analytic account and the time spent on a project generates costs on\n"
+"the analytic account.\n"
+"\n"
+"Lots of reporting on time and employee tracking are provided.\n"
+"\n"
+"It is completely integrated with the cost accounting module. It allows you\n"
+"to set up a management by affair.\n"
+" "
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
#: selection:hr.analytical.timesheet.employee,month:0
#: selection:hr.analytical.timesheet.users,month:0
-msgid "novembre"
-msgstr ""
-
-#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
#, python-format
msgid "March"
msgstr ""
@@ -265,14 +272,10 @@
msgstr ""
#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
#: selection:hr.analytical.timesheet.employee,month:0
#: selection:hr.analytical.timesheet.users,month:0
-msgid "décembre"
-msgstr ""
-
-#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
#, python-format
msgid "September"
msgstr ""
@@ -356,14 +359,10 @@
msgstr ""
#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
#: selection:hr.analytical.timesheet.employee,month:0
#: selection:hr.analytical.timesheet.users,month:0
-msgid "août"
-msgstr ""
-
-#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
#, python-format
msgid "August"
msgstr ""
@@ -371,6 +370,8 @@
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:0
#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
#, python-format
msgid "June"
msgstr ""
@@ -381,12 +382,6 @@
msgstr ""
#. module: hr_timesheet
-#: selection:hr.analytical.timesheet.employee,month:0
-#: selection:hr.analytical.timesheet.users,month:0
-msgid "mars"
-msgstr ""
-
-#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
msgid "Date"
msgstr ""
@@ -394,6 +389,8 @@
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:0
#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
#, python-format
msgid "November"
msgstr ""
@@ -411,6 +408,8 @@
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:0
#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
#, python-format
msgid "October"
msgstr ""
@@ -418,6 +417,8 @@
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:0
#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
#, python-format
msgid "January"
msgstr ""
@@ -468,6 +469,8 @@
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:0
#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
#, python-format
msgid "December"
msgstr ""
@@ -489,12 +492,6 @@
msgstr ""
#. module: hr_timesheet
-#: selection:hr.analytical.timesheet.employee,month:0
-#: selection:hr.analytical.timesheet.users,month:0
-msgid "février"
-msgstr ""
-
-#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
msgid "Information"
msgstr ""
@@ -506,12 +503,6 @@
msgstr ""
#. module: hr_timesheet
-#: selection:hr.analytical.timesheet.employee,month:0
-#: selection:hr.analytical.timesheet.users,month:0
-msgid "avril"
-msgstr ""
-
-#. module: hr_timesheet
#: field:hr.sign.in.project,server_date:0
#: field:hr.sign.out.project,server_date:0
msgid "Current Date"
@@ -541,6 +532,8 @@
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:0
#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
#, python-format
msgid "May"
msgstr ""
@@ -551,12 +544,6 @@
msgstr ""
#. module: hr_timesheet
-#: selection:hr.analytical.timesheet.employee,month:0
-#: selection:hr.analytical.timesheet.users,month:0
-msgid "juin"
-msgstr ""
-
-#. module: hr_timesheet
#: view:hr.sign.in.project:0
msgid "(local time on the server side)"
msgstr ""
@@ -576,6 +563,8 @@
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:0
#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
#, python-format
msgid "February"
msgstr ""
@@ -596,32 +585,15 @@
msgstr ""
#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
#: selection:hr.analytical.timesheet.employee,month:0
#: selection:hr.analytical.timesheet.users,month:0
-msgid "octobre"
-msgstr ""
-
-#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
#, python-format
msgid "April"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:0
-#, python-format
-msgid "No analytic account defined on the project.\n"
-"Please set one or we can not automatically fill the timesheet."
-msgstr ""
-
-#. module: hr_timesheet
-#: selection:hr.analytical.timesheet.employee,month:0
-#: selection:hr.analytical.timesheet.users,month:0
-msgid "mai"
-msgstr ""
-
-#. module: hr_timesheet
#: view:account.analytic.account:0
#: view:hr.analytic.timesheet:0
msgid "Users"
@@ -664,9 +636,3 @@
msgid "Change Work"
msgstr ""
-#. module: hr_timesheet
-#: selection:hr.analytical.timesheet.employee,month:0
-#: selection:hr.analytical.timesheet.users,month:0
-msgid "septembre"
-msgstr ""
-
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
--- hr_timesheet_invoice/hr_timesheet_invoice.py 2010-11-18 05:21:19 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py 2010-12-11 04:13:59 +0000
@@ -139,7 +139,7 @@
if acc.state=='pending':
res['warning'] = {
'title': 'Warning',
- 'message': 'The analytic account is in pending state.\nYou should not work on this account !'
+ 'message': 'The analytic account is in pending state.You should not work on this account !'
}
return res
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_view.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2010-12-09 11:52:11 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2010-12-11 04:13:59 +0000
@@ -64,8 +64,7 @@
<field name="type">tree</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
<field name="arch" type="xml">
-
- <field name="account_id" position="replace">
+ <field name="account_id" position="replace">
<field domain="[('type','=','normal'),('state', '<>', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
</field>
</field>
@@ -117,7 +116,6 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[]</field>
- <field name="context">{'search_default_to_invoice': 1}</field>
<field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
<field name="help">This lists show you every task work you can invoice to the customer. Select the lines in order to generate the invoices automatically.</field>
</record>
=== modified file 'hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot'
--- hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot 2010-12-03 15:55:33 +0000
+++ hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:42+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:42+0000\n"
+"POT-Creation-Date: 2010-12-10 09:58:40+0000\n"
+"PO-Revision-Date: 2010-12-10 09:58:40+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -87,6 +87,12 @@
msgstr ""
#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#, python-format
+msgid "Please fill in the partner and pricelist field in the analytic account:%s"
+msgstr ""
+
+#. module: hr_timesheet_invoice
#: help:account.analytic.account,pricelist_id:0
msgid "The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."
msgstr ""
@@ -143,6 +149,12 @@
msgstr ""
#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#, python-format
+msgid "Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:%s"
+msgstr ""
+
+#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
msgid "Uninvoiced line with billing rate"
msgstr ""
@@ -360,6 +372,14 @@
msgstr ""
#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:hr_timesheet_invoice.module_meta_information
+msgid "\n"
+"Module to generate invoices based on costs (human resources, expenses, ...).\n"
+"You can define price lists in analytic account, make some theoretical revenue\n"
+"reports, eso."
+msgstr ""
+
+#. module: hr_timesheet_invoice
#: help:account.analytic.account,to_invoice:0
msgid "Fill this field if you plan to automatically generate invoices based on the costs in this analytic account: timesheets, expenses, ...You can configure an automatic invoice rate on analytic accounts."
msgstr ""
@@ -675,13 +695,6 @@
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
-#, python-format
-msgid "Please fill in the partner and pricelist field in the analytic account:\n"
-"%s"
-msgstr ""
-
-#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
#, python-format
msgid "Error"
@@ -802,13 +815,6 @@
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
-#, python-format
-msgid "Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n"
-"%s"
-msgstr ""
-
-#. module: hr_timesheet_invoice
#: help:hr_timesheet_invoice.factor,customer_name:0
msgid "Label for the customer"
msgstr ""
@@ -902,8 +908,8 @@
msgstr ""
#. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,to_invoice:0
-msgid "Invoicing"
+#: field:hr_timesheet_invoice.factor,name:0
+msgid "Internal name"
msgstr ""
#. module: hr_timesheet_invoice
@@ -1034,8 +1040,8 @@
msgstr ""
#. module: hr_timesheet_invoice
-#: field:hr_timesheet_invoice.factor,name:0
-msgid "Internal name"
+#: field:random.timesheet.lines,to_invoice:0
+msgid "Invoicing"
msgstr ""
#. module: hr_timesheet_invoice
=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py 2010-07-27 07:11:45 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py 2010-12-11 04:13:59 +0000
@@ -66,7 +66,7 @@
if (not partner) or not (account.pricelist_id):
raise osv.except_osv(_('Analytic account incomplete'),
_('Please fill in the partner and pricelist field '
- 'in the analytic account:\n%s') % (account.name,))
+ 'in the analytic account:%s') % (account.name,))
date_due = False
if partner.property_payment_term:
=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py 2010-10-27 12:49:59 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py 2010-12-11 04:13:59 +0000
@@ -75,7 +75,7 @@
partner = account.partner_id
if (not partner) or not (account.pricelist_id):
raise osv.except_osv(_('Analytic Account incomplete'),
- _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s') % (account.name,))
+ _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:%s') % ('\n' + account.name,))
if not partner.address:
raise osv.except_osv(_('Partner incomplete'),
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py 2010-11-02 11:11:12 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py 2010-12-11 04:13:59 +0000
@@ -635,12 +635,11 @@
if 'sheet_id' in context:
ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, context['sheet_id'], context=context)
if ts.state not in ('draft', 'new'):
- raise osv.except_osv(_('Error !'), _('You cannot modify an entry in a confirmed timesheet !'))
+ raise osv.except_osv(_('Error!'), _('You cannot modify an entry in a confirmed timesheet!'))
res = super(hr_attendance,self).create(cr, uid, vals, context=context)
if 'sheet_id' in context:
if context['sheet_id'] != self.browse(cr, uid, res, context=context).sheet_id.id:
- raise osv.except_osv(_('UserError'), _('You cannot enter an attendance ' \
- 'date outside the current timesheet dates!'))
+ raise osv.except_osv(_('UserError'), _('You cannot enter an attendance date outside the current timesheet dates!'))
return res
def unlink(self, cr, uid, ids, *args, **kwargs):
@@ -789,8 +788,7 @@
'timesheet_range': fields.selection(
[('day','Day'),('week','Week'),('month','Month'),('year','Year')], 'Timesheet range'),
'timesheet_max_difference': fields.float('Timesheet allowed difference(Hours)',
- help="Allowed difference in hours between the sign in/out and the timesheet " \
- "computation for one sheet. Set this to 0 if you do not want any control."),
+ help="Allowed difference in hours between the sign in/out and the timesheet computation for one sheet. Set this to 0 if you do not want any control."),
}
_defaults = {
'timesheet_range': lambda *args: 'week',
=== modified file 'hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot'
--- hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot 2010-12-03 15:55:33 +0000
+++ hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot 2010-12-11 04:13:59 +0000
@@ -695,8 +695,8 @@
#. module: hr_timesheet_sheet
#: help:hr_timesheet_sheet.sheet,state:0
-msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed timesheet. \n"
-"* The 'Confirmed' state is used for to confirm the timesheet by user. \n"
+msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed timesheet.\n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.\n"
"* The 'Done' state is used when users timesheet is accepted by his/her senior."
msgstr ""
=== modified file 'html_view/i18n/html_view.pot'
--- html_view/i18n/html_view.pot 2010-12-03 15:55:33 +0000
+++ html_view/i18n/html_view.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:44+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:44+0000\n"
+"POT-Creation-Date: 2010-12-10 10:37:04+0000\n"
+"PO-Revision-Date: 2010-12-10 10:37:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -47,6 +47,13 @@
msgstr ""
#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid "\n"
+" This is the test module which shows html tag supports in normal xml form view.\n"
+" "
+msgstr ""
+
+#. module: html_view
#: model:ir.model,name:html_view.model_html_view
msgid "html.view"
msgstr ""
=== modified file 'idea/i18n/idea.pot'
--- idea/i18n/idea.pot 2010-12-03 15:55:33 +0000
+++ idea/i18n/idea.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:45+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:45+0000\n"
+"POT-Creation-Date: 2010-12-10 10:45:45+0000\n"
+"PO-Revision-Date: 2010-12-10 10:45:45+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -58,6 +58,17 @@
msgstr ""
#. module: idea
+#: model:ir.module.module,description:idea.module_meta_information
+msgid "\n"
+" This module allows your user to easily and efficiently participate in the innovation of the enterprise.\n"
+" It allows everybody to express ideas about different subjects.\n"
+" Then, other users can comment on these ideas and vote for particular ideas.\n"
+" Each idea has a score based on the different votes.\n"
+" The managers can obtain an easy view on best ideas from all the users.\n"
+" Once installed, check the menu 'Ideas' in the 'Tools' main menu."
+msgstr ""
+
+#. module: idea
#: model:ir.module.module,shortdesc:idea.module_meta_information
msgid "Idea Manager"
msgstr ""
@@ -114,7 +125,6 @@
#. module: idea
#: code:addons/idea/idea.py:0
-#: code:addons/idea/wizard/idea_post_vote.py:0
#, python-format
msgid "Warning !"
msgstr ""
@@ -135,6 +145,11 @@
msgstr ""
#. module: idea
+#: help:idea.idea,state:0
+msgid "When the Idea is created the state is 'Draft'.It is opened by the user, the state is 'Opened'.If the idea is accepted, the state is 'Accepted'."
+msgstr ""
+
+#. module: idea
#: field:idea.category,parent_id:0
msgid "Parent Categories"
msgstr ""
@@ -161,6 +176,12 @@
#. module: idea
#: code:addons/idea/wizard/idea_post_vote.py:0
#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: idea
+#: code:addons/idea/wizard/idea_post_vote.py:0
+#, python-format
msgid "You can not give Vote for this idea more than %s times"
msgstr ""
@@ -245,13 +266,6 @@
msgstr ""
#. module: idea
-#: help:idea.idea,state:0
-msgid "When the Idea is created the state is 'Draft'.\n"
-" It is opened by the user, the state is 'Opened'. \n"
-"If the idea is accepted, the state is 'Accepted'."
-msgstr ""
-
-#. module: idea
#: field:idea.category,visibility:0
#: field:idea.idea,visibility:0
msgid "Open Idea?"
=== modified file 'idea/idea.py'
--- idea/idea.py 2010-11-18 07:08:23 +0000
+++ idea/idea.py 2010-12-11 04:13:59 +0000
@@ -169,9 +169,7 @@
('close', 'Accepted'),
('cancel', 'Refused')],
'State', readonly=True,
- help='When the Idea is created the state is \'Draft\'.\n It is \
- opened by the user, the state is \'Opened\'.\
- \nIf the idea is accepted, the state is \'Accepted\'.'
+ help='When the Idea is created the state is \'Draft\'.It is opened by the user, the state is \'Opened\'.If the idea is accepted, the state is \'Accepted\'.'
),
'visibility':fields.boolean('Open Idea?', required=False),
'stat_vote_ids': fields.one2many('idea.vote.stat', 'idea_id', 'Statistics', readonly=True),
=== modified file 'idea/wizard/idea_post_vote.py'
--- idea/wizard/idea_post_vote.py 2010-11-18 07:08:23 +0000
+++ idea/wizard/idea_post_vote.py 2010-12-11 04:13:59 +0000
@@ -84,11 +84,10 @@
user_limit = idea.vote_limit
if count >= user_limit:
- raise osv.except_osv(_('Warning !'),_("You can not give Vote for this idea more than %s times") % (user_limit))
+ raise osv.except_osv(_('Warning!'),_("You can not give Vote for this idea more than %s times") % (user_limit))
if idea.state != 'open':
- raise osv.except_osv(_('Warning !'), _('Idea must be in \
-\'Open\' state before vote for that idea.'))
+ raise osv.except_osv(_('Warning!'), _('Idea must be in \'Open\' state before vote for that idea.'))
return False
def do_vote(self, cr, uid, ids, context=None):
=== modified file 'knowledge/i18n/knowledge.pot'
--- knowledge/i18n/knowledge.pot 2010-12-03 15:55:33 +0000
+++ knowledge/i18n/knowledge.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:45+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:45+0000\n"
+"POT-Creation-Date: 2010-12-10 10:45:58+0000\n"
+"PO-Revision-Date: 2010-12-10 10:45:58+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,8 +41,8 @@
msgstr ""
#. module: knowledge
-#: field:knowledge.installer,wiki_quality_manual:0
-msgid "Quality Manual"
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
msgstr ""
#. module: knowledge
@@ -97,6 +97,11 @@
msgstr ""
#. module: knowledge
+#: field:knowledge.installer,wiki_quality_manual:0
+msgid "Quality Manual"
+msgstr ""
+
+#. module: knowledge
#: view:knowledge.installer:0
msgid "title"
msgstr ""
=== modified file 'l10n_be/i18n/l10n_be.pot'
--- l10n_be/i18n/l10n_be.pot 2010-12-03 15:55:33 +0000
+++ l10n_be/i18n/l10n_be.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:46+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:46+0000\n"
+"POT-Creation-Date: 2010-12-10 10:46:46+0000\n"
+"PO-Revision-Date: 2010-12-10 10:46:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -501,6 +501,28 @@
msgstr ""
#. module: l10n_be
+#: model:ir.module.module,description:l10n_be.module_meta_information
+msgid "\n"
+" This is the base module to manage the accounting chart for Belgium in OpenERP.\n"
+"\n"
+" After Installing this module,The Configuration wizard for accounting is launched.\n"
+" * We have the account templates which can be helpful to generate Charts of Accounts.\n"
+" * On that particular wizard,You will be asked to pass the name of the company,the chart template to follow,the no. of digits to generate the code for your account and Bank account,currency to create Journals.\n"
+" Thus,the pure copy of Chart Template is generated.\n"
+" * This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.\n"
+"\n"
+" Wizards provided by this module:\n"
+" * Partner VAT Intra: Enlist the partners with their related VAT and invoiced amounts.Prepares an XML file format.\n"
+" Path to access : Financial Management/Reporting//Legal Statements/Belgium Statements/Partner VAT Listing\n"
+" * Periodical VAT Declaration: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.\n"
+" Path to access : Financial Management/Reporting/Legal Statements/Belgium Statements/Periodical VAT Declaration\n"
+" * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.Based on Fiscal year\n"
+" Path to access : Financial Management/Reporting/Legal Statements/Belgium Statements/Annual Listing Of VAT-Subjected Customers\n"
+"\n"
+" "
+msgstr ""
+
+#. module: l10n_be
#: help:l1on_be.vat.declaration,ask_payment:0
msgid "It indicates whether a payment is to made or not?"
msgstr ""
=== modified file 'l10n_ca/i18n/l10n_ca_en.pot'
--- l10n_ca/i18n/l10n_ca_en.pot 2010-10-25 13:23:05 +0000
+++ l10n_ca/i18n/l10n_ca_en.pot 2010-12-11 04:13:59 +0000
@@ -68,8 +68,8 @@
#. module: l10n_ca
#: model:ir.actions.todo,note:l10n_ca.config_call_account_template_ca
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n" " This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
-msgstr "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n" " This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated." "This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgstr "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated." "This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
#. module: l10n_ca
#: model:account.account.type,name:l10n_ca.account_type_payable
=== modified file 'l10n_ch/i18n/l10n_ch.pot'
--- l10n_ch/i18n/l10n_ch.pot 2010-11-10 05:42:41 +0000
+++ l10n_ch/i18n/l10n_ch.pot 2010-12-11 04:13:59 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
+"POT-Creation-Date: 2010-12-10 10:47:32+0000\n"
+"PO-Revision-Date: 2010-12-10 10:47:32+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,23 +16,54 @@
"Plural-Forms: \n"
#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Invoice Date:"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "-"
-msgstr ""
-
-#. module: l10n_ch
-#: field:account.journal.todo,name:0
-msgid "Journal to set"
-msgstr ""
-
-#. module: l10n_ch
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: model:ir.model,name:l10n_ch.model_account_tax_code
+msgid "Tax Code"
+msgstr ""
+
+#. module: l10n_ch
+#: view:bvr.invoices.report:0
+msgid "BVR Invoices Report"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_intangible_asset
+msgid "Bilan : Immo incorporelles"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No bank name defined\n"
+"for the bank account: %s\n"
+"on the partner: %s\n"
+"on line: %s"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_other_payable
+msgid "Bilan : Autres creanciers à CT"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_other_ope_exp
+msgid "PP : Autres charges d'exploitation"
+msgstr ""
+
+#. module: l10n_ch
+#: view:bvr.report:0
+msgid "Print BVR Report"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No bank account for the company."
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Record found after total record!"
msgstr ""
#. module: l10n_ch
@@ -41,51 +72,67 @@
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Mail:"
+#: model:account.account.type,name:l10n_ch.account_type_prov_reserve
+msgid "Bilan : Provisions et reserves"
msgstr ""
#. module: l10n_ch
-#: model:ir.actions.wizard,name:l10n_ch.wizard_bvr_import
-#: wizard_view:l10n_ch.bvr_import,init:0
+#: view:bvr.import.wizard:0
+#: model:ir.actions.act_window,name:l10n_ch.wizard_bvr_import
msgid "BVR Import"
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-msgid "Thanks,"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Base"
-msgstr ""
-
-#. module: l10n_ch
-#: model:ir.actions.report.xml,name:l10n_ch.account_invoice_bvr
-msgid "BVR A4 Sheet"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Refund"
-msgstr ""
-
-#. module: l10n_ch
-#: model:res.partner.title,name:l10n_ch.res_c_partner_title_mlle
-#: model:res.partner.title,name:l10n_ch.res_partner_title_mlle
-msgid "Mademoiselle"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-msgid "Dear customer,"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Amount"
+#: model:account.account.type,name:l10n_ch.account_type_equity
+msgid "Bilan : Capitaux propres"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_fixed_asset
+msgid "Bilan : Immo corporelles mobilieres"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_cash
+msgid "Bilan : Liquidites et titres"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "The Bank type %s of the bank account: %s is not supported"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No bank account defined\n"
+"on line: %s"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_other_receivable
+msgid "Bilan : Autres créances"
+msgstr ""
+
+#. module: l10n_ch
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_adjusting_asset
+msgid "Bilan : Actif de regularisation"
+msgstr ""
+
+#. module: l10n_ch
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_bvr_report
+msgid "bvr.report"
msgstr ""
#. module: l10n_ch
@@ -98,23 +145,47 @@
msgstr ""
#. module: l10n_ch
-#: model:ir.actions.wizard,name:l10n_ch.wizard_bvr_check_report
+#: code:addons/l10n_ch/wizard/bvr_report.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: l10n_ch
+#: model:ir.actions.act_window,name:l10n_ch.action_account_bvr_report
msgid "BVR"
msgstr ""
#. module: l10n_ch
-#: wizard_button:account.dta_create,init,end:0
-msgid "OK"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "TVA (%)"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Tax"
+#: constraint:account.invoice:0
+msgid "Error: BVR reference is required."
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_lt_liability
+msgid "Bilan : Dettes à LT"
+msgstr ""
+
+#. module: l10n_ch
+#: constraint:account.move.line:0
+msgid "You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Total record different from the computed!"
+msgstr ""
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_report.py:0
+#, python-format
+msgid "No bank specified on invoice:\n"
+"%s"
msgstr ""
#. module: l10n_ch
@@ -123,6 +194,12 @@
msgstr ""
#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Number record different from the computed!"
+msgstr ""
+
+#. module: l10n_ch
#: field:res.bank,clearing:0
msgid "Clearing number"
msgstr ""
@@ -133,37 +210,40 @@
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-msgid "', reference:"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Remarque:"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Disc. (%)"
-msgstr ""
-
-#. module: l10n_ch
-#: help:account.journal.todo,name:0
-msgid "the currenty edited account journal"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Supplier Invoice"
-msgstr ""
-
-#. module: l10n_ch
-#: constraint:res.partner:0
-msgid "The VAT doesn't seem to be correct."
-msgstr ""
-
-#. module: l10n_ch
-#: wizard_view:account.dta_create,init:0
+#: model:account.account.type,name:l10n_ch.account_type_financial_asset
+msgid "Bilan : Immobilisations financieres"
+msgstr ""
+
+#. module: l10n_ch
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No IBAN for the company bank account."
+msgstr ""
+
+#. module: l10n_ch
+#: view:bvr.invoices.report:0
+#: view:bvr.report:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "You must provide a Clearing Number for your bank account."
+msgstr ""
+
+#. module: l10n_ch
+#: view:create.dta.wizard:0
+msgid "Click on 'Save as' to save the DTA file :"
+msgstr ""
+
+#. module: l10n_ch
+#: view:create.dta.wizard:0
msgid "DTA file creation - Results"
msgstr ""
@@ -174,15 +254,27 @@
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-#: rml:l10n_ch.invoice.bvr:0
-msgid "+"
-msgstr ""
-
-#. module: l10n_ch
-#: model:ir.actions.act_window,name:l10n_ch.action_config_journal
-#: model:ir.actions.act_window,name:l10n_ch.action_config_tax
-msgid "Configure Journal"
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "You must provide a post number \n"
+"for the partner bank: %s\n"
+"on line: %s"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_closed
+msgid "Autre : Closed"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_financial_result
+msgid "PP : Resultat financier"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "The properties account payable account receivable"
msgstr ""
#. module: l10n_ch
@@ -192,23 +284,55 @@
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-msgid "Here is the BVR to allow you to pay the invoice '"
-msgstr ""
-
-#. module: l10n_ch
-#: view:account.journal.todo:0
-msgid "Account Journal"
-msgstr ""
-
-#. module: l10n_ch
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: l10n_ch
-#: model:ir.model,name:l10n_ch.model_account_journal_todo
-msgid "account.journal.todo"
+#: model:ir.module.module,description:l10n_ch.module_meta_information
+msgid "\n"
+"Swiss localisation :\n"
+" - DTA generation for a lot of payment types\n"
+" - BVR management (number generation, report, etc..)\n"
+" - Import account move from the bank file (like v11 etc..)\n"
+" - Simplify the way you handle the bank statement for reconciliation\n"
+" - Swiws account chart that add also tax template definition\n"
+"\n"
+"------------------------------------------------------------------------\n"
+"\n"
+"Module incluant la localisation Suisse de TinyERP revu et corrigé par Camptocamp. Cette nouvelle version\n"
+"comprend la gestion et l'émissionde BVR, le paiement électronique via DTA (pour les banques, le système postal est en développement),\n"
+"l'import du relevé de compte depuis la banque de manière automatisée, le plan de compte Swiws.\n"
+"De plus, nous avons intégré la définition de toutes les banques Suisses(adresse, swift et clearing).\n"
+"\n"
+"--------------------------------------------------------------------------\n"
+"TODO :\n"
+"- Implement bvr import partial reconciliation\n"
+"- Replace wizard by osv_memory when possible\n"
+"- Add mising HELP\n"
+"- Finish code comment\n"
+"- Improve demo data\n"
+"\n"
+"\n"
+""
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_payable
+msgid "Bilan : Fournisseurs"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "You must provide the bank city or the bic code for the partner bank: \n"
+" %d\n"
+"' + 'on line: %s"
+msgstr ""
+
+#. module: l10n_ch
+#: view:bvr.report:0
+msgid "BVR Report"
+msgstr ""
+
+#. module: l10n_ch
+#: field:res.partner.bank,print_bank:0
+msgid "Print Bank on BVR"
msgstr ""
#. module: l10n_ch
@@ -218,23 +342,64 @@
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Draft Invoice"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "VATÂ :"
-msgstr ""
-
-#. module: l10n_ch
-#: model:ir.actions.wizard,name:l10n_ch.wizard_invoice_bvr_check_report
+#: sql_constraint:res.partner.bank:0
+msgid "The BVR adherent number must be unique !"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "not implemented"
+msgstr ""
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_madame
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_madame
+msgid "Mme."
+msgstr ""
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_bvr_invoices_report
+msgid "bvr.invoices.report"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_view
+msgid "Autre : Vue"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_report.py:0
+#, python-format
+msgid "Your bank BVR adherent number must contain exactly seven digits!\n"
+"Please check your company information for the invoice:\n"
+"%s"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "You must provide a BVR number\n"
+"for the bank account: %son line: %s"
+msgstr ""
+
+#. module: l10n_ch
+#: model:ir.actions.act_window,name:l10n_ch.action_account_bvr_invoices_report
msgid "Invoices BVR"
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-msgid "Invoice -"
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No address defined \n"
+"for the partner: %s \n"
+"on line: %s"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Recursive mod10 is invalid for reference: %s"
msgstr ""
#. module: l10n_ch
@@ -243,18 +408,49 @@
msgstr ""
#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_adj_liability
+msgid "Bilan : Passifs de regularisation"
+msgstr ""
+
+#. module: l10n_ch
#: constraint:res.partner:0
msgid "Error ! You can not create recursive associated members."
msgstr ""
#. module: l10n_ch
-#: wizard_button:l10n_ch.bvr_import,init,import:0
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No payment mode"
+msgstr ""
+
+#. module: l10n_ch
+#: field:bvr.import.wizard,file:0
+msgid "BVR File"
+msgstr ""
+
+#. module: l10n_ch
+#: view:bvr.import.wizard:0
msgid "Import"
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "PRO-FORMA"
+#: constraint:account.invoice:0
+msgid "Error: Invalid Bvr Number (wrong checksum)."
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_non_ope_debts
+msgid "Bilan : Dettes hors exploitation"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_depreciation
+msgid "PP : Amortissement"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_other
+msgid "Autre : Other"
msgstr ""
#. module: l10n_ch
@@ -263,14 +459,16 @@
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Phone:"
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "You must provide a bank number \n"
+"for the partner bank: %s\n"
+"on line: %s"
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-msgid "."
+#: model:account.account.type,name:l10n_ch.account_type_purchase
+msgid "PP : Achat de marchandise"
msgstr ""
#. module: l10n_ch
@@ -279,30 +477,37 @@
msgstr ""
#. module: l10n_ch
-#: model:ir.actions.report.xml,name:l10n_ch.invoice_bvr
-msgid "Invoice with BVR"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid ":"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Condition"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-#: rml:l10n_ch.invoice.bvr:0
-msgid ">"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-#: rml:l10n_ch.invoice.bvr:0
-msgid "TVA:"
+#: model:account.account.type,name:l10n_ch.account_type_receivable
+msgid "Bilan : Debiteurs"
+msgstr ""
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: l10n_ch
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No IBAN defined \n"
+"for the bank account: %s\n"
+"' + 'on line: %s"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_non_ope_asset
+msgid "Bilan : Actifs hors exploitation"
+msgstr ""
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_mlle
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_mlle
+msgid "Mlle"
msgstr ""
#. module: l10n_ch
@@ -311,24 +516,26 @@
msgstr ""
#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_ch
#: model:res.partner.title,name:l10n_ch.res_c_partner_title_madame
#: model:res.partner.title,name:l10n_ch.res_partner_title_madame
msgid "Madame"
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Concerne:"
-msgstr ""
-
-#. module: l10n_ch
#: model:res.partner.bank.type,name:l10n_ch.bvpost
msgid "DTA-BVPOST"
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-msgid "Subject:"
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "Error"
msgstr ""
#. module: l10n_ch
@@ -338,8 +545,11 @@
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Quantity"
+#: code:addons/l10n_ch/wizard/bvr_report.py:0
+#, python-format
+msgid "Your bank BVR number should be of the form 0X-XXX-X!\n"
+"Please check your company information for the invoice:\n"
+"%s"
msgstr ""
#. module: l10n_ch
@@ -348,8 +558,9 @@
msgstr ""
#. module: l10n_ch
-#: help:account.journal.todo,default_debit_account_id:0
-msgid "The Default Debit Account of the account journal"
+#: model:res.partner.title,name:l10n_ch.res_c_partner_title_mlle
+#: model:res.partner.title,name:l10n_ch.res_partner_title_mlle
+msgid "Mademoiselle"
msgstr ""
#. module: l10n_ch
@@ -358,22 +569,13 @@
msgstr ""
#. module: l10n_ch
-#: field:account.journal.todo,default_debit_account_id:0
-msgid "Default Debit Account"
-msgstr ""
-
-#. module: l10n_ch
-#: help:account.journal.todo,default_credit_account_id:0
-msgid "The Default Credit Account of the account journal"
-msgstr ""
-
-#. module: l10n_ch
-#: view:account.journal.todo:0
-msgid "The accounts linked to the account journals"
-msgstr ""
-
-#. module: l10n_ch
-#: model:ir.actions.wizard,name:l10n_ch.wizard_account_dta_create
+#: model:ir.model,name:l10n_ch.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: l10n_ch
+#: view:create.dta.wizard:0
+#: model:ir.actions.act_window,name:l10n_ch.action_dta_create
msgid "Create DTA"
msgstr ""
@@ -383,81 +585,95 @@
msgstr ""
#. module: l10n_ch
-#: wizard_field:account.dta_create,init,dta:0
+#: field:create.dta.wizard,dta_file:0
msgid "DTA File"
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
+#: model:ir.model,name:l10n_ch.model_account_invoice
msgid "Invoice"
msgstr ""
#. module: l10n_ch
-#: view:account.journal.todo:0
-#: wizard_button:l10n_ch.bvr_import,init,end:0
-#: view:account.tax.template.todo:0
+#: view:bvr.import.wizard:0
+#: view:bvr.invoices.report:0
+#: view:bvr.report:0
+#: view:create.dta.wizard:0
msgid "Cancel"
msgstr ""
#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_inventory
+msgid "Bilan : Stocks"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_personnal_exp
+msgid "PP : Charge de personnel"
+msgstr ""
+
+#. module: l10n_ch
#: model:res.partner.bank.type.field,name:l10n_ch.post_field_bvpost
msgid "post_number"
msgstr ""
#. module: l10n_ch
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: l10n_ch
-#: field:account.journal.todo,default_credit_account_id:0
-msgid "Default Credit Account"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "(incl. taxes):"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Taxes:"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Description"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Price"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Canceled Invoice"
-msgstr ""
-
-#. module: l10n_ch
-#: wizard_field:l10n_ch.bvr_import,init,file:0
-msgid "BVR file"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-#: rml:l10n_ch.invoice.bvr:0
-msgid "1cm 25.7cm 7cm 25.7cm"
-msgstr ""
-
-#. module: l10n_ch
-#: wizard_view:account.dta_create,init:0
-msgid "Clic on 'Save as' to save the DTA file :"
+#: model:ir.model,name:l10n_ch.model_payment_order
+msgid "Payment Order"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_report_result
+msgid "Bilan : Resultat reporte"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "No bank defined\n"
+"for the bank account: %s\n"
+"on the partner: %s\n"
+"on line: %s"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/bvr_import.py:0
+#, python-format
+msgid "Too much total record found!"
+msgstr ""
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_create_dta_wizard
+msgid "create.dta.wizard"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "You must provide a Clearing Number\n"
+"for the partner bank: %s\n"
+"on line %s"
+msgstr ""
+
+#. module: l10n_ch
+#: constraint:account.tax.code:0
+msgid "Error! You can not create recursive accounts."
+msgstr ""
+
+#. module: l10n_ch
+#: field:res.partner.bank,print_account:0
+msgid "Print Account Number on BVR"
+msgstr ""
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_res_bank
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_mme_m
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_mme_m
+msgid "Mme,m"
msgstr ""
#. module: l10n_ch
@@ -466,8 +682,37 @@
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Total (excl. taxes):"
+#: field:bvr.invoices.report,name:0
+#: field:bvr.report,name:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_consolidation
+msgid "Autre : Consolidation"
+msgstr ""
+
+#. module: l10n_ch
+#: code:addons/l10n_ch/wizard/create_dta.py:0
+#, python-format
+msgid "You must provide a valid BVR reference number \n"
+"for the line: %s"
+msgstr ""
+
+#. module: l10n_ch
+#: view:bvr.invoices.report:0
+msgid "Print BVR Invoice Report"
+msgstr ""
+
+#. module: l10n_ch
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_societe
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_societe
+msgid "sc"
+msgstr ""
+
+#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_income
+msgid "PP : Chiffre d'affaires"
msgstr ""
#. module: l10n_ch
@@ -476,6 +721,11 @@
msgstr ""
#. module: l10n_ch
+#: model:account.account.type,name:l10n_ch.account_type_non_ope_result
+msgid "PP : Resultat activites annexes"
+msgstr ""
+
+#. module: l10n_ch
#: model:res.partner.bank.type,name:l10n_ch.dta_iban
msgid "DTA-IBAN"
msgstr ""
@@ -491,9 +741,13 @@
msgstr ""
#. module: l10n_ch
-#: model:ir.actions.todo,note:l10n_ch.action_config_journal_todo
-msgid "Set accounts on financial journals defined by\n"
-" Camptocamp l10n_ch module"
+#: model:ir.actions.todo,note:l10n_ch.config_call_account_template_l10n_ch
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked\n"
+" to pass the name of the company, the chart template to follow, the no. of digits to\n"
+" generate the code for your accounts and Bank account, currency to create Journals.\n"
+" Thus,the pure copy of chart Template is generated. This is the same wizard that runs\n"
+" from Financial Management/Configuration/Financial Accounting/Financial\n"
+" Accounts/Generate Chart of Accounts from a Chart Template."
msgstr ""
#. module: l10n_ch
@@ -502,9 +756,13 @@
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.bvr:0
-#: rml:l10n_ch.invoice.bvr:0
-msgid "1cm 27.7cm 20cm 27.7cm"
+#: model:account.account.type,name:l10n_ch.account_type_building_asset
+msgid "Bilan : Immo corporelles immobilieres"
+msgstr ""
+
+#. module: l10n_ch
+#: model:ir.model,name:l10n_ch.model_bvr_import_wizard
+msgid "bvr.import.wizard"
msgstr ""
#. module: l10n_ch
@@ -514,226 +772,9 @@
msgstr ""
#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Supplier Refund"
-msgstr ""
-
-#. module: l10n_ch
-#: rml:l10n_ch.invoice.bvr:0
-msgid "Total"
-msgstr ""
-
-#. module: l10n_ch
-#: field:account.tax.template.todo,account_paid_id:0
-msgid "Refund Tax Account"
-msgstr ""
-
-#. module: l10n_ch
-#: model:ir.actions.todo,note:l10n_ch.action_config_tax_todo
-msgid "Set account on financial taxes defined by \n"
-" Camptocamp l10n_ch_c2c_pcg module"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_adj_liability
-msgid "Bilan : Passifs de regularisation"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_intangible_asset
-msgid "Bilan : Immo incorporelles"
-msgstr ""
-
-#. module: l10n_ch
-#: view:account.tax.template.todo:0
-#: view:account.journal.todo:0
-msgid "Next"
-msgstr ""
-
-#. module: l10n_ch
-#: field:account.tax.template.todo,name:0
-msgid "Tax to set"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_financial_asset
-msgid "Bilan : Immobilisations financieres"
-msgstr ""
-
-#. module: l10n_ch
-#: view:account.tax.template.todo:0
-msgid "The accounts linked to the tax template"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_other_payable
-msgid "Bilan : Autres creanciers à CT"
-msgstr ""
-
-#. module: l10n_ch
-#: help:account.tax.template.todo,account_collected_id:0
-msgid "You can set here the invoice tax account"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_other_ope_exp
-msgid "PP : Autres charges d'exploitation"
-msgstr ""
-
-#. module: l10n_ch
-#: model:ir.module.module,description:l10n_ch.module_meta_information
-msgid "Swiws account chart that add also tax template definition"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_non_ope_debts
-msgid "Bilan : Dettes hors exploitation"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_other
-msgid "Autre : Other"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_prov_reserve
-msgid "Bilan : Provisions et reserves"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_financial_result
-msgid "PP : Resultat financier"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_purchase
-msgid "PP : Achat de marchandise"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_closed
-msgid "Autre : Closed"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_equity
-msgid "Bilan : Capitaux propres"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_receivable
-msgid "Bilan : Debiteurs"
-msgstr ""
-
-#. module: l10n_ch
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_fixed_asset
-msgid "Bilan : Immo corporelles mobilieres"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_cash
-msgid "Bilan : Liquidites et titres"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_non_ope_asset
-msgid "Bilan : Actifs hors exploitation"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_consolidation
-msgid "Autre : Consolidation"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_other_receivable
-msgid "Bilan : Autres créances"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_payable
-msgid "Bilan : Fournisseurs"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_adjusting_asset
-msgid "Bilan : Actif de regularisation"
-msgstr ""
-
-#. module: l10n_ch
-#: model:ir.model,name:l10n_ch.model_account_tax_template_todo
-msgid "account.tax.template.todo"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_report_result
-msgid "Bilan : Resultat reporte"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_income
-msgid "PP : Chiffre d'affaires"
-msgstr ""
-
-#. module: l10n_ch
-#: help:account.tax.template.todo,account_paid_id:0
-msgid "You can set here the refund tax account"
-msgstr ""
-
-#. module: l10n_ch
-#: field:account.tax.template.todo,account_collected_id:0
-msgid "Invoice Tax Account"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_depreciation
-msgid "PP : Amortissement"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_non_ope_result
-msgid "PP : Resultat activites annexes"
-msgstr ""
-
-#. module: l10n_ch
-#: model:ir.module.module,shortdesc:l10n_ch.module_meta_information
-msgid "Suisse - Plan comptable general pour PME STERCHI"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_view
-msgid "Autre : Vue"
-msgstr ""
-
-#. module: l10n_ch
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_lt_liability
-msgid "Bilan : Dettes à LT"
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_building_asset
-msgid "Bilan : Immo corporelles immobilieres"
-msgstr ""
-
-#. module: l10n_ch
-#: model:ir.actions.todo,note:l10n_ch.config_call_account_template_l10n_ch
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
-msgstr ""
-
-#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_inventory
-msgid "Bilan : Stocks"
+#: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_sir
+#: model:res.partner.title,shortcut:l10n_ch.res_partner_title_sir
+msgid "M. "
msgstr ""
#. module: l10n_ch
@@ -742,12 +783,7 @@
msgstr ""
#. module: l10n_ch
-#: model:account.account.type,name:l10n_ch.account_type_personnal_exp
-msgid "PP : Charge de personnel"
-msgstr ""
-
-#. module: l10n_ch
-#: help:account.tax.template.todo,name:0
-msgid "The tax template you are currently editing"
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
msgstr ""
=== modified file 'l10n_de/i18n/l10n_de.pot'
--- l10n_de/i18n/l10n_de.pot 2010-12-03 15:55:33 +0000
+++ l10n_de/i18n/l10n_de.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:43:50+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:50+0000\n"
+"POT-Creation-Date: 2010-12-10 10:48:00+0000\n"
+"PO-Revision-Date: 2010-12-10 10:48:00+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -61,3 +61,8 @@
msgid "Kunde EU Unternehmen (mit USt-ID)"
msgstr ""
+#. module: l10n_de
+#: model:ir.actions.todo,note:l10n_de.config_call_account_template_de
+msgid "Der Assistent generiert einen Kontenplan auf Basis eines Templates (Vorlage). Sie werden aufgefordert den Namen der Firma einzugeben, sowie die entsprechende Kontenvorlage zu wählen. Ausserdem können Sie für die Initialisierung der Journale die gewünschte Stellenanzahl der Konten, sowie die Hauptwährung Ihres Betriebes auswählen. Dieser Assistent ist identisch mit dem Open ERP Menü Finanzen/Konfiguration/Finanzkonten/Erzeuge Konten aus Vorlage."
+msgstr ""
+
=== modified file 'l10n_es/i18n/l10n_es.pot'
--- l10n_es/i18n/l10n_es.pot 2010-12-03 15:55:33 +0000
+++ l10n_es/i18n/l10n_es.pot 2010-12-11 04:13:59 +0000
@@ -110,16 +110,14 @@
#. module: l10n_es
#: model:ir.module.module,description:l10n_es.module_meta_information
-msgid "Spanish Charts of Accounts (PGCE 2008)\n"
-"\n"
-"* Defines the following chart of account templates:\n"
-" * Spanish General Chart of Accounts 2008.\n"
-" * Spanish General Chart of Accounts 2008 for small and medium companies.\n"
-"* Defines templates for sale and purchase VAT.\n"
-"* Defines tax code templates.\n"
-"\n"
-"Note: You should install the l10n_ES_account_balance_report module\n"
-"for yearly account reporting (balance, profit & losses).\n"
+msgid "Spanish Charts of Accounts (PGCE 2008)"
+"* Defines the following chart of account templates:"
+" * Spanish General Chart of Accounts 2008."
+" * Spanish General Chart of Accounts 2008 for small and medium companies."
+"* Defines templates for sale and purchase VAT."
+"* Defines tax code templates."
+"Note: You should install the l10n_ES_account_balance_report module"
+"for yearly account reporting (balance, profit & losses)."
""
msgstr ""
=== modified file 'l10n_fr/i18n/l10n_fr.pot'
--- l10n_fr/i18n/l10n_fr.pot 2010-12-03 15:55:33 +0000
+++ l10n_fr/i18n/l10n_fr.pot 2010-12-11 04:13:59 +0000
@@ -27,9 +27,8 @@
#. module: l10n_fr
#: model:ir.module.module,description:l10n_fr.module_meta_information
-msgid "This is the module to manage the accounting chart for France in OpenERP.\n"
-"\n"
-"Credits: Sistheo Zeekom CrysaLEAD\n"
+msgid "This is the module to manage the accounting chart for France in OpenERP."
+"Credits: Sistheo Zeekom CrysaLEAD"
""
msgstr ""
=== modified file 'l10n_gr/i18n/l10n_gr.pot'
--- l10n_gr/i18n/l10n_gr.pot 2010-12-03 15:55:33 +0000
+++ l10n_gr/i18n/l10n_gr.pot 2010-12-11 04:13:59 +0000
@@ -42,8 +42,8 @@
#. module: l10n_gr
#: model:ir.actions.todo,note:l10n_gr.config_call_account_template_gr
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated."
+"This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
msgstr ""
#. module: l10n_gr
=== modified file 'l10n_in/i18n/l10n_in.pot'
--- l10n_in/i18n/l10n_in.pot 2010-12-03 15:55:33 +0000
+++ l10n_in/i18n/l10n_in.pot 2010-12-11 04:13:59 +0000
@@ -32,8 +32,8 @@
#. module: l10n_in
#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated."
+"This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
msgstr ""
#. module: l10n_in
=== modified file 'l10n_uk/i18n/l10n_uk.pot'
--- l10n_uk/i18n/l10n_uk.pot 2010-12-03 15:55:33 +0000
+++ l10n_uk/i18n/l10n_uk.pot 2010-12-11 04:13:59 +0000
@@ -32,8 +32,8 @@
#. module: l10n_uk
#: model:ir.actions.todo,note:l10n_uk.config_call_account_template_uk_minimal
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated."
+"This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
msgstr ""
#. module: l10n_uk
=== modified file 'lunch/i18n/lunch.pot'
--- lunch/i18n/lunch.pot 2010-12-03 15:55:33 +0000
+++ lunch/i18n/lunch.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:01+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:01+0000\n"
+"POT-Creation-Date: 2010-12-10 10:54:22+0000\n"
+"PO-Revision-Date: 2010-12-10 10:54:22+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -57,6 +57,16 @@
msgstr ""
#. module: lunch
+#: model:ir.module.module,description:lunch.module_meta_information
+msgid "\n"
+" The base module to manage lunch\n"
+"\n"
+" keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.\n"
+" Apply Different Category for the product.\n"
+" "
+msgstr ""
+
+#. module: lunch
#: view:lunch.cashmove:0
#: view:lunch.order:0
msgid "Today"
=== modified file 'mail_gateway/i18n/mail_gateway.pot'
--- mail_gateway/i18n/mail_gateway.pot 2010-12-03 15:55:33 +0000
+++ mail_gateway/i18n/mail_gateway.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:02+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:02+0000\n"
+"POT-Creation-Date: 2010-12-10 10:54:39+0000\n"
+"PO-Revision-Date: 2010-12-10 10:54:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -179,8 +179,9 @@
msgstr ""
#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid " added note on "
msgstr ""
#. module: mail_gateway
@@ -236,6 +237,11 @@
msgstr ""
#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail_gateway
#: code:addons/mail_gateway/mail_gateway.py:0
#: view:mailgate.thread:0
#: view:res.partner:0
=== modified file 'marketing/i18n/marketing.pot'
--- marketing/i18n/marketing.pot 2010-12-03 15:55:33 +0000
+++ marketing/i18n/marketing.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:02+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:02+0000\n"
+"POT-Creation-Date: 2010-12-10 10:54:54+0000\n"
+"PO-Revision-Date: 2010-12-10 10:54:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
"Plural-Forms: \n"
#. module: marketing
-#: model:ir.module.module,description:marketing.module_meta_information
-msgid "Menu for Marketing"
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Applications Configuration"
msgstr ""
#. module: marketing
@@ -31,8 +31,8 @@
msgstr ""
#. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
-msgid "Marketing"
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
msgstr ""
#. module: marketing
@@ -46,6 +46,11 @@
msgstr ""
#. module: marketing
+#: model:ir.module.module,description:marketing.module_meta_information
+msgid "Menu for Marketing"
+msgstr ""
+
+#. module: marketing
#: help:marketing.installer,email_template:0
msgid "Helps you to design templates of emails and integrate them in your different processes."
msgstr ""
@@ -56,8 +61,8 @@
msgstr ""
#. module: marketing
-#: model:ir.actions.act_window,name:marketing.action_marketing_installer
-msgid "Marketing Applications Configuration"
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
msgstr ""
#. module: marketing
=== modified file 'marketing_campaign/i18n/marketing_campaign.pot'
--- marketing_campaign/i18n/marketing_campaign.pot 2010-12-03 15:55:33 +0000
+++ marketing_campaign/i18n/marketing_campaign.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:03+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:03+0000\n"
+"POT-Creation-Date: 2010-12-10 11:01:52+0000\n"
+"PO-Revision-Date: 2010-12-10 11:01:52+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -309,6 +309,11 @@
msgstr ""
#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr ""
+
+#. module: marketing_campaign
#: field:marketing.campaign,name:0
#: field:marketing.campaign.activity,name:0
#: field:marketing.campaign.segment,name:0
@@ -569,8 +574,19 @@
msgstr ""
#. module: marketing_campaign
-#: view:marketing.campaign.workitem:0
-msgid "Related Resource"
+#: model:ir.module.module,description:marketing_campaign.module_meta_information
+msgid "\n"
+"This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads).\n"
+" The campaigns are dynamic and multi-channels. The process is as follows:\n"
+" * Design marketing campaigns like workflows, including email templates to send, reports to print and send by email, custom actions, etc.\n"
+" * Define input segments that will select the items that should enter the campaign (e.g leads from certain countries, etc.)\n"
+" * Run you campaign in simulation mode to test it real-time or accelerated, and fine-tune it\n"
+" * You may also start the real campaign in manual mode, where each action requires manual validation\n"
+" * Finally launch your campaign live, and watch the statistics as the campaign does everything fully automatically. \n"
+" While the campaign runs you can of course continue to fine-tune the parameters, input segments, workflow, etc.\n"
+" \n"
+" Note: If you need demo data, you can install the marketing_campaign_crm_demo module, but this will also install the CRM application as it depends on CRM Leads.\n"
+" "
msgstr ""
#. module: marketing_campaign
=== modified file 'marketing_campaign/marketing_campaign.py'
--- marketing_campaign/marketing_campaign.py 2010-10-28 13:49:35 +0000
+++ marketing_campaign/marketing_campaign.py 2010-12-11 04:13:59 +0000
@@ -87,8 +87,7 @@
_columns = {
'name': fields.char('Name', size=64, required=True),
'object_id': fields.many2one('ir.model', 'Resource', required=True,
- help="Choose the model on which you want \
-this campaign to be run"),
+ help="Choose the model on which you want this campaign to be run"),
'partner_field_id': fields.many2one('ir.model.fields', 'Partner Field',
domain="[('model_id', '=', object_id), ('ttype', '=', 'many2one'), ('relation', '=', 'res.partner')]",
help="The generated workitems will be linked to the partner related to the record. If the record is the partner itself leave this field empty."),
=== modified file 'marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot'
--- marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot 2010-12-03 15:55:33 +0000
+++ marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:03+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:03+0000\n"
+"POT-Creation-Date: 2010-12-10 11:02:28+0000\n"
+"PO-Revision-Date: 2010-12-10 11:02:28+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,36 +26,71 @@
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
-msgid "Hello,We have very good offer that might suit you.\n"
-" We propose you to subscribe to the OpenERP Discovery Day on May 2010.\n"
+#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
+msgid "Demo data for the module marketing_campaign."
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
+msgid "Hello,Thanks for showing intrest and buying the OpenERP book.\n"
" If any further information required kindly revert back.\n"
-" We really appreciate your co-operation on this.\n"
+" I really appreciate your co-operation on this.\n"
" Regards,OpenERP Team,"
msgstr ""
#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
msgid "Thanks for buying the OpenERP book"
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
-msgid "Hello, We have very good offer that might suit you.\n"
-" For our silver partners,We are paid technical training on june,2010.\n"
-" If any further information required kindly revert back.\n"
-" I really appreciate your co-operation on this.\n"
-" Regards,OpenERP Team,"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
msgid "Propose a free technical training to Gold partners"
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
-msgid "Demo data for the module marketing_campaign."
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
+msgid "Hello, We have very good offer that might suit you.\n"
+" For our silver partners,We are offering Gold partnership.\n"
+" If any further information required kindly revert back.\n"
+" I really appreciate your co-operation on this.\n"
+" Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+msgid "Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.\n"
+" Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
msgstr ""
#. module: marketing_campaign_crm_demo
@@ -64,48 +99,6 @@
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
-msgid "Dummy Action"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
-msgid "Thanks for showing interest in OpenERP"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
-msgid "marketing_campaign_crm_demo"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
-msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
-msgid "Hello, We have very good offer that might suit you.\n"
-" For our silver partners,We are offering Gold partnership.\n"
-" If any further information required kindly revert back.\n"
-" I really appreciate your co-operation on this.\n"
-" Regards,OpenERP Team,"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
-msgid "Propose gold partnership to silver partners"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
-msgid "Hello,Thanks for showing intrest and buying the OpenERP book.\n"
-" If any further information required kindly revert back.\n"
-" I really appreciate your co-operation on this.\n"
-" Regards,OpenERP Team,"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
msgid "Hello, We have very good offer that might suit you.\n"
" For our gold partners,We are arranging free technical training on june,2010.\n"
@@ -123,23 +116,35 @@
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
-msgid "Thanks for subscribing to technical training"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: report:crm.lead.demo:0
-msgid "Partner :"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
-msgid "Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.\n"
-" Regards,OpenERP Team,"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
-msgid "Propose paid training to Silver partners"
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+msgid "Hello,We have very good offer that might suit you.\n"
+" We propose you to subscribe to the OpenERP Discovery Day on May 2010.\n"
+" If any further information required kindly revert back.\n"
+" We really appreciate your co-operation on this.\n"
+" Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid "Hello, We have very good offer that might suit you.\n"
+" For our silver partners,We are paid technical training on june,2010.\n"
+" If any further information required kindly revert back.\n"
+" I really appreciate your co-operation on this.\n"
+" Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
msgstr ""
=== modified file 'membership/i18n/membership.pot'
--- membership/i18n/membership.pot 2010-12-03 15:55:33 +0000
+++ membership/i18n/membership.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:04+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:04+0000\n"
+"POT-Creation-Date: 2010-12-10 11:02:44+0000\n"
+"PO-Revision-Date: 2010-12-10 11:02:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -85,6 +85,11 @@
msgstr ""
#. module: membership
+#: view:product.product:0
+msgid "Purchase Description"
+msgstr ""
+
+#. module: membership
#: help:report.membership,date_to:0
msgid "End membership date"
msgstr ""
@@ -136,8 +141,8 @@
msgstr ""
#. module: membership
-#: field:report.membership,num_invoiced:0
-msgid "# Invoiced"
+#: constraint:account.invoice:0
+msgid "Error: BVR reference is required."
msgstr ""
#. module: membership
@@ -348,8 +353,19 @@
msgstr ""
#. module: membership
-#: selection:report.membership,month:0
-msgid "December"
+#: model:ir.module.module,description:membership.module_meta_information
+msgid "\n"
+"This module allows you to manage all operations for managing memberships.\n"
+"It supports different kind of members:\n"
+"* Free member\n"
+"* Associated member (ex: a group subscribe for a membership for all\n"
+" subsidiaries)\n"
+"* Paid members,\n"
+"* Special member prices, ...\n"
+"\n"
+"It is integrated with sales and accounting to allow you to automatically\n"
+"invoice and send propositions for membership renewal.\n"
+" "
msgstr ""
#. module: membership
@@ -484,6 +500,11 @@
msgstr ""
#. module: membership
+#: constraint:account.invoice:0
+msgid "Error: Invalid Bvr Number (wrong checksum)."
+msgstr ""
+
+#. module: membership
#: field:res.partner,membership_cancel:0
msgid "Cancel membership date"
msgstr ""
@@ -562,8 +583,8 @@
msgstr ""
#. module: membership
-#: selection:report.membership,month:0
-msgid "October"
+#: field:report.membership,num_invoiced:0
+msgid "# Invoiced"
msgstr ""
#. module: membership
@@ -646,6 +667,11 @@
msgstr ""
#. module: membership
+#: selection:report.membership,month:0
+msgid "December"
+msgstr ""
+
+#. module: membership
#: view:membership.invoice:0
msgid "Close"
msgstr ""
@@ -684,8 +710,8 @@
msgstr ""
#. module: membership
-#: view:product.product:0
-msgid "Purchase Description"
+#: selection:report.membership,month:0
+msgid "October"
msgstr ""
#. module: membership
=== modified file 'mrp/i18n/mrp.pot'
--- mrp/i18n/mrp.pot 2010-12-03 15:55:33 +0000
+++ mrp/i18n/mrp.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:06+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:06+0000\n"
+"POT-Creation-Date: 2010-12-10 11:03:21+0000\n"
+"PO-Revision-Date: 2010-12-10 11:03:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -125,6 +125,11 @@
msgstr ""
#. module: mrp
+#: sql_constraint:mrp.bom:0
+msgid "All product quantities must be greater than 0.You should install the mrp_subproduct module if you want to manage extra products on BoMs !"
+msgstr ""
+
+#. module: mrp
#: view:mrp.production:0
msgid "Finished Products"
msgstr ""
@@ -245,6 +250,12 @@
msgstr ""
#. module: mrp
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+msgid "Search"
+msgstr ""
+
+#. module: mrp
#: report:mrp.production.order:0
msgid "Destination Location"
msgstr ""
@@ -364,6 +375,11 @@
msgstr ""
#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
+msgid "Working Time"
+msgstr ""
+
+#. module: mrp
#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
msgid "Weekly Stock Value Variation"
msgstr ""
@@ -396,8 +412,9 @@
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,name:mrp.action2
-msgid "Bill of Materials Structure"
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
+msgid "Bill of Material Components"
msgstr ""
#. module: mrp
@@ -501,6 +518,11 @@
msgstr ""
#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action2
+msgid "Bill of Materials Structure"
+msgstr ""
+
+#. module: mrp
#: selection:mrp.production.order,month:0
msgid "March"
msgstr ""
@@ -585,9 +607,8 @@
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
-#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
-msgid "Bill of Material Components"
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid "Bills of materials Components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM is used a specific component."
msgstr ""
#. module: mrp
@@ -606,6 +627,11 @@
msgstr ""
#. module: mrp
+#: help:mrp.product.produce,mode:0
+msgid "'Consume only' mode will only consume the products with the quantity selected.'Consume & Produce' mode will consume as well as produce the products with the quantity selected and it will finish the production order when total ordered quantities are produced."
+msgstr ""
+
+#. module: mrp
#: help:mrp.routing.workcenter,hour_nbr:0
#: help:mrp.workcenter,time_cycle:0
msgid "Time in hours for doing one cycle."
@@ -742,11 +768,6 @@
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
-msgid "Bills of materials Components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM is used a specific component."
-msgstr ""
-
-#. module: mrp
#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
msgid "Procurement of raw material"
msgstr ""
@@ -793,9 +814,8 @@
msgstr ""
#. module: mrp
-#: view:mrp.production.order:0
-#: view:mrp.property:0
-msgid "Search"
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid "If the service has a 'Buy' supply method, this creates a RFQ, a subcontracting demand for instance."
msgstr ""
#. module: mrp
@@ -894,8 +914,8 @@
msgstr ""
#. module: mrp
-#: model:process.transition,note:mrp.process_transition_servicerfq0
-msgid "If the service has a 'Buy' supply method, this creates a RFQ, a subcontracting demand for instance."
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
msgstr ""
#. module: mrp
@@ -936,8 +956,8 @@
msgstr ""
#. module: mrp
-#: view:mrp.production:0
-msgid "Source Loc."
+#: help:mrp.production,routing_id:0
+msgid "The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."
msgstr ""
#. module: mrp
@@ -965,13 +985,6 @@
msgstr ""
#. module: mrp
-#: help:mrp.installer,mrp_jit:0
-msgid "Enables Just In Time computation of procurement orders.\n"
-"\n"
-"While it's more resource intensive than the default setup, the JIT computer avoids having to wait for the procurement scheduler to run or having to run the procurement scheduler manually."
-msgstr ""
-
-#. module: mrp
#: field:mrp.product.produce,mode:0
msgid "Mode"
msgstr ""
@@ -992,6 +1005,42 @@
msgstr ""
#. module: mrp
+#: model:ir.module.module,description:mrp.module_meta_information
+msgid "\n"
+" This is the base module to manage the manufacturing process in OpenERP.\n"
+"\n"
+" Features:\n"
+" * Make to Stock / Make to Order (by line)\n"
+" * Multi-level BoMs, no limit\n"
+" * Multi-level routing, no limit\n"
+" * Routing and workcenter integrated with analytic accounting\n"
+" * Scheduler computation periodically / Just In Time module\n"
+" * Multi-pos, multi-warehouse\n"
+" * Different reordering policies\n"
+" * Cost method by product: standard price, average price\n"
+" * Easy analysis of troubles or needs\n"
+" * Very flexible\n"
+" * Allows to browse Bill of Materials in complete structure\n"
+" that include child and phantom BoMs\n"
+" It supports complete integration and planification of stockable goods,\n"
+" consumable of services. Services are completely integrated with the rest\n"
+" of the software. For instance, you can set up a sub-contracting service\n"
+" in a BoM to automatically purchase on order the assembly of your production.\n"
+"\n"
+" Reports provided by this module:\n"
+" * Bill of Material structure and components\n"
+" * Load forecast on workcenters\n"
+" * Print a production order\n"
+" * Stock forecasts\n"
+" Dashboard provided by this module::\n"
+" * List of next production orders\n"
+" * List of deliveries (out picking)\n"
+" * Graph of work center load\n"
+" * List of procurement in exception\n"
+" "
+msgstr ""
+
+#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action3
msgid "Manufacturing Orders in Progress"
msgstr ""
@@ -1307,9 +1356,8 @@
msgstr ""
#. module: mrp
-#: sql_constraint:mrp.bom:0
-msgid "All product quantities must be greater than 0.\n"
-"You should install the mrp_subproduct module if you want to manage extra products on BoMs !"
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
msgstr ""
#. module: mrp
@@ -1318,11 +1366,6 @@
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_change_production_qty
-msgid "Change Quantity of Products"
-msgstr ""
-
-#. module: mrp
#: model:process.node,note:mrp.process_node_productionorder0
msgid "Drives the procurement orders for raw material."
msgstr ""
@@ -1550,12 +1593,6 @@
msgstr ""
#. module: mrp
-#: help:mrp.product.produce,mode:0
-msgid "'Consume only' mode will only consume the products with the quantity selected.\n"
-"'Consume & Produce' mode will consume as well as produce the products with the quantity selected and it will finish the production order when total ordered quantities are produced."
-msgstr ""
-
-#. module: mrp
#: view:mrp.production:0
#: report:mrp.production.order:0
msgid "Work Orders"
@@ -1619,8 +1656,8 @@
msgstr ""
#. module: mrp
-#: help:mrp.production,routing_id:0
-msgid "The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."
+#: view:mrp.production:0
+msgid "Source Loc."
msgstr ""
#. module: mrp
@@ -1650,6 +1687,11 @@
msgstr ""
#. module: mrp
+#: help:mrp.installer,mrp_jit:0
+msgid "Enables Just In Time computation of procurement orders.While it's more resource intensive than the default setup, the JIT computer avoids having to wait for the procurement scheduler to run or having to run the procurement scheduler manually."
+msgstr ""
+
+#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid "Number of operations this workcenter can do in parallel. If this workcenter represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -1793,11 +1835,6 @@
msgstr ""
#. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
-msgid "Working Period"
-msgstr ""
-
-#. module: mrp
#: model:process.node,note:mrp.process_node_stock0
msgid "Assignment from Production or Purchase Order."
msgstr ""
@@ -2015,11 +2052,6 @@
msgstr ""
#. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
-msgstr ""
-
-#. module: mrp
#: model:ir.model,name:mrp.model_mrp_product_price
msgid "Product Price"
msgstr ""
=== modified file 'mrp/installer.py'
--- mrp/installer.py 2010-09-21 06:59:49 +0000
+++ mrp/installer.py 2010-12-11 04:13:59 +0000
@@ -27,24 +27,15 @@
_columns = {
# Manufacturing Resource Planning
'stock_location': fields.boolean('Advanced Routes',
- help="Manages product routes and paths within and between "
- "locations (e.g. warehouses)."),
+ help="Manages product routes and paths within and between locations (e.g. warehouses)."),
'mrp_jit': fields.boolean('Just In Time Scheduling',
- help="Enables Just In Time computation of procurement orders."
- "\n\nWhile it's more resource intensive than the default "
- "setup, the JIT computer avoids having to wait for the "
- "procurement scheduler to run or having to run the "
- "procurement scheduler manually."),
+ help="Enables Just In Time computation of procurement orders.While it's more resource intensive than the default setup, the JIT computer avoids having to wait for the procurement scheduler to run or having to run the procurement scheduler manually."),
'mrp_operations': fields.boolean('Manufacturing Operations',
- help="Enhances production orders with readiness states as well "
- "as the start date and end date of execution of the order."),
+ help="Enhances production orders with readiness states as well as the start date and end date of execution of the order."),
'mrp_subproduct': fields.boolean('MRP Subproducts',
- help="Enables multiple product output from a single production "
- "order: without this, a production order can have only one "
- "output product."),
+ help="Enables multiple product output from a single production order: without this, a production order can have only one output product."),
'mrp_repair': fields.boolean('Repairs',
- help="Enables warranty and repair management (and their impact "
- "on stocks and invoicing)."),
+ help="Enables warranty and repair management (and their impact on stocks and invoicing)."),
}
_defaults = {
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py 2010-11-26 16:13:59 +0000
+++ mrp/mrp.py 2010-12-11 04:13:59 +0000
@@ -213,8 +213,7 @@
}
_order = "sequence"
_sql_constraints = [
- ('bom_qty_zero', 'CHECK (product_qty>0)', 'All product quantities must be greater than 0.\n' \
- 'You should install the mrp_subproduct module if you want to manage extra products on BoMs !'),
+ ('bom_qty_zero', 'CHECK (product_qty>0)','All product quantities must be greater than 0.You should install the mrp_subproduct module if you want to manage extra products on BoMs !'),
]
def _check_recursion(self, cr, uid, ids):
=== modified file 'mrp/wizard/mrp_product_produce.py'
--- mrp/wizard/mrp_product_produce.py 2010-11-12 05:15:51 +0000
+++ mrp/wizard/mrp_product_produce.py 2010-12-11 04:13:59 +0000
@@ -29,9 +29,7 @@
'product_qty': fields.float('Select Quantity', required=True),
'mode': fields.selection([('consume_produce', 'Consume & Produce'),
('consume', 'Consume Only')], 'Mode', required=True,
- help="'Consume only' mode will only consume the products with the quantity selected.\n"
- "'Consume & Produce' mode will consume as well as produce the products with the quantity selected "
- "and it will finish the production order when total ordered quantities are produced."),
+ help="'Consume only' mode will only consume the products with the quantity selected.'Consume & Produce' mode will consume as well as produce the products with the quantity selected and it will finish the production order when total ordered quantities are produced."),
}
def _get_product_qty(self, cr, uid, context):
=== modified file 'mrp_jit/i18n/mrp_jit.pot'
--- mrp_jit/i18n/mrp_jit.pot 2010-12-03 15:55:33 +0000
+++ mrp_jit/i18n/mrp_jit.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:06+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:06+0000\n"
+"POT-Creation-Date: 2010-12-10 11:04:58+0000\n"
+"PO-Revision-Date: 2010-12-10 11:04:58+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,3 +20,22 @@
msgid "MRP JIT"
msgstr ""
+#. module: mrp_jit
+#: model:ir.module.module,description:mrp_jit.module_meta_information
+msgid "\n"
+" This module allows Just In Time computation of procurement orders.\n"
+"\n"
+" If you install this module, you will not have to run the regular procurement \n"
+" scheduler anymore (but you still need to run the minimum order point rule \n"
+" scheduler, or for example let it run daily.)\n"
+" All procurement orders will be processed immediately, which could in some\n"
+" cases entail a small performance impact.\n"
+"\n"
+" It may also increase your stock size because products are reserved as soon\n"
+" as possible and the scheduler time range is not taken into account anymore. \n"
+" In that case, you can not use priorities any more on the different picking.\n"
+" \n"
+" \n"
+" "
+msgstr ""
+
=== modified file 'mrp_operations/i18n/mrp_operations.pot'
--- mrp_operations/i18n/mrp_operations.pot 2010-12-03 15:55:33 +0000
+++ mrp_operations/i18n/mrp_operations.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:07+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:07+0000\n"
+"POT-Creation-Date: 2010-12-10 11:05:12+0000\n"
+"PO-Revision-Date: 2010-12-10 11:05:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -80,8 +80,9 @@
msgstr ""
#. module: mrp_operations
-#: view:mrp_operations.operation:0
-msgid "Production Operation"
+#: view:mrp.workorder:0
+#: field:mrp.workorder,product_qty:0
+msgid "Product Qty"
msgstr ""
#. module: mrp_operations
@@ -231,9 +232,8 @@
msgstr ""
#. module: mrp_operations
-#: view:mrp.workorder:0
-#: field:mrp.workorder,product_qty:0
-msgid "Product Qty"
+#: view:mrp_operations.operation:0
+msgid "Production Operation"
msgstr ""
#. module: mrp_operations
@@ -392,6 +392,35 @@
msgstr ""
#. module: mrp_operations
+#: model:ir.module.module,description:mrp_operations.module_meta_information
+msgid "\n"
+" This module adds state, date_start,date_stop in production order operation lines\n"
+" (in the \"Work Centers\" tab)\n"
+" State: draft, confirm, done, cancel\n"
+" When finishing/confirming,cancelling production orders set all state lines to the according state\n"
+" Create menus:\n"
+" Production Management > All Operations\n"
+" Production Management > All Operations > Operations To Do (state=\"confirm\")\n"
+" Which is a view on \"Work Centers\" lines in production order,\n"
+" editable tree\n"
+"\n"
+" Add buttons in the form view of production order under workcenter tab:\n"
+" * start (set state to confirm), set date_start\n"
+" * done (set state to done), set date_stop\n"
+" * set to draft (set state to draft)\n"
+" * cancel set state to cancel\n"
+"\n"
+" When the production order becomes \"ready to produce\", operations must\n"
+" become 'confirmed'. When the production order is done, all operations\n"
+" must become done.\n"
+"\n"
+" The field delay is the delay(stop date - start date).\n"
+" So that we can compare the theoretic delay and real delay.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: mrp_operations
#: selection:mrp.workorder,month:0
msgid "June"
msgstr ""
=== modified file 'mrp_repair/i18n/mrp_repair.pot'
--- mrp_repair/i18n/mrp_repair.pot 2010-12-03 15:55:33 +0000
+++ mrp_repair/i18n/mrp_repair.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:08+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:08+0000\n"
+"POT-Creation-Date: 2010-12-10 11:05:25+0000\n"
+"PO-Revision-Date: 2010-12-10 11:05:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -122,6 +122,19 @@
msgstr ""
#. module: mrp_repair
+#: model:ir.module.module,description:mrp_repair.module_meta_information
+msgid "\n"
+" The aim is to have a complete module to manage all products repairs. The following topics should be covered by this module:\n"
+" * Add/remove products in the reparation\n"
+" * Impact for stocks\n"
+" * Invoicing (products and/or services)\n"
+" * Warranty concept\n"
+" * Repair quotation report\n"
+" * Notes for the technician and for the final customer\n"
+""
+msgstr ""
+
+#. module: mrp_repair
#: field:mrp.repair,amount_tax:0
#: field:mrp.repair.fee,tax_id:0
#: field:mrp.repair.line,tax_id:0
=== modified file 'mrp_subproduct/i18n/mrp_subproduct.pot'
--- mrp_subproduct/i18n/mrp_subproduct.pot 2010-12-03 15:55:33 +0000
+++ mrp_subproduct/i18n/mrp_subproduct.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:08+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:08+0000\n"
+"POT-Creation-Date: 2010-12-10 11:05:39+0000\n"
+"PO-Revision-Date: 2010-12-10 11:05:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,19 +21,23 @@
msgstr ""
#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
#: sql_constraint:mrp.bom:0
-msgid "All product quantities must be greater than 0.\n"
-"You should install the mrp_subproduct module if you want to manage extra products on BoMs !"
-msgstr ""
-
-#. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "sub products"
-msgstr ""
-
-#. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_production
-msgid "Manufacturing Order"
+msgid "All product quantities must be greater than 0.You should install the mrp_subproduct module if you want to manage extra products on BoMs !"
msgstr ""
#. module: mrp_subproduct
@@ -42,8 +46,13 @@
msgstr ""
#. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
msgstr ""
#. module: mrp_subproduct
@@ -57,8 +66,15 @@
msgstr ""
#. module: mrp_subproduct
-#: field:mrp.subproduct,product_qty:0
-msgid "Product Qty"
+#: model:ir.module.module,description:mrp_subproduct.module_meta_information
+msgid "\n"
+"This module allows you to produce several products from one production order.\n"
+"You can configure sub-products in the bill of material.\n"
+"Without this module:\n"
+" A + B + C -> D\n"
+"With this module:\n"
+" A + B + C -> D + E\n"
+" "
msgstr ""
#. module: mrp_subproduct
@@ -77,13 +93,13 @@
msgstr ""
#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
msgstr ""
#. module: mrp_subproduct
-#: selection:mrp.subproduct,subproduct_type:0
-msgid "Variable"
+#: view:mrp.bom:0
+msgid "Sub Products"
msgstr ""
#. module: mrp_subproduct
@@ -92,11 +108,6 @@
msgstr ""
#. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
-msgstr ""
-
-#. module: mrp_subproduct
#: selection:mrp.subproduct,subproduct_type:0
msgid "Fixed"
msgstr ""
=== modified file 'multi_company/i18n/multi_company.pot'
--- multi_company/i18n/multi_company.pot 2010-12-03 15:55:33 +0000
+++ multi_company/i18n/multi_company.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:08+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:08+0000\n"
+"POT-Creation-Date: 2010-12-10 11:05:53+0000\n"
+"PO-Revision-Date: 2010-12-10 11:05:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -104,6 +104,14 @@
msgstr ""
#. module: multi_company
+#: model:ir.module.module,description:multi_company.module_meta_information
+msgid "\n"
+" Multicompany module is for managing a multicompany environment.\n"
+" This module is the base module for other multicompany modules.\n"
+" "
+msgstr ""
+
+#. module: multi_company
#: model:product.category,name:multi_company.Odoo1
msgid "Odoo Offers"
msgstr ""
=== modified file 'outlook/i18n/outlook.pot'
--- outlook/i18n/outlook.pot 2010-12-03 15:55:33 +0000
+++ outlook/i18n/outlook.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:09+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:09+0000\n"
+"POT-Creation-Date: 2010-12-10 11:06:31+0000\n"
+"PO-Revision-Date: 2010-12-10 11:06:31+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,8 +51,9 @@
msgstr ""
#. module: outlook
-#: field:outlook.installer,config_logo:0
-msgid "Image"
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
msgstr ""
#. module: outlook
@@ -61,8 +62,16 @@
msgstr ""
#. module: outlook
-#: model:ir.model,name:outlook.model_outlook_installer
-msgid "outlook.installer"
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid "\n"
+" This module provide the Outlook plug-in. \n"
+"\n"
+" Outlook plug-in allows you to select an object that you’d like to add\n"
+" to your email and its attachments from MS Outlook. You can select a partner, a task,\n"
+" a project, an analytical account, or any other object and Archived selected\n"
+" mail in mailgate.messages with attachments.\n"
+"\n"
+" "
msgstr ""
#. module: outlook
@@ -82,6 +91,11 @@
msgstr ""
#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
+#. module: outlook
#: view:outlook.installer:0
msgid "Skip"
msgstr ""
@@ -97,9 +111,8 @@
msgstr ""
#. module: outlook
-#: field:outlook.installer,doc_name:0
-#: field:outlook.installer,name:0
-msgid "File name"
+#: field:outlook.installer,config_logo:0
+msgid "Image"
msgstr ""
#. module: outlook
=== modified file 'pad/i18n/pad.pot'
--- pad/i18n/pad.pot 2010-12-03 15:55:33 +0000
+++ pad/i18n/pad.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:09+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:09+0000\n"
+"POT-Creation-Date: 2010-12-10 11:06:41+0000\n"
+"PO-Revision-Date: 2010-12-10 11:06:41+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -28,6 +28,11 @@
msgstr ""
#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr ""
+
+#. module: pad
#: model:ir.model,name:pad.model_res_company
msgid "Companies"
msgstr ""
@@ -38,8 +43,12 @@
msgstr ""
#. module: pad
-#: help:res.company,pad_index:0
-msgid "The root URL of the company's pad instance"
+#: model:ir.module.module,description:pad.module_meta_information
+msgid "\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client, lets the\n"
+"company customize which Pad installation should be used to link to new pads\n"
+"(by default, pad.openerp.com)\n"
+" "
msgstr ""
#. module: pad
=== modified file 'point_of_sale/i18n/point_of_sale.pot'
--- point_of_sale/i18n/point_of_sale.pot 2010-12-03 15:55:33 +0000
+++ point_of_sale/i18n/point_of_sale.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:11+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:11+0000\n"
+"POT-Creation-Date: 2010-12-10 11:06:58+0000\n"
+"PO-Revision-Date: 2010-12-10 11:06:58+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -191,6 +191,11 @@
msgstr ""
#. module: point_of_sale
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company!"
+msgstr ""
+
+#. module: point_of_sale
#: view:account.bank.statement:0
#: view:pos.order:0
#: field:pos.order,state:0
@@ -220,6 +225,11 @@
msgstr ""
#. module: point_of_sale
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company!"
+msgstr ""
+
+#. module: point_of_sale
#: report:pos.invoice:0
#: report:pos.payment.report:0
msgid "Disc.(%)"
@@ -318,13 +328,6 @@
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
-#, python-format
-msgid "You can not open a Cashbox for \"%s\".\n"
-"Please close its related cash register."
-msgstr ""
-
-#. module: point_of_sale
#: help:pos.order,user_salesman_id:0
msgid "User who is logged into the system."
msgstr ""
@@ -538,6 +541,12 @@
msgstr ""
#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#, python-format
+msgid "The maximum value you can still withdraw is exceeded.Remaining value is equal to %d "
+msgstr ""
+
+#. module: point_of_sale
#: code:addons/point_of_sale/wizard/pos_close_statement.py:0
#, python-format
msgid "Cash registers are already closed."
@@ -831,6 +840,12 @@
msgstr ""
#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:0
+#, python-format
+msgid "Couldn't find a pricelist line matching this product and quantity.You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: point_of_sale
#: field:account.bank.statement.line,pos_statement_id:0
#: field:pos.order,amount_return:0
msgid "unknown"
@@ -880,6 +895,12 @@
msgstr ""
#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
+#, python-format
+msgid "You can not open a Cashbox for \"%s\".Please close its related cash register."
+msgstr ""
+
+#. module: point_of_sale
#: field:pos.details,date_end:0
#: field:pos.sale.user,date_end:0
msgid "Date End"
@@ -1032,11 +1053,6 @@
msgstr ""
#. module: point_of_sale
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
-msgstr ""
-
-#. module: point_of_sale
#: report:pos.invoice:0
msgid "Supplier Refund"
msgstr ""
@@ -1166,6 +1182,20 @@
msgstr ""
#. module: point_of_sale
+#: model:ir.module.module,description:point_of_sale.module_meta_information
+msgid "\n"
+"Main features :\n"
+" - Fast encoding of the sale.\n"
+" - Allow to choose one payment mode (the quick way) or to split the payment between several payment mode.\n"
+" - Computation of the amount of money to return.\n"
+" - Create and confirm picking list automatically.\n"
+" - Allow the user to create invoice automatically.\n"
+" - Allow to refund former sales.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: point_of_sale
#: field:pos.order,price_type:0
msgid "Price method"
msgstr ""
@@ -1209,7 +1239,6 @@
#: code:addons/point_of_sale/point_of_sale.py:0
#: code:addons/point_of_sale/report/pos_invoice.py:0
#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
#, python-format
msgid "Error !"
msgstr ""
@@ -1566,8 +1595,9 @@
msgstr ""
#. module: point_of_sale
-#: view:product.product:0
-msgid "Product Description"
+#: selection:report.cash.register,month:0
+#: selection:report.pos.order,month:0
+msgid "May"
msgstr ""
#. module: point_of_sale
@@ -1686,6 +1716,7 @@
msgstr ""
#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:0
#: code:addons/point_of_sale/wizard/pos_discount.py:0
#: code:addons/point_of_sale/wizard/pos_payment.py:0
#, python-format
@@ -1850,11 +1881,6 @@
msgstr ""
#. module: point_of_sale
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
msgid "Configuration"
msgstr ""
@@ -2164,9 +2190,8 @@
msgstr ""
#. module: point_of_sale
-#: selection:report.cash.register,month:0
-#: selection:report.pos.order,month:0
-msgid "May"
+#: view:product.product:0
+msgid "Product Description"
msgstr ""
#. module: point_of_sale
@@ -2229,13 +2254,6 @@
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
-#, python-format
-msgid "The maximum value you can still withdraw is exceeded. \n"
-" Remaining value is equal to %d "
-msgstr ""
-
-#. module: point_of_sale
#: field:pos.order,remboursed:0
msgid "Remboursed"
msgstr ""
=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py 2010-11-23 05:20:24 +0000
+++ point_of_sale/point_of_sale.py 2010-12-11 04:13:59 +0000
@@ -1055,9 +1055,7 @@
unit_price=price or p_obj.list_price
if unit_price is False:
raise osv.except_osv(_('No valid pricelist line found !'),
- _("Couldn't find a pricelist line matching this product" \
- " and quantity.\nYou have to change either the product," \
- " the quantity or the pricelist."))
+ _("Couldn't find a pricelist line matching this product and quantity.You have to change either the product, the quantity or the pricelist."))
return unit_price
def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
=== modified file 'point_of_sale/wizard/pos_box_out.py'
--- point_of_sale/wizard/pos_box_out.py 2010-10-29 13:06:59 +0000
+++ point_of_sale/wizard/pos_box_out.py 2010-12-11 04:13:59 +0000
@@ -92,13 +92,13 @@
am += s.amount
if (-data['amount'] or 0.0) + am < -(res_obj.browse(cr, uid, uid, context=context).company_id.max_diff or 0.0) and amount_check:
val = (res_obj.browse(cr, uid, uid).company_id.max_diff or 0.0) + am
- raise osv.except_osv(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %d ')%(val))
+ raise osv.except_osv(_('Error!'), _('The maximum value you can still withdraw is exceeded.Remaining value is equal to %d ')%(val))
acc_id = product_obj.browse(cr, uid, data['product_id'], context=context).property_account_income
if not acc_id:
- raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr, uid, data['product_id'], context=context).name))
+ raise osv.except_osv(_('Error!'), _('please check that account is set to %s')%(product_obj.browse(cr, uid, data['product_id'], context=context).name))
if not statement_id:
- raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
+ raise osv.except_osv(_('Error!'), _('You have to open at least one cashbox'))
if statement_id:
statement_id = statement_id[0]
if not statement_id:
=== modified file 'point_of_sale/wizard/pos_open_statement.py'
--- point_of_sale/wizard/pos_open_statement.py 2010-11-19 12:20:03 +0000
+++ point_of_sale/wizard/pos_open_statement.py 2010-12-11 04:13:59 +0000
@@ -49,7 +49,7 @@
for journal in journal_obj.browse(cr, uid, journal_ids, context=context):
ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context)
if len(ids):
- raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".\nPlease close its related cash register.') %(journal.name))
+ raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".Please close its related cash register.') %(journal.name))
number = ''
if journal.sequence_id:
=== modified file 'process/i18n/process.pot'
--- process/i18n/process.pot 2010-12-03 15:55:33 +0000
+++ process/i18n/process.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:12+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:12+0000\n"
+"POT-Creation-Date: 2010-12-10 12:20:01+0000\n"
+"PO-Revision-Date: 2010-12-10 12:20:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -216,6 +216,19 @@
msgstr ""
#. module: process
+#: model:ir.module.module,description:process.module_meta_information
+msgid "\n"
+" This module shows the basic processes involved\n"
+" in the selected modules and in the sequence they\n"
+" occur\n"
+"\n"
+" Note: This applies to the modules containing modulename_process_xml\n"
+" for e.g product/process/product_process_xml\n"
+"\n"
+" "
+msgstr ""
+
+#. module: process
#: field:process.condition,model_states:0
msgid "Expression"
msgstr ""
=== modified file 'procurement/company.py'
--- procurement/company.py 2010-08-13 12:20:05 +0000
+++ procurement/company.py 2010-12-11 04:13:59 +0000
@@ -25,9 +25,7 @@
_inherit = 'res.company'
_columns = {
'schedule_range': fields.float('Scheduler Range Days', required=True,
- help="This is the time frame analysed by the scheduler when "\
- "computing procurements. All procurements that are not between "\
- "today and today+range are skipped for futur computation."),
+ help="This is the time frame analysed by the scheduler when computing procurements. All procurements that are not between today and today+range are skipped for future computation."),
}
_defaults = {
'schedule_range': 80.0,
=== modified file 'procurement/i18n/procurement.pot'
--- procurement/i18n/procurement.pot 2010-12-03 15:55:33 +0000
+++ procurement/i18n/procurement.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:13+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:13+0000\n"
+"POT-Creation-Date: 2010-12-10 12:20:14+0000\n"
+"PO-Revision-Date: 2010-12-10 12:20:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -186,12 +186,6 @@
msgstr ""
#. module: procurement
-#: help:procurement.order,origin:0
-msgid "Reference of the document that created this Procurement.\n"
-"This is automatically completed by OpenERP."
-msgstr ""
-
-#. module: procurement
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
msgstr ""
@@ -374,6 +368,13 @@
msgstr ""
#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid "\n"
+" This is the module for computing Procurements.\n"
+" "
+msgstr ""
+
+#. module: procurement
#: field:stock.warehouse.orderpoint,product_min_qty:0
msgid "Min Quantity"
msgstr ""
@@ -446,11 +447,6 @@
msgstr ""
#. module: procurement
-#: help:res.company,schedule_range:0
-msgid "This is the time frame analysed by the scheduler when computing procurements. All procurements that are not between today and today+range are skipped for futur computation."
-msgstr ""
-
-#. module: procurement
#: selection:procurement.order,priority:0
msgid "Normal"
msgstr ""
@@ -624,6 +620,11 @@
msgstr ""
#. module: procurement
+#: help:procurement.order,origin:0
+msgid "Reference of the document that created this Procurement.This is automatically completed by OpenERP."
+msgstr ""
+
+#. module: procurement
#: model:ir.model,name:procurement.model_procurement_order_compute_all
msgid "Compute all schedulers"
msgstr ""
@@ -795,6 +796,11 @@
msgstr ""
#. module: procurement
+#: help:res.company,schedule_range:0
+msgid "This is the time frame analysed by the scheduler when computing procurements. All procurements that are not between today and today+range are skipped for future computation."
+msgstr ""
+
+#. module: procurement
#: selection:procurement.order,priority:0
msgid "Very Urgent"
msgstr ""
=== modified file 'procurement/procurement.py'
--- procurement/procurement.py 2010-11-26 16:13:59 +0000
+++ procurement/procurement.py 2010-12-11 04:13:59 +0000
@@ -85,8 +85,7 @@
_columns = {
'name': fields.char('Reason', size=64, required=True, help='Procurement name.'),
'origin': fields.char('Source Document', size=64,
- help="Reference of the document that created this Procurement.\n"
- "This is automatically completed by OpenERP."),
+ help="Reference of the document that created this Procurement.This is automatically completed by OpenERP."),
'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
'date_planned': fields.datetime('Scheduled date', required=True),
'date_close': fields.datetime('Date Closed'),
@@ -99,8 +98,7 @@
'close_move': fields.boolean('Close Move at end', required=True),
'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft':[('readonly',False)]}, readonly=True),
'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
- readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
- " a make to order method."),
+ readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use a make to order method."),
'note': fields.text('Note'),
'message': fields.char('Latest error', size=64, help="Exception occurred while computing procurement orders."),
=== modified file 'product/i18n/product.pot'
--- product/i18n/product.pot 2010-12-03 15:55:33 +0000
+++ product/i18n/product.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:15+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:15+0000\n"
+"POT-Creation-Date: 2010-12-10 12:20:28+0000\n"
+"PO-Revision-Date: 2010-12-10 12:20:28+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,11 @@
msgstr ""
#. module: product
+#: help:product.pricelist.item,price_round:0
+msgid "Sets the price so that it is a multiple of this value.Rounding is applied after the discount and before the surcharge.To have prices that end in 9.99, set rounding 10, surcharge -0.01"
+msgstr ""
+
+#. module: product
#: model:product.category,name:product.cat1
msgid "Sellable"
msgstr ""
@@ -133,6 +138,12 @@
msgstr ""
#. module: product
+#: code:addons/product/pricelist.py:0
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: product
#: model:product.template,name:product.product_product_24_product_template
msgid "Keyboard"
msgstr ""
@@ -471,13 +482,6 @@
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:0
-#, python-format
-msgid "No active version for the selected pricelist !\n"
-"Please create or activate one."
-msgstr ""
-
-#. module: product
#: model:ir.model,name:product.model_product_uom_categ
msgid "Product uom categ"
msgstr ""
@@ -609,6 +613,12 @@
msgstr ""
#. module: product
+#: code:addons/product/pricelist.py:0
+#, python-format
+msgid "No active version for the selected pricelist! Please create or activate one."
+msgstr ""
+
+#. module: product
#: model:ir.actions.act_window,name:product.action_product_price_list
#: model:ir.model,name:product.model_product_price_list
#: view:product.price_list:0
@@ -654,8 +664,8 @@
msgstr ""
#. module: product
-#: model:process.transition,name:product.process_transition_supplierofproduct0
-msgid "Supplier of the product"
+#: model:product.template,name:product.product_product_25_product_template
+msgid "Mouse"
msgstr ""
#. module: product
@@ -1060,6 +1070,28 @@
msgstr ""
#. module: product
+#: model:ir.module.module,description:product.module_meta_information
+msgid "\n"
+" This is the base module for managing products and pricelists in OpenERP.\n"
+"\n"
+" Products support variants, different pricing methods, suppliers\n"
+" information, make to stock/order, different unit of measures,\n"
+" packaging and properties.\n"
+"\n"
+" Pricelists support:\n"
+" * Multiple-level of discount (by product, category, quantities)\n"
+" * Compute price based on different criteria:\n"
+" * Other pricelist,\n"
+" * Cost price,\n"
+" * List price,\n"
+" * Supplier price, ...\n"
+" Pricelists preferences by product and/or partners.\n"
+"\n"
+" Print product labels with barcode.\n"
+" "
+msgstr ""
+
+#. module: product
#: help:product.template,seller_delay:0
msgid "This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."
msgstr ""
@@ -1117,11 +1149,6 @@
msgstr ""
#. module: product
-#: sql_constraint:res.users:0
-msgid "You can not have two users with the same login !"
-msgstr ""
-
-#. module: product
#: help:product.template,sale_delay:0
msgid "This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."
msgstr ""
@@ -1765,8 +1792,8 @@
msgstr ""
#. module: product
-#: model:product.template,name:product.product_product_25_product_template
-msgid "Mouse"
+#: model:process.transition,name:product.process_transition_supplierofproduct0
+msgid "Supplier of the product"
msgstr ""
#. module: product
@@ -1899,10 +1926,8 @@
msgstr ""
#. module: product
-#: help:product.pricelist.item,price_round:0
-msgid "Sets the price so that it is a multiple of this value.\n"
-"Rounding is applied after the discount and before the surcharge.\n"
-"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
msgstr ""
#. module: product
=== modified file 'product/pricelist.py'
--- product/pricelist.py 2010-11-26 16:13:59 +0000
+++ product/pricelist.py 2010-12-11 04:13:59 +0000
@@ -184,8 +184,8 @@
plversion_ids = product_pricelist_version_obj.search(cr, uid, plversions_search_args)
if len(pricelist_version_ids) != len(plversion_ids):
- msg = "At least one pricelist has no active version !\nPlease create or activate one."
- raise osv.except_osv(_('Warning !'), _(msg))
+ msg = "At least one pricelist has no active version! Please create or activate one."
+ raise osv.except_osv(_('Warning!'), _(msg))
# product.product:
product_ids = [i[0] for i in products_by_qty_by_partner]
@@ -331,9 +331,8 @@
plversion = cr.dictfetchone()
if not plversion:
- raise osv.except_osv(_('Warning !'),
- _('No active version for the selected pricelist !\n' \
- 'Please create or activate one.'))
+ raise osv.except_osv(_('Warning!'),
+ _('No active version for the selected pricelist! Please create or activate one.'))
cr.execute('SELECT id, categ_id ' \
'FROM product_template ' \
@@ -449,9 +448,7 @@
required=True, select=True, ondelete='cascade'),
'name': fields.char('Name', size=64, required=True, translate=True),
'active': fields.boolean('Active',
- help="When a version is duplicated it is set to non active, so that the " \
- "dates do not overlaps with original version. You should change the dates " \
- "and reactivate the pricelist"),
+ help="When a version is duplicated it is set to non active, so that the dates do not overlaps with original version. You should change the dates and reactivate the pricelist"),
'items_id': fields.one2many('product.pricelist.item',
'price_version_id', 'Price List Items', required=True),
'date_start': fields.date('Start Date', help="Starting date for this pricelist version to be valid."),
@@ -546,10 +543,7 @@
'price_discount': fields.float('Price Discount', digits=(16,4)),
'price_round': fields.float('Price Rounding',
digits_compute= dp.get_precision('Sale Price'),
- help="Sets the price so that it is a multiple of this value.\n" \
- "Rounding is applied after the discount and before the surcharge.\n" \
- "To have prices that end in 9.99, set rounding 10, surcharge -0.01" \
- ),
+ help="Sets the price so that it is a multiple of this value.Rounding is applied after the discount and before the surcharge.To have prices that end in 9.99, set rounding 10, surcharge -0.01"),
'price_min_margin': fields.float('Min. Price Margin',
digits_compute= dp.get_precision('Sale Price')),
'price_max_margin': fields.float('Max. Price Margin',
=== modified file 'product_expiry/i18n/product_expiry.pot'
--- product_expiry/i18n/product_expiry.pot 2010-12-03 15:55:33 +0000
+++ product_expiry/i18n/product_expiry.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:16+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:16+0000\n"
+"POT-Creation-Date: 2010-12-10 12:20:39+0000\n"
+"PO-Revision-Date: 2010-12-10 12:20:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -46,16 +46,16 @@
msgstr ""
#. module: product_expiry
+#: sql_constraint:stock.production.lot:0
+msgid "The combination of serial number and internal reference must be unique!"
+msgstr ""
+
+#. module: product_expiry
#: field:product.product,use_time:0
msgid "Product Use Time"
msgstr ""
#. module: product_expiry
-#: sql_constraint:stock.production.lot:0
-msgid "The combination of serial number and internal reference must be unique !"
-msgstr ""
-
-#. module: product_expiry
#: help:stock.production.lot,removal_date:0
msgid "The date on which the lot should be removed."
msgstr ""
@@ -133,6 +133,11 @@
msgstr ""
#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr ""
+
+#. module: product_expiry
#: help:product.product,use_time:0
msgid "The number of days before a production lot starts deteriorating without becoming dangerous."
msgstr ""
=== modified file 'product_manufacturer/i18n/product_manufacturer.pot'
--- product_manufacturer/i18n/product_manufacturer.pot 2010-12-03 15:55:33 +0000
+++ product_manufacturer/i18n/product_manufacturer.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:16+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:16+0000\n"
+"POT-Creation-Date: 2010-12-10 12:21:09+0000\n"
+"PO-Revision-Date: 2010-12-10 12:21:09+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@
"Plural-Forms: \n"
#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+
+#. module: product_manufacturer
#: field:product.product,manufacturer_pref:0
msgid "Manufacturer Product Code"
msgstr ""
=== modified file 'product_margin/i18n/product_margin.pot'
--- product_margin/i18n/product_margin.pot 2010-12-03 15:55:33 +0000
+++ product_margin/i18n/product_margin.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:16+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:16+0000\n"
+"POT-Creation-Date: 2010-12-10 12:21:34+0000\n"
+"PO-Revision-Date: 2010-12-10 12:21:34+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -95,21 +95,25 @@
msgstr ""
#. module: product_margin
+#: model:ir.module.module,description:product_margin.module_meta_information
+msgid "\n"
+"Adds a reporting menu in products that computes sales, purchases, margins\n"
+"and other interesting indicators based on invoices. The wizard to launch\n"
+"the report has several options to help you get the data you need.\n"
+""
+msgstr ""
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Standard Price"
+msgstr ""
+
+#. module: product_margin
#: field:product.product,sale_expected:0
msgid "Expected Sale"
msgstr ""
#. module: product_margin
-#: view:product.product:0
-msgid "Standard Price"
-msgstr ""
-
-#. module: product_margin
-#: help:product.product,purchase_num_invoiced:0
-msgid "Sum of Quantity in Supplier Invoices"
-msgstr ""
-
-#. module: product_margin
#: help:product.product,normal_cost:0
msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
msgstr ""
@@ -120,9 +124,8 @@
msgstr ""
#. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
msgstr ""
#. module: product_margin
@@ -199,6 +202,11 @@
msgstr ""
#. module: product_margin
+#: help:product.product,purchase_num_invoiced:0
+msgid "Sum of Quantity in Supplier Invoices"
+msgstr ""
+
+#. module: product_margin
#: view:product.margin:0
msgid "Properties categories"
msgstr ""
@@ -209,8 +217,9 @@
msgstr ""
#. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: field:product.product,purchase_num_invoiced:0
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced"
msgstr ""
#. module: product_margin
=== modified file 'product_visible_discount/i18n/product_visible_discount.pot'
--- product_visible_discount/i18n/product_visible_discount.pot 2010-12-03 15:55:33 +0000
+++ product_visible_discount/i18n/product_visible_discount.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:17+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:17+0000\n"
+"POT-Creation-Date: 2010-12-10 12:22:15+0000\n"
+"PO-Revision-Date: 2010-12-10 12:22:15+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -28,6 +28,18 @@
msgstr ""
#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_meta_information
+msgid "\n"
+" This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.\n"
+" To this end, a new check box named \"Visible Discount\" is added to the pricelist form.\n"
+" Example:\n"
+" For the product PC1 and the partner \"Asustek\": if listprice=450, and the price calculated using Asustek's pricelist is 225\n"
+" If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225\n"
+" If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+" "
+msgstr ""
+
+#. module: product_visible_discount
#: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
#: field:product.pricelist,visible_discount:0
msgid "Visible Discount"
=== modified file 'profile_tools/i18n/profile_tools.pot'
--- profile_tools/i18n/profile_tools.pot 2010-12-03 15:55:33 +0000
+++ profile_tools/i18n/profile_tools.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:17+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:17+0000\n"
+"POT-Creation-Date: 2010-12-10 12:22:33+0000\n"
+"PO-Revision-Date: 2010-12-10 12:22:33+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,11 @@
msgstr ""
#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "title"
+msgstr ""
+
+#. module: profile_tools
#: help:misc_tools.installer,share:0
msgid "Allows you to give restricted access to your OpenERP documents to external users, such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc."
msgstr ""
@@ -46,13 +51,13 @@
msgstr ""
#. module: profile_tools
-#: field:misc_tools.installer,config_logo:0
-msgid "Image"
+#: help:misc_tools.installer,lunch:0
+msgid "A simple module to help you to manage Lunch orders."
msgstr ""
#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "title"
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
msgstr ""
#. module: profile_tools
@@ -91,8 +96,8 @@
msgstr ""
#. module: profile_tools
-#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
-msgid "Miscellaneous Tools"
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
msgstr ""
#. module: profile_tools
=== modified file 'project/company.py'
--- project/company.py 2010-10-17 23:33:01 +0000
+++ project/company.py 2010-12-11 04:13:59 +0000
@@ -26,10 +26,7 @@
_inherit = 'res.company'
_columns = {
'project_time_mode_id': fields.many2one('product.uom', 'Project Time Unit',
- help='This will set the unit of measure used in projects and tasks.\n' \
-"If you use the timesheet linked to projects (project_timesheet module), don't " \
-"forget to setup the right unit of measure in your employees.",
- ),
+ help="This will set the unit of measure used in projects and tasks.If you use the timesheet linked to projects (project_timesheet module), don\'t forget to setup the right unit of measure in your employees."),
}
res_company()
=== modified file 'project/i18n/project.pot'
--- project/i18n/project.pot 2010-12-09 11:52:11 +0000
+++ project/i18n/project.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:18+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:18+0000\n"
+"POT-Creation-Date: 2010-12-10 12:22:48+0000\n"
+"PO-Revision-Date: 2010-12-10 12:22:48+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -42,6 +42,11 @@
msgstr ""
#. module: project
+#: view:project.task.close:0
+msgid "_Send"
+msgstr ""
+
+#. module: project
#: view:project.task:0
msgid "Deadlines"
msgstr ""
@@ -399,11 +404,6 @@
msgstr ""
#. module: project
-#: field:project.task,work_ids:0
-msgid "Work done"
-msgstr ""
-
-#. module: project
#: code:addons/project/project.py:0
#, python-format
msgid "Task '%s' closed"
@@ -716,6 +716,11 @@
msgstr ""
#. module: project
+#: view:report.project.task.user:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: project
#: view:project.vs.hours:0
msgid "Project vs Planned and Total Hours"
msgstr ""
@@ -819,6 +824,11 @@
msgstr ""
#. module: project
+#: field:project.task.delegate,prefix:0
+msgid "Your Task Title"
+msgstr ""
+
+#. module: project
#: view:project.project:0
msgid "Parent"
msgstr ""
@@ -914,8 +924,8 @@
msgstr ""
#. module: project
-#: field:project.project,warn_customer:0
-msgid "Warn Partner"
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid "A project contains a set of tasks or issues that will be performed by your assigned personnel. A project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure with different phases spread over the project's duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on. If you have personalized your Project application in order to invoice the time spent on a task, you can choose to invoice or not one project in the billing section."
msgstr ""
#. module: project
@@ -1047,6 +1057,11 @@
msgstr ""
#. module: project
+#: field:project.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project
#: selection:report.project.task.user,month:0
msgid "June"
msgstr ""
@@ -1156,12 +1171,6 @@
msgstr ""
#. module: project
-#: help:res.company,project_time_mode_id:0
-msgid "This will set the unit of measure used in projects and tasks.\n"
-"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 ""
-
-#. module: project
#: code:addons/project/wizard/project_task_close.py:0
#, python-format
msgid "Error"
@@ -1429,11 +1438,6 @@
msgstr ""
#. module: project
-#: model:ir.actions.act_window,help:project.open_view_project_all
-msgid "A project contains a set of tasks or issues that will be performed by your assigned personnel. A project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure with different phases spread over the project's duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on. If you have personalized your Project application in order to invoice the time spent on a task, you can choose to invoice or not one project in the billing section."
-msgstr ""
-
-#. module: project
#: view:board.board:0
msgid "My Remaining Hours by Project"
msgstr ""
@@ -1448,8 +1452,8 @@
msgstr ""
#. module: project
-#: field:project.task.delegate,prefix:0
-msgid "Your Task Title"
+#: field:project.task,work_ids:0
+msgid "Work done"
msgstr ""
#. module: project
@@ -1464,6 +1468,14 @@
msgstr ""
#. module: project
+#: field:project.task,total_hours:0
+#: field:project.vs.hours,total_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project
#: view:project.task.delegate:0
msgid "Validation Task"
msgstr ""
@@ -1634,11 +1646,8 @@
msgstr ""
#. module: project
-#: field:project.task,total_hours:0
-#: field:project.vs.hours,total_hours:0
-#: view:report.project.task.user:0
-#: field:report.project.task.user,total_hours:0
-msgid "Total Hours"
+#: help:res.company,project_time_mode_id:0
+msgid "This will set the unit of measure used in projects and tasks.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 ""
#. module: project
@@ -1715,11 +1724,6 @@
msgstr ""
#. module: project
-#: view:project.task.close:0
-msgid "_Send"
-msgstr ""
-
-#. module: project
#: field:project.task.work,name:0
msgid "Work summary"
msgstr ""
=== modified file 'project_caldav/i18n/project_caldav.pot'
--- project_caldav/i18n/project_caldav.pot 2010-12-03 15:55:33 +0000
+++ project_caldav/i18n/project_caldav.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:19+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:19+0000\n"
+"POT-Creation-Date: 2010-12-10 12:23:08+0000\n"
+"PO-Revision-Date: 2010-12-10 12:23:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -324,6 +324,11 @@
msgstr ""
#. module: project_caldav
+#: model:ir.module.module,description:project_caldav.module_meta_information
+msgid " Synchronize between Project task and Caldav Vtodo."
+msgstr ""
+
+#. module: project_caldav
#: view:project.task:0
msgid "Assignees Detail"
msgstr ""
=== modified file 'project_gtd/i18n/project_gtd.pot'
--- project_gtd/i18n/project_gtd.pot 2010-12-03 15:55:33 +0000
+++ project_gtd/i18n/project_gtd.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:19+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:19+0000\n"
+"POT-Creation-Date: 2010-12-10 12:24:20+0000\n"
+"PO-Revision-Date: 2010-12-10 12:24:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -164,6 +164,23 @@
msgstr ""
#. module: project_gtd
+#: model:ir.module.module,description:project_gtd.module_meta_information
+msgid "\n"
+"This module implements all concepts defined by the Getting Things Done\n"
+"methodology. This world-wide used methodology is used for personal\n"
+"time management improvement.\n"
+"\n"
+"Getting Things Done (commonly abbreviated as GTD) is an action management\n"
+"method created by David Allen, and described in a book of the same name.\n"
+"\n"
+"GTD rests on the principle that a person needs to move tasks out of the mind by\n"
+"recording them externally. That way, the mind is freed from the job of\n"
+"remembering everything that needs to be done, and can concentrate on actually\n"
+"performing those tasks.\n"
+" "
+msgstr ""
+
+#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
#: view:project.timebox.fill.plan:0
msgid "Plannify Timebox"
=== modified file 'project_issue/i18n/project_issue.pot'
--- project_issue/i18n/project_issue.pot 2010-12-03 15:55:33 +0000
+++ project_issue/i18n/project_issue.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:20+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:20+0000\n"
+"POT-Creation-Date: 2010-12-10 12:24:37+0000\n"
+"PO-Revision-Date: 2010-12-10 12:24:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -84,13 +84,6 @@
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
-#, python-format
-msgid "You cannot escalate this issue.\n"
-"The relevant Project has not configured the Escalation Project!"
-msgstr ""
-
-#. module: project_issue
#: constraint:project.project:0
msgid "Error! You cannot assign escalation to the same project!"
msgstr ""
@@ -471,6 +464,13 @@
msgstr ""
#. module: project_issue
+#: model:ir.module.module,description:project_issue.module_meta_information
+msgid "\n"
+" This module provide Issues/Bugs Management in Project\n"
+" "
+msgstr ""
+
+#. module: project_issue
#: view:project.issue:0
#: field:project.issue,categ_id:0
#: view:project.issue.report:0
@@ -711,6 +711,12 @@
msgstr ""
#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "You cannot escalate this issue.The relevant Project has not configured the Escalation Project!"
+msgstr ""
+
+#. module: project_issue
#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
#: model:ir.model,name:project_issue.model_project_issue
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py 2010-10-17 17:30:00 +0000
+++ project_issue/project_issue.py 2010-12-11 04:13:59 +0000
@@ -365,7 +365,7 @@
if case.task_id:
self.pool.get('project.task').write(cr, uid, [case.task_id.id], {'project_id': data['project_id'], 'user_id': False})
else:
- raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!'))
+ raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.The relevant Project has not configured the Escalation Project!'))
self.write(cr, uid, [case.id], data)
self._history(cr, uid, cases, _('Escalate'))
return True
=== modified file 'project_issue_sheet/i18n/project_issue_sheet.pot'
--- project_issue_sheet/i18n/project_issue_sheet.pot 2010-12-03 15:55:33 +0000
+++ project_issue_sheet/i18n/project_issue_sheet.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:20+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:20+0000\n"
+"POT-Creation-Date: 2010-12-10 12:25:09+0000\n"
+"PO-Revision-Date: 2010-12-10 12:25:09+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,13 @@
"Plural-Forms: \n"
#. module: project_issue_sheet
+#: model:ir.module.module,description:project_issue_sheet.module_meta_information
+msgid "\n"
+" This module adds the Timesheet support for the Issues/Bugs Management in Project\n"
+" "
+msgstr ""
+
+#. module: project_issue_sheet
#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
msgid "Analytic Line"
msgstr ""
=== modified file 'project_long_term/i18n/project_long_term.pot'
--- project_long_term/i18n/project_long_term.pot 2010-12-09 11:52:11 +0000
+++ project_long_term/i18n/project_long_term.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:21+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:21+0000\n"
+"POT-Creation-Date: 2010-12-10 12:27:03+0000\n"
+"PO-Revision-Date: 2010-12-10 12:27:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,21 @@
msgstr ""
#. module: project_long_term
+#: model:ir.module.module,description:project_long_term.module_meta_information
+msgid "\n"
+"Long Term Project management module that tracks planning, scheduling, resources allocation.\n"
+"Features.\n"
+" - Manage Big project.\n"
+" - Define various Phases of Project.\n"
+" - Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given.\n"
+" If no project given then all the draft,open and pending state phases will be taken\n"
+" - Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks\n"
+" - Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date\n"
+"\n"
+" "
+msgstr ""
+
+#. module: project_long_term
#: view:project.phase:0
#: field:project.phase,next_phase_ids:0
msgid "Next Phases"
@@ -224,6 +239,7 @@
msgstr ""
#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_resource
#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
#: model:ir.ui.menu,name:project_long_term.menu_view_resource
#: view:project.resource.allocation:0
@@ -427,6 +443,7 @@
msgstr ""
#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
#: field:project.project,resource_calendar_id:0
msgid "Working Time"
msgstr ""
@@ -499,11 +516,6 @@
msgstr ""
#. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Time"
-msgstr ""
-
-#. module: project_long_term
#: model:ir.model,name:project_long_term.model_resource_resource
msgid "Resource Detail"
msgstr ""
=== modified file 'project_mailgate/i18n/project_mailgate.pot'
--- project_mailgate/i18n/project_mailgate.pot 2010-12-03 15:55:33 +0000
+++ project_mailgate/i18n/project_mailgate.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:21+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:21+0000\n"
+"POT-Creation-Date: 2010-12-10 12:27:26+0000\n"
+"PO-Revision-Date: 2010-12-10 12:27:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -35,6 +35,11 @@
msgstr ""
#. module: project_mailgate
+#: view:project.task:0
+msgid "Attachments"
+msgstr ""
+
+#. module: project_mailgate
#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
msgid "Project MailGateWay"
msgstr ""
=== modified file 'project_messages/i18n/project_messages.pot'
--- project_messages/i18n/project_messages.pot 2010-12-03 15:55:33 +0000
+++ project_messages/i18n/project_messages.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:22+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:22+0000\n"
+"POT-Creation-Date: 2010-12-10 12:28:18+0000\n"
+"PO-Revision-Date: 2010-12-10 12:28:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,6 +41,11 @@
msgstr ""
#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr ""
+
+#. module: project_messages
#: model:ir.actions.act_window,help:project_messages.messages_form
msgid "An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis."
msgstr ""
@@ -67,8 +72,12 @@
msgstr ""
#. module: project_messages
-#: view:project.messages:0
-msgid "Today"
+#: model:ir.module.module,description:project_messages.module_meta_information
+msgid "\n"
+" This module provides the functionality to send messages within a project.\n"
+" A user can send messages individually to other user. He can even broadcast\n"
+" it to all the users.\n"
+" "
msgstr ""
#. module: project_messages
=== modified file 'project_mrp/i18n/project_mrp.pot'
--- project_mrp/i18n/project_mrp.pot 2010-12-03 15:55:33 +0000
+++ project_mrp/i18n/project_mrp.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:22+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:22+0000\n"
+"POT-Creation-Date: 2010-12-10 12:28:37+0000\n"
+"PO-Revision-Date: 2010-12-10 12:28:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,11 +26,8 @@
msgstr ""
#. module: project_mrp
-#: model:ir.model,name:project_mrp.model_project_task
-#: model:process.node,name:project_mrp.process_node_mrptask0
-#: model:process.node,name:project_mrp.process_node_procuretasktask0
-#: field:procurement.order,task_id:0
-msgid "Task"
+#: model:ir.module.module,shortdesc:project_mrp.module_meta_information
+msgid "Procurement and Project Management integration"
msgstr ""
#. module: project_mrp
@@ -70,8 +67,11 @@
msgstr ""
#. module: project_mrp
-#: model:process.transition,note:project_mrp.process_transition_ordertask0
-msgid "If procurement method is Make to order and supply method is produce"
+#: model:ir.model,name:project_mrp.model_project_task
+#: model:process.node,name:project_mrp.process_node_mrptask0
+#: model:process.node,name:project_mrp.process_node_procuretasktask0
+#: field:procurement.order,task_id:0
+msgid "Task"
msgstr ""
#. module: project_mrp
@@ -95,8 +95,33 @@
msgstr ""
#. module: project_mrp
-#: model:ir.module.module,shortdesc:project_mrp.module_meta_information
-msgid "Procurement and Project Management integration"
+#: model:ir.module.module,description:project_mrp.module_meta_information
+msgid "\n"
+"This module creates a link between procurement orders\n"
+"containing \"service\" lines and project management tasks.\n"
+"\n"
+"When installed, this module will automatically create a new task\n"
+"for each procurement order line, when the corresponding product\n"
+"meets the following characteristics:\n"
+" * Type = Service\n"
+" * Procurement method (Order fulfillment) = MTO (make to order)\n"
+" * Supply/Procurement method = Produce\n"
+"\n"
+"The new task is created outside of any existing project, but\n"
+"can be added to a project manually.\n"
+"\n"
+"When the project task is completed or cancelled, the workflow of the corresponding\n"
+"procurement line is updated accordingly.\n"
+"\n"
+"This module is useful to be able to invoice services based on tasks\n"
+"automatically created via sale orders.\n"
+"\n"
+""
+msgstr ""
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_ordertask0
+msgid "If procurement method is Make to order and supply method is produce"
msgstr ""
#. module: project_mrp
=== modified file 'project_planning/i18n/project_planning.pot'
--- project_planning/i18n/project_planning.pot 2010-12-03 15:55:33 +0000
+++ project_planning/i18n/project_planning.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:23+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:23+0000\n"
+"POT-Creation-Date: 2010-12-10 12:29:22+0000\n"
+"PO-Revision-Date: 2010-12-10 12:29:22+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -365,6 +365,22 @@
msgstr ""
#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
+msgid "\n"
+"This module helps you to manage your plannings.\n"
+"\n"
+"This module is based on the analytic accounting and is totally integrated with\n"
+"* the timesheets encoding\n"
+"* the holidays management\n"
+"* the project management\n"
+"\n"
+"So that, each department manager can know if someone in his team has still unallocated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks.\n"
+"\n"
+"At the end of the month, the planning manager can also check if the encoded timesheets are respecting the planned time on each analytic account.\n"
+""
+msgstr ""
+
+#. module: project_planning
#: model:ir.model,name:project_planning.model_res_company
msgid "Companies"
msgstr ""
=== modified file 'project_retro_planning/i18n/project_retro_planning.pot'
--- project_retro_planning/i18n/project_retro_planning.pot 2010-12-03 15:55:33 +0000
+++ project_retro_planning/i18n/project_retro_planning.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:23+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:23+0000\n"
+"POT-Creation-Date: 2010-12-10 12:30:00+0000\n"
+"PO-Revision-Date: 2010-12-10 12:30:00+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,13 @@
msgstr ""
#. module: project_retro_planning
+#: model:ir.module.module,description:project_retro_planning.module_meta_information
+msgid "\n"
+" - If end date of project is changed\n"
+" then the deadline date and start date for all the tasks will change accordingly "
+msgstr ""
+
+#. module: project_retro_planning
#: constraint:project.project:0
msgid "Error! project start-date must be lower then project end-date."
msgstr ""
=== modified file 'project_scrum/i18n/project_scrum.pot'
--- project_scrum/i18n/project_scrum.pot 2010-12-03 15:55:33 +0000
+++ project_scrum/i18n/project_scrum.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:24+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:24+0000\n"
+"POT-Creation-Date: 2010-12-10 12:30:15+0000\n"
+"PO-Revision-Date: 2010-12-10 12:30:15+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -42,6 +42,32 @@
msgstr ""
#. module: project_scrum
+#: model:ir.module.module,description:project_scrum.module_meta_information
+msgid "\n"
+" This module implements all concepts defined by the scrum project\n"
+" management methodology for IT companies:\n"
+" * Project with sprints, product owner, scrum master\n"
+" * Sprints with reviews, daily meetings, feedbacks\n"
+" * Product backlog\n"
+" * Sprint backlog\n"
+"\n"
+" It adds some concepts to the project management module:\n"
+" * Mid-term, long-term road-map\n"
+" * Customers/functional requests VS technical ones\n"
+"\n"
+" It also creates a new reporting:\n"
+" * Burn-down chart\n"
+"\n"
+" The scrum projects and tasks inherit from the real projects and\n"
+" tasks, so you can continue working on normal tasks that will also\n"
+" include tasks from scrum projects.\n"
+"\n"
+" More information on the methodology:\n"
+" * http://controlchaos.com\n";
+" "
+msgstr ""
+
+#. module: project_scrum
#: view:project.scrum.meeting:0
#: view:project.scrum.sprint:0
msgid "What did you do since the last meeting?"
@@ -189,11 +215,9 @@
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
#: view:project.scrum.product.backlog:0
#: field:project.task,product_backlog_id:0
-#, python-format
msgid "Product Backlog"
msgstr ""
@@ -352,6 +376,12 @@
msgstr ""
#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
+#, python-format
+msgid "Product Backlog '%s' is assigned sprint:%s"
+msgstr ""
+
+#. module: project_scrum
#: field:project.scrum.sprint,meeting_ids:0
msgid "Daily Scrum"
msgstr ""
@@ -803,6 +833,12 @@
msgstr ""
#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
+#, python-format
+msgid "Product Backlog '%s' is converted into Task %d."
+msgstr ""
+
+#. module: project_scrum
#: view:project.scrum.product.backlog:0
msgid "Remaining Hours"
msgstr ""
=== modified file 'project_scrum/wizard/project_scrum_backlog_sprint.py'
--- project_scrum/wizard/project_scrum_backlog_sprint.py 2010-08-27 15:04:44 +0000
+++ project_scrum/wizard/project_scrum_backlog_sprint.py 2010-12-11 04:13:59 +0000
@@ -54,12 +54,12 @@
'planned_hours':backlog.expected_hours,
'remaining_hours':backlog.expected_hours,
})
- message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is converted into Task %d."%(task_id,))
+ message = _("Product Backlog '%s' is converted into Task %d.") %(backlog.name,task_id)
self.log(cr, uid, backlog.id, message)
if data['state_open'] and backlog.state == "draft":
backlog_obj.write(cr, uid, backlog.id, {'state':'open'})
sprint = sprint_obj.browse(cr, uid, data['sprint_id'], context=context)
- message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is assigned sprint:%s"%(sprint.name))
+ message = _("Product Backlog '%s' is assigned sprint:%s") %(backlog.name,sprint.name)
self.log(cr, uid, backlog.id, message)
backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data['sprint_id']}, context=context)
return {}
=== modified file 'project_timesheet/i18n/project_timesheet.pot'
--- project_timesheet/i18n/project_timesheet.pot 2010-12-03 15:55:33 +0000
+++ project_timesheet/i18n/project_timesheet.pot 2010-12-11 04:13:59 +0000
@@ -24,7 +24,7 @@
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:0
#, python-format
-msgid "No journal defined on the related employee.\n"
+msgid "No journal defined on the related employee."
"Fill in the timesheet tab of the employee form."
msgstr ""
@@ -199,7 +199,7 @@
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:0
#, python-format
-msgid "No product defined on the related employee.\n"
+msgid "No product defined on the related employee."
"Fill in the timesheet tab of the employee form."
msgstr ""
@@ -293,7 +293,7 @@
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:0
#, python-format
-msgid "No product and product category property account defined on the related employee.\n"
+msgid "No product and product category property account defined on the related employee."
"Fill in the timesheet tab of the employee form."
msgstr ""
=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py 2010-10-27 11:37:15 +0000
+++ project_timesheet/project_timesheet.py 2010-12-11 04:13:59 +0000
@@ -54,18 +54,18 @@
emp = self.pool.get('hr.employee').browse(cr, uid, emp_id[0])
if not emp.product_id:
raise osv.except_osv(_('Bad Configuration !'),
- _('No product defined on the related employee.\nFill in the timesheet tab of the employee form.'))
+ _('No product defined on the related employee.Fill in the timesheet tab of the employee form.'))
if not emp.journal_id:
raise osv.except_osv(_('Bad Configuration !'),
- _('No journal defined on the related employee.\nFill in the timesheet tab of the employee form.'))
+ _('No journal defined on the related employee.Fill in the timesheet tab of the employee form.'))
a = emp.product_id.product_tmpl_id.property_account_expense.id
if not a:
a = emp.product_id.categ_id.property_account_expense_categ.id
if not a:
raise osv.except_osv(_('Bad Configuration !'),
- _('No product and product category property account defined on the related employee.\nFill in the timesheet tab of the employee form.'))
+ _('No product and product category property account defined on the related employee.Fill in the timesheet tab of the employee form.'))
res['product_id'] = emp.product_id.id
res['journal_id'] = emp.journal_id.id
res['general_account_id'] = a
=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml 2010-12-09 12:06:15 +0000
+++ project_timesheet/project_timesheet_view.xml 2010-12-11 04:13:59 +0000
@@ -1,3 +1,4 @@
+
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
@@ -80,7 +81,6 @@
<field name="name">account.analytic.line.inherit.select</field>
<field name="model">account.analytic.line</field>
<field name="type">search</field>
- <field name="priority">10</field>
<field name="arch" type="xml">
<search string="Search Analytic Lines">
<group col='6' colspan='4'>
=== modified file 'purchase/i18n/purchase.pot'
--- purchase/i18n/purchase.pot 2010-12-03 15:55:33 +0000
+++ purchase/i18n/purchase.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:25+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:25+0000\n"
+"POT-Creation-Date: 2010-12-10 12:30:54+0000\n"
+"PO-Revision-Date: 2010-12-10 12:30:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -39,6 +39,11 @@
msgstr ""
#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid "From Order: a draft invoice will be pre-generated based on the purchase order. The accountant will just have to validate this invoice for control.From Picking: a draft invoice will be pre-generated based on validated receptions.Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
+msgstr ""
+
+#. module: purchase
#: code:addons/purchase/purchase.py:0
#, python-format
msgid "You have to select a product UOM in the same category than the purchase UOM of the product"
@@ -222,6 +227,12 @@
msgstr ""
#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
#: view:purchase.order:0
#: field:purchase.order,notes:0
#: view:purchase.order.line:0
@@ -230,13 +241,6 @@
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "You have to select a pricelist or a supplier in the purchase form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,amount_tax:0
#: view:purchase.order.line:0
@@ -309,9 +313,9 @@
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Shipping Exception"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "%s"
msgstr ""
#. module: purchase
@@ -538,10 +542,8 @@
msgstr ""
#. module: purchase
-#: help:purchase.order,invoice_method:0
-msgid "From Order: a draft invoice will be pre-generated based on the purchase order. The accountant will just have to validate this invoice for control.\n"
-"From Picking: a draft invoice will be pre-generated based on validated receptions.\n"
-"Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
+#: report:purchase.order:0
+msgid "Shipping address :"
msgstr ""
#. module: purchase
@@ -552,10 +554,8 @@
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "You have to select a partner in the purchase form !\n"
-"Please set one partner before choosing a product."
+#: report:purchase.order:0
+msgid "Your Order Reference"
msgstr ""
#. module: purchase
@@ -1027,6 +1027,19 @@
msgstr ""
#. module: purchase
+#: model:ir.module.module,description:purchase.module_meta_information
+msgid "\n"
+" Purchase module is for generating a purchase order for purchase of goods from a supplier.\n"
+" A supplier invoice is created for the particular order placed\n"
+" Dashboard for purchase management that includes:\n"
+" * Current Purchase Orders\n"
+" * Draft Purchase Orders\n"
+" * Graph for quantity and amount per month \n"
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
#: selection:purchase.report,month:0
msgid "January"
msgstr ""
@@ -1401,8 +1414,9 @@
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-msgid "Your Order Reference"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You have to select a partner in the purchase form !Please set one partner before choosing a product."
msgstr ""
#. module: purchase
@@ -1431,11 +1445,6 @@
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: purchase
#: view:purchase.order:0
msgid "Purchase Control"
msgstr ""
@@ -1486,6 +1495,12 @@
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You have to select a pricelist or a supplier in the purchase form !Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
msgid "Approve"
msgstr ""
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2010-11-24 09:20:15 +0000
+++ purchase/purchase.py 2010-12-11 04:13:59 +0000
@@ -184,11 +184,7 @@
'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"),
'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True,
- help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \
- "will just have to validate this invoice for control.\n" \
- "From Picking: a draft invoice will be pre-generated based on validated receptions.\n" \
- "Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
- ),
+ help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant will just have to validate this invoice for control.From Picking: a draft invoice will be pre-generated based on validated receptions.Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."),
'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, method=True,store=True, string='Expected Date', type='date', help="This is computed as the minimum scheduled date of all purchase order lines' products."),
'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount',
store={
@@ -229,7 +225,7 @@
if s['state'] in ['draft','cancel']:
unlink_ids.append(s['id'])
else:
- raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!') % _(dict(purchase_order.STATE_SELECTION).get(s['state'])))
+ raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!') % (_('%s') % dict(purchase_order.STATE_SELECTION).get(s['state'])))
# TODO: temporary fix in 5.0, to remove in 5.2 when subflows support
# automatically sending subflow.delete upon deletion
@@ -639,9 +635,9 @@
partner_id, date_order=False, fiscal_position=False, date_planned=False,
name=False, price_unit=False, notes=False):
if not pricelist:
- raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist or a supplier in the purchase form !\nPlease set one before choosing a product.'))
+ raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist or a supplier in the purchase form !Please set one before choosing a product.'))
if not partner_id:
- raise osv.except_osv(_('No Partner!'), _('You have to select a partner in the purchase form !\nPlease set one partner before choosing a product.'))
+ raise osv.except_osv(_('No Partner!'), _('You have to select a partner in the purchase form !Please set one partner before choosing a product.'))
if not product:
return {'value': {'price_unit': price_unit or 0.0, 'name': name or '',
'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}}
=== modified file 'purchase_requisition/i18n/purchase_requisition.pot'
--- purchase_requisition/i18n/purchase_requisition.pot 2010-12-03 15:55:33 +0000
+++ purchase_requisition/i18n/purchase_requisition.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:26+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:26+0000\n"
+"POT-Creation-Date: 2010-12-10 12:31:06+0000\n"
+"PO-Revision-Date: 2010-12-10 12:31:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -137,8 +137,8 @@
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "Create Quotation"
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
msgstr ""
#. module: purchase_requisition
@@ -152,6 +152,15 @@
msgstr ""
#. module: purchase_requisition
+#: model:ir.module.module,description:purchase_requisition.module_meta_information
+msgid "\n"
+" This module allows you to manage your Purchase Requisition.\n"
+" When a purchase order is created, you now have the opportunity to save the related requisition.\n"
+" This new object will regroup and will allow you to easily keep track and order all your purchase orders.\n"
+""
+msgstr ""
+
+#. module: purchase_requisition
#: field:purchase.requisition.partner,partner_address_id:0
msgid "Address"
msgstr ""
@@ -325,8 +334,8 @@
msgstr ""
#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Multiple Requisitions"
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
msgstr ""
#. module: purchase_requisition
=== modified file 'report_designer/i18n/report_designer.pot'
--- report_designer/i18n/report_designer.pot 2010-12-03 15:55:33 +0000
+++ report_designer/i18n/report_designer.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:26+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:26+0000\n"
+"POT-Creation-Date: 2010-12-10 12:31:20+0000\n"
+"PO-Revision-Date: 2010-12-10 12:31:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -62,6 +62,11 @@
msgstr ""
#. module: report_designer
+#: help:report_designer.installer,base_report_designer:0
+msgid "Adds wizards to Import/Export .SXW report which you can modify in OpenOffice.Once you have modified it you can upload the report using the same wizard."
+msgstr ""
+
+#. module: report_designer
#: help:report_designer.installer,base_report_creator:0
msgid "Allows you to create any statistic reports on several objects. It's a SQL query builder and browser for end users."
msgstr ""
=== modified file 'report_intrastat/i18n/report_intrastat.pot'
--- report_intrastat/i18n/report_intrastat.pot 2010-12-03 15:55:33 +0000
+++ report_intrastat/i18n/report_intrastat.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:27+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:27+0000\n"
+"POT-Creation-Date: 2010-12-10 12:31:35+0000\n"
+"PO-Revision-Date: 2010-12-10 12:31:35+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -81,8 +81,9 @@
msgstr ""
#. module: report_intrastat
-#: selection:report.intrastat,month:0
-msgid "August"
+#: report:account.invoice.intrastat:0
+#: field:report.intrastat.code,description:0
+msgid "Description"
msgstr ""
#. module: report_intrastat
@@ -189,6 +190,13 @@
msgstr ""
#. module: report_intrastat
+#: model:ir.module.module,description:report_intrastat.module_meta_information
+msgid "\n"
+" A module that adds intrastat reports.\n"
+" This module gives the details of the goods traded between the countries of European Union "
+msgstr ""
+
+#. module: report_intrastat
#: model:ir.model,name:report_intrastat.model_res_country
msgid "Country"
msgstr ""
@@ -251,9 +259,8 @@
msgstr ""
#. module: report_intrastat
-#: report:account.invoice.intrastat:0
-#: field:report.intrastat.code,description:0
-msgid "Description"
+#: selection:report.intrastat,month:0
+msgid "August"
msgstr ""
#. module: report_intrastat
=== modified file 'report_webkit/i18n/report_webkit.pot'
--- report_webkit/i18n/report_webkit.pot 2010-12-03 15:55:33 +0000
+++ report_webkit/i18n/report_webkit.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:27+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:27+0000\n"
+"POT-Creation-Date: 2010-12-10 12:31:55+0000\n"
+"PO-Revision-Date: 2010-12-10 12:31:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -79,6 +79,12 @@
msgstr ""
#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "Webkit render"
+msgstr ""
+
+#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "Folio 27 210 x 330 mm"
msgstr ""
@@ -142,6 +148,11 @@
msgstr ""
#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_img
+msgid "ir.header_img"
+msgstr ""
+
+#. module: report_webkit
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
msgstr ""
@@ -330,8 +341,8 @@
msgstr ""
#. module: report_webkit
-#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: selection:ir.header_webkit,orientation:0
+msgid "Landscape"
msgstr ""
#. module: report_webkit
@@ -400,8 +411,8 @@
msgstr ""
#. module: report_webkit
-#: model:ir.model,name:report_webkit.model_ir_header_img
-msgid "ir.header_img"
+#: field:ir.header_webkit,format:0
+msgid "Paper size"
msgstr ""
#. module: report_webkit
@@ -425,6 +436,17 @@
msgstr ""
#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "'))\n"
+" header = report_xml.webkit_header.html\n"
+" footer = report_xml.webkit_header.footer_html\n"
+" if not header and report_xml.header:\n"
+" raise except_osv(\n"
+" _('No header defined for this Webkit report!"
+msgstr ""
+
+#. module: report_webkit
#: help:res.company,lib_path:0
msgid "Complete (Absolute) path to the wkhtmltopdf executable."
msgstr ""
@@ -487,11 +509,6 @@
msgstr ""
#. module: report_webkit
-#: field:ir.header_webkit,format:0
-msgid "Paper size"
-msgstr ""
-
-#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:0
#, python-format
msgid "Webkit Report template not found !"
@@ -518,7 +535,7 @@
msgstr ""
#. module: report_webkit
-#: selection:ir.header_webkit,orientation:0
-msgid "Landscape"
+#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
msgstr ""
=== modified file 'report_webkit/webkit_report.py'
--- report_webkit/webkit_report.py 2010-12-07 18:21:54 +0000
+++ report_webkit/webkit_report.py 2010-12-11 04:13:59 +0000
@@ -148,7 +148,7 @@
status = commands.getstatusoutput(generate_command)
if status[0] :
raise except_osv(
- _('Webkit raise an error' ),
+ _('Webkit raise an error'),
status[1]
)
except Exception:
=== modified file 'report_webkit_sample/i18n/report_webkit_sample.pot'
--- report_webkit_sample/i18n/report_webkit_sample.pot 2010-12-03 15:55:33 +0000
+++ report_webkit_sample/i18n/report_webkit_sample.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:28+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:28+0000\n"
+"POT-Creation-Date: 2010-12-10 12:32:08+0000\n"
+"PO-Revision-Date: 2010-12-10 12:32:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -99,6 +99,11 @@
#. module: report_webkit_sample
#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Amount"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
msgid "VAT"
msgstr ""
=== modified file 'resource/faces/task.py'
--- resource/faces/task.py 2010-04-29 08:01:54 +0000
+++ resource/faces/task.py 2010-12-11 04:13:59 +0000
@@ -2989,8 +2989,7 @@
except ValueError:
#@ << raise child recursion error >>
#@+node:<< raise child recursion error >>
- self._raise(RecursionError("A child defines a "\
- "recursive definition at %s" % self.path))
+ self._raise(RecursionError("A child defines a recursive definition at %s" % self.path))
#@-node:<< raise child recursion error >>
#@nl
@@ -3009,8 +3008,7 @@
if start: return to_start(start)
#@ << raise recursion error >>
#@+node:<< raise recursion error >>
- raise RecursionError("you have to specify a "\
- "start or an end at %s" % self.path)
+ raise RecursionError("you have to specify a start or an end at %s" % self.path)
#@nonl
#@-node:<< raise recursion error >>
#@nl
@@ -3029,8 +3027,7 @@
except ValueError:
#@ << raise child recursion error >>
#@+node:<< raise child recursion error >>
- self._raise(RecursionError("A child defines a "\
- "recursive definition at %s" % self.path))
+ self._raise(RecursionError("A child defines a recursive definition at %s" % self.path))
#@-node:<< raise child recursion error >>
#@nl
@@ -3049,8 +3046,7 @@
if end: return to_end(end)
#@ << raise recursion error >>
#@+node:<< raise recursion error >>
- raise RecursionError("you have to specify a "\
- "start or an end at %s" % self.path)
+ raise RecursionError("you have to specify a start or an end at %s" % self.path)
#@nonl
#@-node:<< raise recursion error >>
#@nl
@@ -3250,8 +3246,7 @@
end = self._find_frozen("end")
if not (start or end):
- self._raise(ValueError("You must specify either a"\
- " start or an end attribute"))
+ self._raise(ValueError("You must specify either a start or an end attribute"))
if start and end: return
@@ -3423,8 +3418,7 @@
indent += " "
def make_resource(r):
- return '%sclass %s(Resource): title = "%s"\n' \
- % (indent, r.name, r.title)
+ return '%sclass %s(Resource): title = "%s"' % (indent, r.name, r.title)
now = datetime.datetime.now().strftime("%x %H:%M")
resource_text = map(lambda r: make_resource(r), self.all_resources())
=== modified file 'resource/i18n/resource.pot'
--- resource/i18n/resource.pot 2010-12-09 11:52:11 +0000
+++ resource/i18n/resource.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:28+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:28+0000\n"
+"POT-Creation-Date: 2010-12-10 12:32:20+0000\n"
+"PO-Revision-Date: 2010-12-10 12:32:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -42,6 +42,8 @@
msgstr ""
#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
#: field:resource.calendar,attendance_ids:0
#: view:resource.calendar.attendance:0
#: view:resource.calendar.leaves:0
@@ -87,8 +89,8 @@
msgstr ""
#. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Time"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
msgstr ""
#. module: resource
@@ -126,6 +128,11 @@
msgstr ""
#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
+#. module: resource
#: view:resource.calendar.leaves:0
msgid "Reason"
msgstr ""
@@ -180,17 +187,23 @@
msgstr ""
#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid "\n"
+" Module for resource management\n"
+" A resource represent something that can be scheduled\n"
+" (a developer on a task or a workcenter on manufacturing orders).\n"
+" This module manages a resource calendar associated to every resource.\n"
+" It also manages the leaves of every resource.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Wednesday"
msgstr ""
#. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
-msgid "Working Time"
-msgstr ""
-
-#. module: resource
#: model:ir.model,name:resource.model_resource_resource
msgid "Resource Detail"
msgstr ""
@@ -268,6 +281,11 @@
msgstr ""
#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
+#. module: resource
#: view:resource.resource:0
msgid "Inactive"
msgstr ""
=== modified file 'sale/i18n/ar.po'
--- sale/i18n/ar.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/ar.po 2010-12-11 04:13:59 +0000
@@ -1614,7 +1614,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/bg.po'
--- sale/i18n/bg.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/bg.po 2010-12-11 04:13:59 +0000
@@ -1667,7 +1667,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/bs.po'
--- sale/i18n/bs.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/bs.po 2010-12-11 04:13:59 +0000
@@ -1664,7 +1664,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/ca.po'
--- sale/i18n/ca.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/ca.po 2010-12-11 04:13:59 +0000
@@ -1672,7 +1672,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/cs.po'
--- sale/i18n/cs.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/cs.po 2010-12-11 04:13:59 +0000
@@ -1614,7 +1614,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid "Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/de.po'
--- sale/i18n/de.po 2010-12-09 04:58:02 +0000
+++ sale/i18n/de.po 2010-12-11 04:13:59 +0000
@@ -1731,7 +1731,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr " Typ der VE: "
#. module: sale
=== modified file 'sale/i18n/el.po'
--- sale/i18n/el.po 2010-12-05 04:53:19 +0000
+++ sale/i18n/el.po 2010-12-11 04:13:59 +0000
@@ -1639,7 +1639,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/es.po'
--- sale/i18n/es.po 2010-12-09 04:58:02 +0000
+++ sale/i18n/es.po 2010-12-11 04:13:59 +0000
@@ -1720,7 +1720,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr " Tipo de ul: "
#. module: sale
=== modified file 'sale/i18n/es_AR.po'
--- sale/i18n/es_AR.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/es_AR.po 2010-12-11 04:13:59 +0000
@@ -1624,7 +1624,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/es_EC.po'
--- sale/i18n/es_EC.po 2010-11-10 07:20:05 +0000
+++ sale/i18n/es_EC.po 2010-12-11 04:13:59 +0000
@@ -1706,7 +1706,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr " Tipo of ul: "
#. module: sale
=== modified file 'sale/i18n/et.po'
--- sale/i18n/et.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/et.po 2010-12-11 04:13:59 +0000
@@ -1674,7 +1674,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/fi.po'
--- sale/i18n/fi.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/fi.po 2010-12-11 04:13:59 +0000
@@ -1666,7 +1666,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/fr.po'
--- sale/i18n/fr.po 2010-12-09 04:58:02 +0000
+++ sale/i18n/fr.po 2010-12-11 04:13:59 +0000
@@ -1681,7 +1681,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/hr.po'
--- sale/i18n/hr.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/hr.po 2010-12-11 04:13:59 +0000
@@ -1665,7 +1665,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/hu.po'
--- sale/i18n/hu.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/hu.po 2010-12-11 04:13:59 +0000
@@ -1614,7 +1614,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/id.po'
--- sale/i18n/id.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/id.po 2010-12-11 04:13:59 +0000
@@ -1619,7 +1619,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/it.po'
--- sale/i18n/it.po 2010-11-30 04:54:11 +0000
+++ sale/i18n/it.po 2010-12-11 04:13:59 +0000
@@ -1704,7 +1704,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/ko.po'
--- sale/i18n/ko.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/ko.po 2010-12-11 04:13:59 +0000
@@ -1661,7 +1661,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/lt.po'
--- sale/i18n/lt.po 2010-11-29 04:54:31 +0000
+++ sale/i18n/lt.po 2010-12-11 04:13:59 +0000
@@ -1669,7 +1669,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/lv.po'
--- sale/i18n/lv.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/lv.po 2010-12-11 04:13:59 +0000
@@ -1616,7 +1616,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/mn.po'
--- sale/i18n/mn.po 2010-12-03 05:08:40 +0000
+++ sale/i18n/mn.po 2010-12-11 04:13:59 +0000
@@ -1738,7 +1738,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/nl.po'
--- sale/i18n/nl.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/nl.po 2010-12-11 04:13:59 +0000
@@ -1667,7 +1667,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/pl.po'
--- sale/i18n/pl.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/pl.po 2010-12-11 04:13:59 +0000
@@ -1711,7 +1711,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/pt.po'
--- sale/i18n/pt.po 2010-11-29 04:54:31 +0000
+++ sale/i18n/pt.po 2010-12-11 04:13:59 +0000
@@ -1667,7 +1667,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/pt_BR.po'
--- sale/i18n/pt_BR.po 2010-11-29 04:54:31 +0000
+++ sale/i18n/pt_BR.po 2010-12-11 04:13:59 +0000
@@ -1756,7 +1756,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr " Tipo de ul: "
#. module: sale
=== modified file 'sale/i18n/ro.po'
--- sale/i18n/ro.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/ro.po 2010-12-11 04:13:59 +0000
@@ -1666,7 +1666,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/ru.po'
--- sale/i18n/ru.po 2010-12-09 04:58:02 +0000
+++ sale/i18n/ru.po 2010-12-11 04:13:59 +0000
@@ -1695,7 +1695,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/sale.pot'
--- sale/i18n/sale.pot 2010-12-03 15:55:33 +0000
+++ sale/i18n/sale.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:29+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:29+0000\n"
+"POT-Creation-Date: 2010-12-10 12:32:34+0000\n"
+"PO-Revision-Date: 2010-12-10 12:32:34+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@
"Plural-Forms: \n"
#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Partial Delivery"
+msgstr ""
+
+#. module: sale
#: help:sale.order,picking_policy:0
msgid "If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"
msgstr ""
@@ -210,12 +215,6 @@
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "Could not cancel sale order !"
-msgstr ""
-
-#. module: sale
#: field:sale.order.line,product_packaging:0
msgid "Packaging"
msgstr ""
@@ -226,12 +225,6 @@
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree2
msgid "Sales in Exception"
msgstr ""
@@ -247,23 +240,11 @@
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "There is no income category account defined in default Properties for Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,month:0
msgid "August"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "EAN: "
-msgstr ""
-
-#. module: sale
#: constraint:stock.move:0
msgid "You try to assign a lot which is not from the same product"
msgstr ""
@@ -289,11 +270,23 @@
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Not enough stock!"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "October"
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Invalid action!"
+msgstr ""
+
+#. module: sale
#: view:board.board:0
#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
@@ -302,14 +295,6 @@
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:0
-#, python-format
-msgid "Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n"
-"1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sale Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
#: field:sale.advance.payment.inv,qtty:0
#: report:sale.order:0
msgid "Quantity"
@@ -357,12 +342,6 @@
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced !"
-msgstr ""
-
-#. module: sale
#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "In Progress"
@@ -374,19 +353,26 @@
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
#: help:sale.advance.payment.inv,product_id:0
msgid "Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You have to select a customer in the sale form! Please set one customer before choosing a product."
msgstr ""
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid "Could not cancel this sale order !"
+msgid "There is no income category account defined in default Properties for Product Category or Fiscal Position is not defined!"
msgstr ""
#. module: sale
@@ -434,6 +420,12 @@
msgstr ""
#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:0
+#, python-format
+msgid "Invoice cannot be created for this Sale Order Line due to one of the following reasons: 1.The state of this sale order line is either \"draft\" or \"cancel\"! 2.The Sale Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
#: help:sale.order,project_id:0
msgid "The analytic account related to a sale order"
msgstr ""
@@ -454,6 +446,11 @@
msgstr ""
#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
#: selection:sale.report,month:0
msgid "March"
msgstr ""
@@ -469,12 +466,6 @@
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "Cannot delete Sale Order(s) which are already confirmed !"
-msgstr ""
-
-#. module: sale
#: view:board.board:0
msgid "Sales by Customer"
msgstr ""
@@ -506,6 +497,12 @@
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You plan to sell %.2f %s but you only have %.2f %s available! The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sale Make Invoice"
msgstr ""
@@ -562,12 +559,6 @@
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "Invalid action !"
-msgstr ""
-
-#. module: sale
#: help:sale.order,order_policy:0
msgid "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
" - The 'Pay before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.\n"
@@ -766,14 +757,6 @@
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging: "
-msgstr ""
-
-#. module: sale
#: field:sale.installer,sale_order_dates:0
msgid "Sales Order Dates"
msgstr ""
@@ -874,11 +857,6 @@
msgstr ""
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
#: field:sale.order.line,sequence:0
msgid "Sequence Number"
msgstr ""
@@ -920,8 +898,9 @@
msgstr ""
#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "No Customer Defined!"
msgstr ""
#. module: sale
@@ -996,6 +975,32 @@
msgstr ""
#. module: sale
+#: model:ir.module.module,description:sale.module_meta_information
+msgid "\n"
+" The base module to manage quotations and sales orders.\n"
+"\n"
+" * Workflow with validation steps:\n"
+" - Quotation -> Sale order -> Invoice\n"
+" * Invoicing methods:\n"
+" - Invoice on order (before or after shipping)\n"
+" - Invoice on delivery\n"
+" - Invoice on timesheets\n"
+" - Advance invoice\n"
+" * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+" * Products stocks and prices\n"
+" * Delivery methods:\n"
+" - all at once, multi-parcel\n"
+" - delivery costs\n"
+" * Dashboard for salesman that includes:\n"
+" * Your open quotations\n"
+" * Top 10 sales of the month\n"
+" * Cases statistics\n"
+" * Graph of sales by product\n"
+" * Graph of cases of the month\n"
+" "
+msgstr ""
+
+#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_validate0
msgid "Validate"
msgstr ""
@@ -1043,13 +1048,6 @@
msgstr ""
#. module: sale
-#: help:sale.order,state:0
-msgid "Gives the state of the quotation or sale order. \n"
-"The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'."
-msgstr ""
-
-#. module: sale
#: help:sale.order.line,state:0
msgid "* The 'Draft' state is set when the related sale order in draft state. \n"
"* The 'Confirmed' state is set when the related sale order is confirmed. \n"
@@ -1095,14 +1093,13 @@
msgstr ""
#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid "The salesman confirms the quotation. The state of the sale order becomes 'In progress' or 'Manual in progress'."
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "Error !"
+#: selection:sale.order.line,type:0
+msgid "from stock"
msgstr ""
#. module: sale
@@ -1132,12 +1129,6 @@
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "Picking Information !"
-msgstr ""
-
-#. module: sale
#: view:sale.report:0
#: field:sale.report,month:0
msgid "Month"
@@ -1149,12 +1140,6 @@
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid " Quantity: "
-msgstr ""
-
-#. module: sale
#: model:process.node,note:sale.process_node_invoice0
msgid "To be reviewed by the accountant."
msgstr ""
@@ -1181,8 +1166,14 @@
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Erro !"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
@@ -1230,6 +1221,12 @@
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel this sale order!"
+msgstr ""
+
+#. module: sale
#: model:process.node,note:sale.process_node_order0
msgid "Confirmed sale order to invoice."
msgstr ""
@@ -1282,6 +1279,12 @@
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You selected a quantity of %d Units.But it's not compatible with the selected packaging.Here is a proposition of quantities according to the packaging: "
+msgstr ""
+
+#. module: sale
#: view:sale.order.line:0
msgid "To Do"
msgstr ""
@@ -1388,13 +1391,6 @@
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-
-#. module: sale
#: view:sale.order:0
msgid "States"
msgstr ""
@@ -1458,6 +1454,12 @@
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel sale order!"
+msgstr ""
+
+#. module: sale
#: help:sale.advance.payment.inv,amount:0
msgid "The amount to be invoiced in advance."
msgstr ""
@@ -1480,6 +1482,17 @@
msgstr ""
#. module: sale
+#: help:sale.order,state:0
+msgid "Gives the state of the quotation or sale order.The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception).The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
#: report:sale.order:0
msgid "Net Total :"
msgstr ""
@@ -1492,6 +1505,12 @@
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Type of Shipping Unit: %s "
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
@@ -1539,12 +1558,6 @@
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid " Type of ul: "
-msgstr ""
-
-#. module: sale
#: selection:sale.order.line,state:0
msgid "Confirmed"
msgstr ""
@@ -1555,6 +1568,12 @@
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Cannot delete Sale Order(s) which are already confirmed!"
+msgstr ""
+
+#. module: sale
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
msgstr ""
@@ -1648,8 +1667,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid "You have to select a customer in the sale form !\n"
-"Please set one customer before choosing a product."
+msgid "EAN: %s"
msgstr ""
#. module: sale
@@ -1703,6 +1721,12 @@
msgstr ""
#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Picking Information!"
+msgstr ""
+
+#. module: sale
#: field:sale.config.picking_policy,progress:0
#: field:sale.installer,progress:0
msgid "Configuration Progress"
@@ -1796,8 +1820,14 @@
msgstr ""
#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Quantity: %s"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid "The salesman confirms the quotation. The state of the sale order becomes 'In progress' or 'Manual in progress'."
msgstr ""
#. module: sale
@@ -1817,12 +1847,6 @@
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "Not enough stock !"
-msgstr ""
-
-#. module: sale
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
msgstr ""
=== modified file 'sale/i18n/sk.po'
--- sale/i18n/sk.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/sk.po 2010-12-11 04:13:59 +0000
@@ -1615,7 +1615,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/sl.po'
--- sale/i18n/sl.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/sl.po 2010-12-11 04:13:59 +0000
@@ -1615,7 +1615,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/sq.po'
--- sale/i18n/sq.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/sq.po 2010-12-11 04:13:59 +0000
@@ -1615,7 +1615,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/sr.po'
--- sale/i18n/sr.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/sr.po 2010-12-11 04:13:59 +0000
@@ -1738,7 +1738,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr " Tip ul: "
#. module: sale
=== modified file 'sale/i18n/sv.po'
--- sale/i18n/sv.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/sv.po 2010-12-11 04:13:59 +0000
@@ -1672,7 +1672,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr " Type of ul: "
#. module: sale
=== modified file 'sale/i18n/tlh.po'
--- sale/i18n/tlh.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/tlh.po 2010-12-11 04:13:59 +0000
@@ -1614,7 +1614,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/tr.po'
--- sale/i18n/tr.po 2010-11-28 04:55:14 +0000
+++ sale/i18n/tr.po 2010-12-11 04:13:59 +0000
@@ -1662,7 +1662,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/uk.po'
--- sale/i18n/uk.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/uk.po 2010-12-11 04:13:59 +0000
@@ -1615,7 +1615,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/vi.po'
--- sale/i18n/vi.po 2010-11-25 05:32:05 +0000
+++ sale/i18n/vi.po 2010-12-11 04:13:59 +0000
@@ -1675,7 +1675,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr " Loại ul: "
#. module: sale
=== modified file 'sale/i18n/zh_CN.po'
--- sale/i18n/zh_CN.po 2010-12-09 04:58:02 +0000
+++ sale/i18n/zh_CN.po 2010-12-11 04:13:59 +0000
@@ -1621,7 +1621,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/i18n/zh_TW.po'
--- sale/i18n/zh_TW.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/zh_TW.po 2010-12-11 04:13:59 +0000
@@ -1614,7 +1614,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
=== modified file 'sale/product.py'
--- sale/product.py 2010-10-15 08:48:13 +0000
+++ sale/product.py 2010-12-11 04:13:59 +0000
@@ -47,7 +47,7 @@
price = prices.get(pricelist.id) or 0.0
except:
price = 0.0
- result[product.id] += "%s (%.2f) : %.2f\n" % (pricelist.name, qty or 0.0, price)
+ result[product.id] += "%s (%.2f) : %.2f" % (pricelist.name, qty or 0.0, price)
break
break
return result
=== modified file 'sale/sale.py'
--- sale/sale.py 2010-12-07 13:36:57 +0000
+++ sale/sale.py 2010-12-11 04:13:59 +0000
@@ -217,7 +217,7 @@
('invoice_except', 'Invoice Exception'),
('done', 'Done'),
('cancel', 'Cancelled')
- ], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
+ ], 'Order State', readonly=True, help="Gives the state of the quotation or sale order.The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception).The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
'date_order': fields.date('Ordered Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'create_date': fields.date('Creation Date', readonly=True, help="Date on which sale order is created"),
'date_confirm': fields.date('Confirmation Date', readonly=True, help="Date on which sale order is confirmed"),
@@ -302,7 +302,7 @@
if s['state'] in ['draft', 'cancel']:
unlink_ids.append(s['id'])
else:
- raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sale Order(s) which are already confirmed !'))
+ raise osv.except_osv(_('Invalid action!'), _('Cannot delete Sale Order(s) which are already confirmed!'))
return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
def onchange_shop_id(self, cr, uid, ids, shop_id):
@@ -409,7 +409,7 @@
journal_ids = journal_obj.search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)], limit=1)
if not journal_ids:
- raise osv.except_osv(_('Error !'),
+ raise osv.except_osv(_('Error!'),
_('There is no sale journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
a = order.partner_id.property_account_receivable.id
pay_term = order.payment_term and order.payment_term.id or False
@@ -591,7 +591,7 @@
for pick in sale.picking_ids:
if pick.state not in ('draft', 'cancel'):
raise osv.except_osv(
- _('Could not cancel sale order !'),
+ _('Could not cancel sale order!'),
_('You must first cancel all picking attached to this sale order.'))
for r in self.read(cr, uid, ids, ['picking_ids']):
for pick in r['picking_ids']:
@@ -599,7 +599,7 @@
for inv in sale.invoice_ids:
if inv.state not in ('draft', 'cancel'):
raise osv.except_osv(
- _('Could not cancel this sale order !'),
+ _('Could not cancel this sale order!'),
_('You must first cancel all invoices attached to this sale order.'))
for r in self.read(cr, uid, ids, ['invoice_ids']):
for inv in r['invoice_ids']:
@@ -923,10 +923,8 @@
if not a:
a = line.product_id.categ_id.property_account_income_categ.id
if not a:
- raise osv.except_osv(_('Error !'),
- _('There is no income account defined ' \
- 'for this product: "%s" (id:%d)') % \
- (line.product_id.name, line.product_id.id,))
+ raise osv.except_osv(_('Erro !'),
+ _('There is no income account defined for this product: "%s" (id:%d)') %(line.product_id.name, line.product_id.id,))
else:
prop = self.pool.get('ir.property').get(cr, uid,
'property_account_income_categ', 'product.category',
@@ -941,8 +939,8 @@
fpos = line.order_id.fiscal_position or False
a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
if not a:
- raise osv.except_osv(_('Error !'),
- _('There is no income category account defined in default Properties for Product Category or Fiscal Position is not defined !'))
+ raise osv.except_osv(_('Error!'),
+ _('There is no income category account defined in default Properties for Product Category or Fiscal Position is not defined!'))
inv_id = self.pool.get('account.invoice.line').create(cr, uid, {
'name': line.name,
'origin': line.order_id.name,
@@ -971,7 +969,7 @@
context = {}
for line in self.browse(cr, uid, ids, context=context):
if line.invoiced:
- raise osv.except_osv(_('Invalid action !'), _('You cannot cancel a sale order line that has already been invoiced !'))
+ raise osv.except_osv(_('Invalid action!'), _('You cannot cancel a sale order line that has already been invoiced!'))
for move_line in line.move_ids:
if move_line.state != 'cancel':
raise osv.except_osv(
@@ -1025,7 +1023,7 @@
uom=False, qty_uos=0, uos=False, name='', partner_id=False,
lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False):
if not partner_id:
- raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
+ raise osv.except_osv(_('No Customer Defined!'), _('You have to select a customer in the sale form! Please set one customer before choosing a product.'))
warning = {}
product_uom_obj = self.pool.get('product.uom')
partner_obj = self.pool.get('res.partner')
@@ -1056,13 +1054,10 @@
ean = pack.ean or _('(n/a)')
qty_pack = pack.qty
type_ul = pack.ul
- warn_msg = _("You selected a quantity of %d Units.\n"
- "But it's not compatible with the selected packaging.\n"
- "Here is a proposition of quantities according to the packaging:\n\n"
- "EAN: %s Quantity: %s Type of ul: %s") % \
- (qty, ean, qty_pack, type_ul.name)
+ warn_msg = _("You selected a quantity of %d Units.But it's not compatible with the selected packaging.Here is a proposition of quantities according to the packaging: ") % (qty)
+ warn_msg = '\n\n' + _("EAN: %s") % str(ean) + _("Quantity: %s") % str(qty_pack) + _("Type of Shipping Unit: %s ") % str(type_ul.name)
warning = {
- 'title': _('Picking Information !'),
+ 'title': _('Picking Information!'),
'message': warn_msg
}
result['product_uom_qty'] = qty
@@ -1126,8 +1121,8 @@
if (product_obj.type=='product') and (product_obj.virtual_available * uom2.factor < qty * product_obj.uom_id.factor) \
and (product_obj.procure_method=='make_to_stock'):
warning = {
- 'title': _('Not enough stock !'),
- 'message': _('You plan to sell %.2f %s but you only have %.2f %s available !\nThe real stock is %.2f %s. (without reservations)') %
+ 'title': _('Not enough stock!'),
+ 'message': _('You plan to sell %.2f %s but you only have %.2f %s available! The real stock is %.2f %s. (without reservations)') %
(qty, uom2 and uom2.name or product_obj.uom_id.name,
max(0,product_obj.virtual_available), product_obj.uom_id.name,
max(0,product_obj.qty_available), product_obj.uom_id.name)
@@ -1135,9 +1130,9 @@
# get unit price
if not pricelist:
warning = {
- 'title': 'No Pricelist !',
+ 'title': 'No Pricelist!',
'message':
- 'You have to select a pricelist or a customer in the sale form !\n'
+ 'You have to select a pricelist or a customer in the sale form!'
'Please set one before choosing a product.'
}
else:
@@ -1148,9 +1143,9 @@
})[pricelist]
if price is False:
warning = {
- 'title': 'No valid pricelist line found !',
+ 'title': 'No valid pricelist line found!',
'message':
- "Couldn't find a pricelist line matching this product and quantity.\n"
+ "Couldn't find a pricelist line matching this product and quantity."
"You have to change either the product, the quantity or the pricelist."
}
else:
@@ -1176,7 +1171,7 @@
"""Allows to delete sale order lines in draft,cancel states"""
for rec in self.browse(cr, uid, ids, context=context):
if rec.state not in ['draft', 'cancel']:
- raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sale order line which is %s !') %(rec.state,))
+ raise osv.except_osv(_('Invalid action!'), _('Cannot delete a sale order line which is %s !') %(rec.state,))
return super(sale_order_line, self).unlink(cr, uid, ids, context=context)
sale_order_line()
@@ -1200,10 +1195,7 @@
('one', 'Delivery Order Only'),
('two', 'Picking List & Delivery Order')
], 'Steps To Deliver a Sale Order', required=True,
- help="By default, OpenERP is able to manage complex routing and paths "\
- "of products in your warehouse and partner locations. This will configure "\
- "the most common and simple methods to deliver products to the customer "\
- "in one or two operations by the worker.")
+ help="By default, OpenERP is able to manage complex routing and paths of products in your warehouse and partner locations. This will configure the most common and simple methods to deliver products to the customer in one or two operations by the worker.")
}
_defaults = {
'picking_policy': 'direct',
=== modified file 'sale/wizard/sale_line_invoice.py'
--- sale/wizard/sale_line_invoice.py 2010-10-25 12:54:08 +0000
+++ sale/wizard/sale_line_invoice.py 2010-12-11 04:13:59 +0000
@@ -108,7 +108,7 @@
sales_order_obj.write(cr, uid, [line.order_id.id], {'state': 'progress'})
if not invoices:
- raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n1.The state of this sale order line is either "draft" or "cancel"!\n2.The Sale Order Line is Invoiced!'))
+ raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sale Order Line due to one of the following reasons: 1.The state of this sale order line is either "draft" or "cancel"! 2.The Sale Order Line is Invoiced!'))
return {}
=== modified file 'sale_analytic_plans/i18n/sale_analytic_plans.pot'
--- sale_analytic_plans/i18n/sale_analytic_plans.pot 2010-12-03 15:55:33 +0000
+++ sale_analytic_plans/i18n/sale_analytic_plans.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:30+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:30+0000\n"
+"POT-Creation-Date: 2010-12-10 12:32:53+0000\n"
+"PO-Revision-Date: 2010-12-10 12:32:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,13 @@
msgstr ""
#. module: sale_analytic_plans
+#: model:ir.module.module,description:sale_analytic_plans.module_meta_information
+msgid "\n"
+" The base module to manage analytic distribution and sales orders.\n"
+" "
+msgstr ""
+
+#. module: sale_analytic_plans
#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
msgid "Sale Order Line"
msgstr ""
=== modified file 'sale_crm/i18n/sale_crm.pot'
--- sale_crm/i18n/sale_crm.pot 2010-12-03 15:55:33 +0000
+++ sale_crm/i18n/sale_crm.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:30+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:30+0000\n"
+"POT-Creation-Date: 2010-12-10 12:33:06+0000\n"
+"PO-Revision-Date: 2010-12-10 12:33:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -28,12 +28,6 @@
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:0
#, python-format
-msgid "is converted to Quotation."
-msgstr ""
-
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
-#, python-format
msgid "Data Insufficient!"
msgstr ""
@@ -44,6 +38,20 @@
msgstr ""
#. module: sale_crm
+#: model:ir.module.module,description:sale_crm.module_meta_information
+msgid "\n"
+"This module adds a shortcut on one or several opportunity cases in the CRM.\n"
+"This shortcut allows you to generate a sales order based on the selected case.\n"
+"If different cases are open (a list), it generates one sale order by\n"
+"case.\n"
+"The case is then closed and linked to the generated sales order.\n"
+"\n"
+"We suggest you to install this module if you installed both the sale and the\n"
+"crm modules.\n"
+" "
+msgstr ""
+
+#. module: sale_crm
#: view:crm.make.sale:0
msgid "_Create"
msgstr ""
@@ -54,6 +62,12 @@
msgstr ""
#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "Opportunity '%s' is converted to Quotation."
+msgstr ""
+
+#. module: sale_crm
#: view:crm.lead:0
msgid "Convert to Quote"
msgstr ""
@@ -78,12 +92,6 @@
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:0
#, python-format
-msgid "Opportunity "
-msgstr ""
-
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
-#, python-format
msgid "Opportunity: %s"
msgstr ""
=== modified file 'sale_crm/wizard/crm_make_sale.py'
--- sale_crm/wizard/crm_make_sale.py 2010-11-18 07:08:23 +0000
+++ sale_crm/wizard/crm_make_sale.py 2010-12-11 04:13:59 +0000
@@ -107,7 +107,7 @@
new_id = sale_obj.create(cr, uid, vals)
case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
new_ids.append(new_id)
- message = _('Opportunity ') + " '" + case.name + "' "+ _("is converted to Quotation.")
+ message = (_("Opportunity '%s' is converted to Quotation.") %case.name)
self.log(cr, uid, case.id, message)
case_obj._history(cr, uid, [case], _("Converted to Sales Quotation(id: %s).") % (new_id))
=== modified file 'sale_journal/i18n/sale_journal.pot'
--- sale_journal/i18n/sale_journal.pot 2010-12-03 15:55:33 +0000
+++ sale_journal/i18n/sale_journal.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:30+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:30+0000\n"
+"POT-Creation-Date: 2010-12-10 12:33:17+0000\n"
+"PO-Revision-Date: 2010-12-10 12:33:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,8 +51,8 @@
msgstr ""
#. module: sale_journal
-#: view:sale_journal.invoice.type:0
-msgid "Notes"
+#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
+msgid "Managing sales and deliveries by journal"
msgstr ""
#. module: sale_journal
@@ -111,7 +111,34 @@
msgstr ""
#. module: sale_journal
-#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
-msgid "Managing sales and deliveries by journal"
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.module.module,description:sale_journal.module_meta_information
+msgid "\n"
+" The sale journal modules allows you to categorise your\n"
+" sales and deliveries (picking lists) between different journals.\n"
+" This module is very helpful for bigger companies that\n"
+" works by departments.\n"
+"\n"
+" You can use journal for different purposes, some examples:\n"
+" * isolate sales of different departments\n"
+" * journals for deliveries by truck or by UPS\n"
+"\n"
+" Journals have a responsible and evolves between different status:\n"
+" * draft, open, cancel, done.\n"
+"\n"
+" Batch operations can be processed on the different journals to\n"
+" confirm all sales at once, to validate or invoice packing, ...\n"
+"\n"
+" It also supports batch invoicing methods that can be configured by\n"
+" partners and sales orders, examples:\n"
+" * daily invoicing,\n"
+" * monthly invoicing, ...\n"
+"\n"
+" Some statistics by journals are provided.\n"
+" "
msgstr ""
=== modified file 'sale_layout/i18n/sale_layout.pot'
--- sale_layout/i18n/sale_layout.pot 2010-12-03 15:55:33 +0000
+++ sale_layout/i18n/sale_layout.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:31+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:31+0000\n"
+"POT-Creation-Date: 2010-12-10 12:33:44+0000\n"
+"PO-Revision-Date: 2010-12-10 12:33:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -71,6 +71,11 @@
msgstr ""
#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr ""
+
+#. module: sale_layout
#: selection:sale.order.line,layout_type:0
msgid "Product"
msgstr ""
@@ -141,8 +146,8 @@
msgstr ""
#. module: sale_layout
-#: report:sale.order.layout:0
-msgid "Fax :"
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
msgstr ""
#. module: sale_layout
@@ -221,8 +226,16 @@
msgstr ""
#. module: sale_layout
-#: view:sale.order:0
-msgid "States"
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid "\n"
+" This module provides features to improve the layout of the Sales Order.\n"
+"\n"
+" It gives you the possibility to\n"
+" * order all the lines of an sale order\n"
+" * add titles, comment lines, sub total lines\n"
+" * draw horizontal lines and put page breaks\n"
+"\n"
+" "
msgstr ""
#. module: sale_layout
@@ -246,8 +259,8 @@
msgstr ""
#. module: sale_layout
-#: selection:sale.order.line,layout_type:0
-msgid "Page Break"
+#: report:sale.order.layout:0
+msgid "Fax :"
msgstr ""
#. module: sale_layout
=== modified file 'sale_margin/i18n/sale_margin.pot'
--- sale_margin/i18n/sale_margin.pot 2010-12-03 15:55:33 +0000
+++ sale_margin/i18n/sale_margin.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:31+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:31+0000\n"
+"POT-Creation-Date: 2010-12-10 12:33:56+0000\n"
+"PO-Revision-Date: 2010-12-10 12:33:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -52,8 +52,11 @@
msgstr ""
#. module: sale_margin
-#: view:stock.picking:0
-msgid "Create Invoice"
+#: model:ir.module.module,description:sale_margin.module_meta_information
+msgid " \n"
+" This module adds the 'Margin' on sales order,\n"
+" which gives the profitability by calculating the difference between the Unit Price and Cost Price\n"
+" "
msgstr ""
#. module: sale_margin
@@ -266,6 +269,11 @@
msgstr ""
#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice Report"
+msgstr ""
+
+#. module: sale_margin
#: model:ir.model,name:sale_margin.model_account_invoice_line
msgid "Invoice Line"
msgstr ""
@@ -287,8 +295,8 @@
msgstr ""
#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
-msgid "Invoice Report"
+#: view:stock.picking:0
+msgid "Create Invoice"
msgstr ""
#. module: sale_margin
=== modified file 'sale_mrp/i18n/sale_mrp.pot'
--- sale_mrp/i18n/sale_mrp.pot 2010-12-03 15:55:33 +0000
+++ sale_mrp/i18n/sale_mrp.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:31+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:31+0000\n"
+"POT-Creation-Date: 2010-12-10 12:34:17+0000\n"
+"PO-Revision-Date: 2010-12-10 12:34:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,16 @@
msgstr ""
#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid "\n"
+" This module provides facility to the user to install mrp and sale modules\n"
+" at a time. It is basically used when we want to keep track of production\n"
+" orders generated from sales order.\n"
+" It adds sales name and sales Reference on production order\n"
+" "
+msgstr ""
+
+#. module: sale_mrp
#: field:mrp.production,sale_ref:0
msgid "Sale Reference"
msgstr ""
=== modified file 'sale_order_dates/i18n/sale_order_dates.pot'
--- sale_order_dates/i18n/sale_order_dates.pot 2010-12-03 15:55:33 +0000
+++ sale_order_dates/i18n/sale_order_dates.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:32+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:32+0000\n"
+"POT-Creation-Date: 2010-12-10 12:34:31+0000\n"
+"PO-Revision-Date: 2010-12-10 12:34:31+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -55,3 +55,10 @@
msgid "Requested Date"
msgstr ""
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid "\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+""
+msgstr ""
+
=== modified file 'share/i18n/share.pot'
--- share/i18n/share.pot 2010-12-03 15:55:33 +0000
+++ share/i18n/share.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:32+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:32+0000\n"
+"POT-Creation-Date: 2010-12-10 12:34:50+0000\n"
+"PO-Revision-Date: 2010-12-10 12:34:50+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,12 @@
"Plural-Forms: \n"
#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "To access it, you can go to the following URL: %s"
+msgstr ""
+
+#. module: share
#: code:addons/share/web/editors.py:0
#, python-format
msgid "Sharing"
@@ -24,8 +30,7 @@
#. module: share
#: code:addons/share/wizard/share_wizard.py:0
#, python-format
-msgid "This additional data has been automatically added to your current access.\n"
-""
+msgid "You may use your existing login and password to view it. As a reminder, your login is %s."
msgstr ""
#. module: share
@@ -44,37 +49,23 @@
msgstr ""
#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "This additional data has been automatically added to your current access."
+msgstr ""
+
+#. module: share
#: sql_constraint:res.users:0
msgid "You can not have two users with the same login !"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
-#, python-format
-msgid "Sharing Wizard - Step 1"
-msgstr ""
-
-#. module: share
-#: view:share.wizard:0
-msgid "Who would you want to share this data with?"
-msgstr ""
-
-#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
-#, python-format
-msgid "Dear,\n"
-"\n"
-""
-msgstr ""
-
-#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
-#, python-format
-msgid "You may use your existing login and password to view it. As a reminder, your login is %s.\n"
-""
-msgstr ""
-
-#. module: share
#: model:ir.model,name:share.model_res_users
msgid "res.users"
msgstr ""
@@ -128,6 +119,12 @@
msgstr ""
#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sorry, the current screen and filter you are trying to share are not supported at the moment.You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
#: selection:share.wizard,access_mode:0
msgid "Read & Write"
msgstr ""
@@ -177,13 +174,6 @@
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
-#, python-format
-msgid "This username (%s) already exists, perhaps data has already been shared with this person.\n"
-"You may want to try selecting existing shared users instead."
-msgstr ""
-
-#. module: share
#: field:share.wizard,new_users:0
msgid "New users"
msgstr ""
@@ -195,6 +185,12 @@
msgstr ""
#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Dear, %s"
+msgstr ""
+
+#. module: share
#: selection:share.wizard,user_type:0
msgid "New users (emails required)"
msgstr ""
@@ -244,6 +240,11 @@
msgstr ""
#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr ""
+
+#. module: share
#: field:share.wizard,user_type:0
msgid "Users to share with"
msgstr ""
@@ -265,11 +266,6 @@
msgstr ""
#. module: share
-#: model:ir.model,name:share.model_share_wizard_user
-msgid "share.wizard.user"
-msgstr ""
-
-#. module: share
#: view:share.wizard:0
msgid "Please select the action that opens the screen containing the data you want to share."
msgstr ""
@@ -314,6 +310,24 @@
msgstr ""
#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid "\n"
+"\n"
+" This module adds generic sharing tools to your current OpenERP database,\n"
+" and specifically a 'share' button that is available in the Web client to\n"
+" share any kind of OpenERP data with colleagues, customers, friends, etc.\n"
+"\n"
+" The system will work by creating new users and groups on the fly, and by\n"
+" combining the appropriate access rights and ir.rules to ensure that the\n"
+" shared users only have access to the data that has been shared with them.\n"
+"\n"
+" This is extremely useful for collaborative work, knowledge sharing, \n"
+" synchronization with other companies, etc.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: share
#: code:addons/share/wizard/share_wizard.py:0
#, python-format
msgid "The current user must have an email address configured in User Preferences to be able to send outgoing emails."
@@ -335,27 +349,24 @@
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
-#, python-format
-msgid "Sorry, the current screen and filter you are trying to share are not supported at the moment.\n"
-"You may want to try a simpler filter."
-msgstr ""
-
-#. module: share
#: field:share.wizard,access_mode:0
msgid "Access Mode"
msgstr ""
#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "This username (%s) already exists, perhaps data has already been shared with this person.You may want to try selecting existing shared users instead."
+msgstr ""
+
+#. module: share
#: view:share.wizard:0
msgid "Access info"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
-#, python-format
-msgid "To access it, you can go to the following URL:\n"
-" %s"
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
msgstr ""
#. module: share
=== modified file 'share/wizard/share_wizard.py'
--- share/wizard/share_wizard.py 2010-11-23 21:52:42 +0000
+++ share/wizard/share_wizard.py 2010-12-11 04:13:59 +0000
@@ -100,7 +100,7 @@
existing = user_obj.search(cr, 1, [('login', '=', new_user)])
if existing:
raise osv.except_osv(_('User already exists'),
- _('This username (%s) already exists, perhaps data has already been shared with this person.\nYou may want to try selecting existing shared users instead.'))
+ _('This username (%s) already exists, perhaps data has already been shared with this person.You may want to try selecting existing shared users instead.'))
user_id = user_obj.create(cr, 1, {
'login': new_user,
'password': generate_random_pass(),
@@ -283,7 +283,7 @@
except Exception:
self.__logger.exception('Failed to create share access')
raise osv.except_osv(_('Sharing access could not be setup'),
- _('Sorry, the current screen and filter you are trying to share are not supported at the moment.\nYou may want to try a simpler filter.'))
+ _('Sorry, the current screen and filter you are trying to share are not supported at the moment.You may want to try a simpler filter.'))
def _create_result_lines(self, cr, uid, wizard_data, context=None):
user_obj = self.pool.get('res.users')
@@ -422,8 +422,8 @@
for result_line in wizard_data.result_line_ids:
email_to = result_line.login
subject = _('%s has shared OpenERP %s information with you') % (user.name, wizard_data.action_id.name)
- body = _("Dear,\n\n") + subject + "\n\n"
- body += _("To access it, you can go to the following URL:\n %s") % wizard_data.share_root_url
+ body = _("Dear, %s") % ('\n\n' + subject + '\n\n')
+ body += _("To access it, you can go to the following URL: %s") % ('\n' + wizard_data.share_root_url)
body += "\n\n"
if result_line.newly_created:
body += _("You may use the following login and password to get access to this protected area:") + "\n"
@@ -431,8 +431,8 @@
body += "%s: %s" % (_("Password"), result_line.password) + "\n"
body += "%s: %s" % (_("Database"), cr.dbname) + "\n"
else:
- body += _("This additional data has been automatically added to your current access.\n")
- body += _("You may use your existing login and password to view it. As a reminder, your login is %s.\n") % result_line.login
+ body += _("This additional data has been automatically added to your current access.") + "\n"
+ body += _("You may use your existing login and password to view it. As a reminder, your login is %s.") % ('\n' + result_line.login)
if not tools.email_send(
user.user_email,
=== modified file 'stock/i18n/stock.pot'
--- stock/i18n/stock.pot 2010-12-03 15:55:33 +0000
+++ stock/i18n/stock.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:35+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:35+0000\n"
+"POT-Creation-Date: 2010-12-10 12:35:05+0000\n"
+"PO-Revision-Date: 2010-12-10 12:35:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -54,6 +54,11 @@
msgstr ""
#. module: stock
+#: sql_constraint:stock.production.lot:0
+msgid "The combination of serial number and internal reference must be unique!"
+msgstr ""
+
+#. module: stock
#: model:ir.actions.act_window,name:stock.action_stock_line_date
#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
msgid "Last Product Inventories"
@@ -137,12 +142,6 @@
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form
-#: model:ir.ui.menu,name:stock.menu_action_inventory_form
-msgid "Physical Inventories"
-msgstr ""
-
-#. module: stock
#: field:product.category,property_stock_journal:0
#: view:report.stock.move:0
#: field:stock.change.standard.price,stock_journal:0
@@ -160,9 +159,8 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Missing partial picking data for move #%s"
+#: help:stock.move,address_id:0
+msgid "Optional address where goods are to be delivered, specifically used for allotment"
msgstr ""
#. module: stock
@@ -200,8 +198,8 @@
msgstr ""
#. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_configuration
-msgid "Configuration"
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
msgstr ""
#. module: stock
@@ -244,6 +242,12 @@
msgstr ""
#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot cancel picking because stock move is in done state!"
+msgstr ""
+
+#. module: stock
#: model:ir.model,name:stock.model_stock_move_split_lines
msgid "Split lines"
msgstr ""
@@ -251,12 +255,6 @@
#. module: stock
#: code:addons/stock/stock.py:0
#, python-format
-msgid "You cannot cancel picking because stock move is in done state !"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
msgid "Warning!"
msgstr ""
@@ -567,8 +565,14 @@
msgstr ""
#. module: stock
-#: view:report.stock.move:0
-msgid "Outgoing"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Inventory '%s' is done"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
msgstr ""
#. module: stock
@@ -679,12 +683,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "is consumed with"
-msgstr ""
-
-#. module: stock
#: help:stock.move,prodlot_id:0
msgid "Production lot is used to put a serial number on the production"
msgstr ""
@@ -761,6 +759,12 @@
msgstr ""
#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Qty"
+msgstr ""
+
+#. module: stock
#: view:stock.location:0
msgid "Stock Locations"
msgstr ""
@@ -818,11 +822,6 @@
msgstr ""
#. module: stock
-#: help:stock.move,address_id:0
-msgid "Optional address where goods are to be delivered, specifically used for allotment"
-msgstr ""
-
-#. module: stock
#: view:report.stock.move:0
msgid "Month-1"
msgstr ""
@@ -833,6 +832,12 @@
msgstr ""
#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Do not Found Partial data of Stock Move Line :%s"
+msgstr ""
+
+#. module: stock
#: model:ir.actions.report.xml,name:stock.report_picking_list
msgid "Packing list"
msgstr ""
@@ -871,12 +876,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid "There is no stock output account defined for this product: \"%s\" (id: %d)"
-msgstr ""
-
-#. module: stock
#: field:product.template,property_stock_production:0
msgid "Production Location"
msgstr ""
@@ -887,21 +886,8 @@
msgstr ""
#. module: stock
-#: model:res.company,overdue_msg:stock.res_company_tinyshop0
-msgid "\n"
-"Date: %(date)s\n"
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Please find in attachment a reminder of all your unpaid invoices, for a total amount due of:\n"
-"\n"
-"%(followup_amount).2f %(company_currency)s\n"
-"\n"
-"Thanks,\n"
-"--\n"
-"%(user_signature)s\n"
-"%(company_name)s\n"
-" "
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
msgstr ""
#. module: stock
@@ -988,15 +974,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#: field:stock.inventory.line,product_uom:0
-#: field:stock.move.consume,product_uom:0
-#: field:stock.move.scrap,product_uom:0
-#, python-format
-msgid "Product UOM"
-msgstr ""
-
-#. module: stock
#: model:stock.location,name:stock.stock_location_locations_partner
msgid "Partner Locations"
msgstr ""
@@ -1029,9 +1006,15 @@
msgstr ""
#. module: stock
-#: help:stock.location,chained_auto_packing:0
-msgid "This is used only if you select a chained location type.\n"
-"The 'Automatic Move' value will create a stock move after the current one that will be validated automatically. With 'Manual Operation', the stock move has to be validated by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "were scrapped"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Insufficient Stock in Lot!"
msgstr ""
#. module: stock
@@ -1180,6 +1163,12 @@
msgstr ""
#. module: stock
+#: model:res.company,overdue_msg:stock.res_company_shop0
+#: model:res.company,overdue_msg:stock.res_company_tinyshop0
+msgid "Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting department"
+msgstr ""
+
+#. module: stock
#: field:stock.inventory,date:0
#: field:stock.move,create_date:0
#: field:stock.production.lot,date:0
@@ -1327,12 +1316,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "were scrapped"
-msgstr ""
-
-#. module: stock
#: view:stock.move:0
#: view:stock.picking:0
msgid "Partial"
@@ -1516,12 +1499,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "You can not remove a lot line !"
-msgstr ""
-
-#. module: stock
#: model:ir.model,name:stock.model_stock_move_scrap
#: view:stock.move:0
#: view:stock.move.scrap:0
@@ -1530,12 +1507,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "You cannot remove the picking which is in %s state !"
-msgstr ""
-
-#. module: stock
#: view:stock.inventory.line.split:0
#: view:stock.move.consume:0
#: view:stock.move.scrap:0
@@ -1788,17 +1759,17 @@
msgstr ""
#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Product '%s' is consumed with '%s'"
+msgstr ""
+
+#. module: stock
#: selection:stock.location,chained_auto_packing:0
msgid "Automatic No Step Added"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Product "
-msgstr ""
-
-#. module: stock
#: view:stock.location.product:0
msgid "Stock Location Analysis"
msgstr ""
@@ -1809,11 +1780,6 @@
msgstr ""
#. module: stock
-#: field:report.stock.lines.date,date:0
-msgid "Latest Inventory Date"
-msgstr ""
-
-#. module: stock
#: view:report.stock.inventory:0
#: view:report.stock.move:0
#: view:stock.inventory:0
@@ -1851,17 +1817,17 @@
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid "Products: "
-msgstr ""
-
-#. module: stock
#: help:product.product,track_production:0
msgid "Forces to specify a Production Lot for all moves containing this product and generated by a Manufacturing Order"
msgstr ""
#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Products:"
+msgstr ""
+
+#. module: stock
#: model:ir.actions.act_window,name:stock.track_line_old
#: view:stock.move.track:0
msgid "Tracking a move"
@@ -1926,9 +1892,9 @@
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid "Future Qty"
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
msgstr ""
#. module: stock
@@ -2075,13 +2041,11 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
#: model:ir.model,name:stock.model_stock_inventory
#: selection:report.stock.inventory,location_type:0
#: field:stock.inventory.line,inventory_id:0
#: report:stock.inventory.move:0
#: selection:stock.location,usage:0
-#, python-format
msgid "Inventory"
msgstr ""
@@ -2091,11 +2055,6 @@
msgstr ""
#. module: stock
-#: sql_constraint:stock.production.lot:0
-msgid "The combination of serial number and internal reference must be unique !"
-msgstr ""
-
-#. module: stock
#: code:addons/stock/wizard/stock_partial_picking.py:0
#, python-format
msgid "Currency in which Unit Cost is expressed"
@@ -2119,7 +2078,6 @@
#. module: stock
#: code:addons/stock/report/report_stock.py:0
-#: code:addons/stock/stock.py:0
#, python-format
msgid "Error !"
msgstr ""
@@ -2333,6 +2291,12 @@
msgstr ""
#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Please provide Proper Quantity!"
+msgstr ""
+
+#. module: stock
#: report:stock.picking.list:0
msgid "Contact Address :"
msgstr ""
@@ -2360,12 +2324,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Error, no partner !"
-msgstr ""
-
-#. module: stock
#: model:ir.actions.act_window,name:stock.action_incoterms_tree
#: model:ir.model,name:stock.model_stock_incoterms
#: view:stock.incoterms:0
@@ -2390,8 +2348,8 @@
msgstr ""
#. module: stock
-#: field:stock.move.track,tracking_prefix:0
-msgid "Tracking prefix"
+#: help:stock.location,chained_auto_packing:0
+msgid "This is used only if you select a chained location type.The 'Automatic Move' value will create a stock move after the current one that will be validated automatically. With 'Manual Operation', the stock move has to be validated by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
msgstr ""
#. module: stock
@@ -2494,6 +2452,12 @@
msgstr ""
#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can not remove a lot line!"
+msgstr ""
+
+#. module: stock
#: view:stock.move:0
msgid "To Do"
msgstr ""
@@ -2560,9 +2524,9 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/product.py:0
#, python-format
-msgid "Please provide Proper Quantity !"
+msgid "There is no stock output account defined for this product: \"%s\" (id: %d)"
msgstr ""
#. module: stock
@@ -2593,9 +2557,12 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
#, python-format
-msgid "Insufficient Stock in Lot !"
+msgid "Product UOM"
msgstr ""
#. module: stock
@@ -2730,6 +2697,12 @@
msgstr ""
#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
+#. module: stock
#: view:stock.picking:0
msgid "To Invoice"
msgstr ""
@@ -2887,6 +2860,12 @@
msgstr ""
#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Error, no partner!"
+msgstr ""
+
+#. module: stock
#: help:res.partner,property_stock_customer:0
msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"
msgstr ""
@@ -2987,8 +2966,8 @@
msgstr ""
#. module: stock
-#: view:report.stock.lines.date:0
-msgid "Non Inv"
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
msgstr ""
#. module: stock
@@ -3015,8 +2994,8 @@
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.stock_location_customers
-msgid "Customers"
+#: view:report.stock.move:0
+msgid "Outgoing"
msgstr ""
#. module: stock
@@ -3391,12 +3370,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "quantity."
-msgstr ""
-
-#. module: stock
#: model:ir.model,name:stock.model_stock_move_memory
msgid "stock.move.memory"
msgstr ""
@@ -3543,7 +3516,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
#: code:addons/stock/wizard/stock_return_picking.py:0
#, python-format
@@ -3566,6 +3538,11 @@
msgstr ""
#. module: stock
+#: field:stock.move.track,tracking_prefix:0
+msgid "Tracking prefix"
+msgstr ""
+
+#. module: stock
#: help:stock.move,move_dest_id:0
msgid "Optional: next stock move when chaining them"
msgstr ""
=== modified file 'stock/product.py'
--- stock/product.py 2010-11-24 11:54:23 +0000
+++ stock/product.py 2010-12-11 04:13:59 +0000
@@ -171,7 +171,7 @@
res = super(product_product, self).view_header_get(cr, user, view_id, view_type, context)
if res: return res
if (context.get('active_id', False)) and (context.get('active_model') == 'stock.location'):
- return _('Products: ')+self.pool.get('stock.location').browse(cr, user, context['active_id'], context).name
+ return _('Products:')+self.pool.get('stock.location').browse(cr, user, context['active_id'], context).name
return res
def get_product_available(self, cr, uid, ids, context=None):
=== modified file 'stock/stock.py'
--- stock/stock.py 2010-11-26 16:13:59 +0000
+++ stock/stock.py 2010-12-11 04:13:59 +0000
@@ -180,11 +180,7 @@
[('auto', 'Automatic Move'), ('manual', 'Manual Operation'), ('transparent', 'Automatic No Step Added')],
'Chaining Type',
required=True,
- help="This is used only if you select a chained location type.\n" \
- "The 'Automatic Move' value will create a stock move after the current one that will be "\
- "validated automatically. With 'Manual Operation', the stock move has to be validated "\
- "by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
- ),
+ help="This is used only if you select a chained location type.The 'Automatic Move' value will create a stock move after the current one that will be validated automatically. With 'Manual Operation', the stock move has to be validated by a worker. With 'Automatic No Step Added', the location is replaced in the original move."),
'chained_picking_type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', help="Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."),
'chained_company_id': fields.many2one('res.company', 'Chained Company', help='The company the Picking List containing the chained move will belong to (leave empty to use the default company determination rules'),
'chained_delay': fields.integer('Chaining Lead Time',help="Delay between original move and chained move in days"),
@@ -500,7 +496,7 @@
return res
def unlink(self, cr, uid, ids, context=None):
- raise osv.except_osv(_('Error'), _('You can not remove a lot line !'))
+ raise osv.except_osv(_('Error'), _('You can not remove a lot line!'))
def action_traceability(self, cr, uid, ids, context={}):
""" It traces the information of a product
@@ -719,7 +715,7 @@
for pick in self.browse(cr, uid, ids):
move_ids = [x.id for x in pick.move_lines if x.state == 'confirmed']
if not move_ids:
- raise osv.except_osv(_('Warning !'),_('Not enough stock, unable to reserve the products.'))
+ raise osv.except_osv(_('Warning!'),_('Not enough stock, unable to reserve the products.'))
self.pool.get('stock.move').action_assign(cr, uid, move_ids)
return True
@@ -741,7 +737,7 @@
wf_service = netsvc.LocalService("workflow")
for pick in self.browse(cr, uid, ids):
if not pick.move_lines:
- raise osv.except_osv(_('Error !'),_('You can not process picking without stock moves'))
+ raise osv.except_osv(_('Error!'),_('You can not process picking without stock moves'))
wf_service.trg_validate(uid, 'stock.picking', pick.id,
'button_confirm', cr)
return True
@@ -971,7 +967,7 @@
payment_term_id = False
partner = picking.address_id and picking.address_id.partner_id
if not partner:
- raise osv.except_osv(_('Error, no partner !'),
+ raise osv.except_osv(_('Error, no partner!'),
_('Please put a partner on the picking list if you want to generate invoice.'))
if not inv_type:
@@ -1116,7 +1112,7 @@
return True
for move in pick.move_lines:
if move.state == 'done':
- raise osv.except_osv(_('Error'), _('You cannot cancel picking because stock move is in done state !'))
+ raise osv.except_osv(_('Error'), _('You cannot cancel picking because stock move is in done state!'))
return True
def unlink(self, cr, uid, ids, context=None):
move_obj = self.pool.get('stock.move')
@@ -1124,7 +1120,7 @@
context = {}
for pick in self.browse(cr, uid, ids, context=context):
if pick.state in ['done','cancel']:
- raise osv.except_osv(_('Error'), _('You cannot remove the picking which is in %s state !')%(pick.state,))
+ raise osv.except_osv(_('Error'), _('You cannot remove the picking which is in %s state!')%(pick.state,))
elif pick.state in ['confirmed','assigned', 'draft']:
ids2 = [move.id for move in pick.move_lines]
ctx = context.copy()
@@ -1165,7 +1161,7 @@
if move.state in ('done', 'cancel'):
continue
partial_data = partial_datas.get('move%s'%(move.id), False)
- assert partial_data, _('Missing partial picking data for move #%s') % (move.id)
+ assert partial_data, (_('Do not Found Partial data of Stock Move Line :%s') %(move.id))
product_qty = partial_data.get('product_qty',0.0)
move_product_qty[move.id] = product_qty
product_uom = partial_data.get('product_uom',False)
@@ -1390,7 +1386,7 @@
'product_id': lambda x, y, z, c: c.get('product_id', False),
}
_sql_constraints = [
- ('name_ref_uniq', 'unique (name, ref)', 'The combination of serial number and internal reference must be unique !'),
+ ('name_ref_uniq', 'unique (name, ref)', 'The combination of serial number and internal reference must be unique!'),
]
def action_traceability(self, cr, uid, ids, context={}):
""" It traces the information of a product
@@ -1610,7 +1606,7 @@
warning = {}
if (location.usage == 'internal') and (product_qty > (prodlot.stock_available or 0.0)):
warning = {
- 'title': _('Insufficient Stock in Lot !'),
+ 'title': _('Insufficient Stock in Lot!'),
'message': _('You are moving %.2f products but only %.2f available in this lot.') % (product_qty, prodlot.stock_available or 0.0)
}
return {'warning': warning}
@@ -2181,7 +2177,7 @@
if context is None:
context = {}
if quantity <= 0:
- raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
+ raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity!'))
res = []
@@ -2241,7 +2237,7 @@
if context is None:
context = {}
if quantity <= 0:
- raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
+ raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity!'))
res = []
for move in self.browse(cr, uid, ids, context=context):
@@ -2292,7 +2288,7 @@
product_obj = self.pool.get('product.product')
for new_move in self.browse(cr, uid, res, context=context):
for (id, name) in product_obj.name_get(cr, uid, [new_move.product_id.id]):
- message = _('Product ') + " '" + name + "' "+ _("is consumed with") + " '" + str(new_move.product_qty) + "' "+ _("quantity.")
+ message = (_("Product '%s' is consumed with '%s'") %(name,str(new_move.product_qty)))
self.log(cr, uid, new_move.id, message)
self.action_done(cr, uid, res)
@@ -2322,7 +2318,7 @@
if move.state in ('done', 'cancel'):
continue
partial_data = partial_datas.get('move%s'%(move.id), False)
- assert partial_data, _('Missing partial picking data for move #%s') % (move.id)
+ assert partial_data, (_('Do not Found Partial data of Stock Move Line :%s') %(move.id))
product_qty = partial_data.get('product_qty',0.0)
move_product_qty[move.id] = product_qty
product_uom = partial_data.get('product_uom',False)
@@ -2496,7 +2492,7 @@
'product_qty': line.product_qty
})
move_ids.append(self._inventory_line_hook(cr, uid, line, value))
- message = _('Inventory') + " '" + inv.name + "' "+ _("is done.")
+ message = _("Inventory '%s' is done") % inv.name
self.log(cr, uid, inv.id, message)
self.write(cr, uid, [inv.id], {'state': 'confirm', 'move_ids': [(6, 0, move_ids)]})
return True
=== modified file 'stock_invoice_directly/i18n/stock_invoice_directly.pot'
--- stock_invoice_directly/i18n/stock_invoice_directly.pot 2010-12-03 15:55:33 +0000
+++ stock_invoice_directly/i18n/stock_invoice_directly.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:35+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:35+0000\n"
+"POT-Creation-Date: 2010-12-10 12:35:19+0000\n"
+"PO-Revision-Date: 2010-12-10 12:35:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,14 @@
msgstr ""
#. module: stock_invoice_directly
+#: model:ir.module.module,description:stock_invoice_directly.module_meta_information
+msgid "\n"
+" When you send or deliver goods, this module automatically launch\n"
+" the invoicing wizard if the delivery is to be invoiced.\n"
+" "
+msgstr ""
+
+#. module: stock_invoice_directly
#: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
msgid "Invoice Picking Directly"
msgstr ""
=== modified file 'stock_location/i18n/stock_location.pot'
--- stock_location/i18n/stock_location.pot 2010-12-03 15:55:33 +0000
+++ stock_location/i18n/stock_location.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:36+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:36+0000\n"
+"POT-Creation-Date: 2010-12-10 12:35:44+0000\n"
+"PO-Revision-Date: 2010-12-10 12:35:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -97,9 +97,8 @@
msgstr ""
#. module: stock_location
-#: help:stock.location.path,auto:0
-msgid "This is used to define paths the product has to follow within the location tree.\n"
-"The 'Automatic Move' value will create a stock move after the current one that will be validated automatically. With 'Manual Operation', the stock move has to be validated by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
+#: help:product.pulled.flow,name:0
+msgid "This field will fill the packing Origin and the name of its moves"
msgstr ""
#. module: stock_location
@@ -205,8 +204,67 @@
msgstr ""
#. module: stock_location
-#: help:product.pulled.flow,name:0
-msgid "This field will fill the packing Origin and the name of its moves"
+#: model:ir.module.module,description:stock_location.module_meta_information
+msgid "\n"
+"This module supplements the Warehouse application by adding support for per-product\n"
+"location paths, effectively implementing Push and Pull inventory flows.\n"
+"\n"
+"Typically this could be used to:\n"
+"* Manage product manufacturing chains\n"
+"* Manage default locations per product\n"
+"* Define routes within your warehouse according to business needs, such as:\n"
+" - Quality Control\n"
+" - After Sales Services\n"
+" - Supplier Returns\n"
+"* Help rental management, by generating automated return moves for rented products\n"
+"\n"
+"Once this module is installed, an additional tab appear on the product form, where you can add\n"
+"Push and Pull flow specifications. The demo data of CPU1 product for that push/pull :\n"
+"\n"
+"Push flows\n"
+"----------\n"
+"Push flows are useful when the arrival of certain products in a given location should always\n"
+"be followed by a corresponding move to another location, optionally after a certain delay.\n"
+"The original Warehouse application already supports such Push flow specifications on the\n"
+"Locations themselves, but these cannot be refined per-product.\n"
+"\n"
+"A push flow specification indicates which location is chained with which location, and with\n"
+"what parameters. As soon as a given quantity of products is moved in the source location,\n"
+"a chained move is automatically foreseen according to the parameters set on the flow specification\n"
+"(destination location, delay, type of move, journal, etc.) The new move can be automatically\n"
+"processed, or require a manual confirmation, depending on the parameters.\n"
+"\n"
+"Pull flows\n"
+"----------\n"
+"Pull flows are a bit different from Pull flows, in the sense that they are not related to\n"
+"the processing of product moves, but rather to the processing of procurement orders.\n"
+"What is being pulled is a need, not directly products.\n"
+"A classical example of Push flow is when you have an Outlet company, with a parent Company\n"
+"that is responsible for the supplies of the Outlet.\n"
+"\n"
+" [ Customer ] <- A - [ Outlet ] <- B - [ Holding ] <~ C ~ [ Supplier ]\n"
+"\n"
+"When a new procurement order (A, coming from the confirmation of a Sale Order for example) arrives\n"
+"in the Outlet, it is converted into another procurement (B, via a Push flow of type 'move')\n"
+"requested from the Holding. When procurement order B is processed by the Holding company, and\n"
+"if the product is out of stock, it can be converted into a Purchase Order (C) from the Supplier\n"
+"(Push flow of type Purchase). The result is that the procurement order, the need, is pushed\n"
+"all the way between the Customer and Supplier.\n"
+"\n"
+"Technically, Pull flows allow to process procurement orders differently, not only depending on\n"
+"the product being considered, but also depending on which location holds the \"need\" for that\n"
+"product (i.e. the destination location of that procurement order).\n"
+"\n"
+"Use-Case\n"
+"--------\n"
+"\n"
+"You can use the demo data as follow:\n"
+" CPU1: Sell some CPU1 from Shop 1 and run the scheduler\n"
+" - Warehouse: delivery order, Shop 1: reception\n"
+" CPU3:\n"
+" - When receiving the product, it goes to Quality Control location then stored to shelf 2.\n"
+" - When delivering the customer: Pick List -> Packing -> Delivery Order from Gate A\n"
+" "
msgstr ""
#. module: stock_location
@@ -262,6 +320,11 @@
msgstr ""
#. module: stock_location
+#: help:stock.location.path,auto:0
+msgid "This is used to define paths the product has to follow within the location tree.The 'Automatic Move' value will create a stock move after the current one that will be validated automatically. With 'Manual Operation', the stock move has to be validatedby a worker. With 'Automatic No Step Added', the location is replaced in the original move."
+msgstr ""
+
+#. module: stock_location
#: field:stock.location.path,product_id:0
msgid "Products"
msgstr ""
=== modified file 'stock_location/stock_location.py'
--- stock_location/stock_location.py 2010-11-27 20:16:16 +0000
+++ stock_location/stock_location.py 2010-12-11 04:13:59 +0000
@@ -45,10 +45,7 @@
[('auto','Automatic Move'), ('manual','Manual Operation'),('transparent','Automatic No Step Added')],
'Automatic Move',
required=True, select=1,
- help="This is used to define paths the product has to follow within the location tree.\n" \
- "The 'Automatic Move' value will create a stock move after the current one that will be "\
- "validated automatically. With 'Manual Operation', the stock move has to be validated "\
- "by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
+ help="This is used to define paths the product has to follow within the location tree.The 'Automatic Move' value will create a stock move after the current one that will be validated automatically. With 'Manual Operation', the stock move has to be validatedby a worker. With 'Automatic No Step Added', the location is replaced in the original move."
),
}
_defaults = {
=== modified file 'stock_no_autopicking/i18n/stock_no_autopicking.pot'
--- stock_no_autopicking/i18n/stock_no_autopicking.pot 2010-12-03 15:55:33 +0000
+++ stock_no_autopicking/i18n/stock_no_autopicking.pot 2010-12-11 04:13:59 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-12-03 15:44:36+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:36+0000\n"
+"POT-Creation-Date: 2010-12-10 12:35:54+0000\n"
+"PO-Revision-Date: 2010-12-10 12:35:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,19 @@
msgstr ""
#. module: stock_no_autopicking
+#: model:ir.module.module,description:stock_no_autopicking.module_meta_information
+msgid "\n"
+" This module allows an intermediate pickin
