openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00719
[Merge] lp:~openerp-dev/openobject-addons/ssi-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1
ssi (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/ssi-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
Requested reviews:
Harry (Open ERP) (hmo-tinyerp)
Numérigraphe (numerigraphe)
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,
I have fixed all suggested problems.
Kindly review
Thanks
ssi
--
https://code.launchpad.net/~openerp-dev/openobject-addons/ssi-dev-addons1/+merge/41705
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/ssi-dev-addons1.
=== modified file 'account/account.py'
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot 2010-11-18 16:25:12 +0000
+++ account/i18n/account.pot 2010-11-24 11:05:24 +0000
@@ -296,9 +296,8 @@
#. 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"
+msgid "Can't find any account journal of %s type for this company."
+"You can create one in the menu:"
"Configuration/Financial Accounting/Accounts/Journals."
msgstr ""
@@ -652,7 +651,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:0
#, python-format
-msgid "The statement balance is incorrect !\n"
+msgid "The statement balance is incorrect !"
""
msgstr ""
@@ -1322,7 +1321,7 @@
#. module: account
#: code:addons/account/invoice.py:0
#, python-format
-msgid "Cannot create the invoice !\n"
+msgid "Cannot create the invoice !"
"The payment term defined gives a computed amount greater than the total invoiced amount."
msgstr ""
@@ -1894,7 +1893,7 @@
#. module: account
#: code:addons/account/account.py:0
#, python-format
-msgid "There is no default default debit account defined \n"
+msgid "There is no default default debit account defined"
"on journal \"%s\""
msgstr ""
@@ -2097,9 +2096,9 @@
#. module: account
#: code:addons/account/invoice.py:0
#, python-format
-msgid "Can't find any account journal of %s type for this company.\n"
+msgid "Can't find any account journal of %s type for this company."
"\n"
-"You can create one in the menu: \n"
+"You can create one in the menu: "
"Configuration\\Financial Accounting\\Accounts\\Journals."
msgstr ""
@@ -2354,7 +2353,7 @@
#. module: account
#: help:account.journal,entry_posted:0
-msgid "Check this box if you don't want new journal entries to pass through the 'draft' state and instead goes directly to the 'posted state' without any manual validation. \n"
+msgid "Check this box if you don't want new journal entries to pass through the 'draft' state and instead goes directly to the 'posted state' without any manual validation."
"Note that journal entries that are automatically created by the system are always skipping that state."
msgstr ""
@@ -2542,7 +2541,7 @@
#. module: account
#: code:addons/account/account.py:0
#, python-format
-msgid "No fiscal year defined for this date !\n"
+msgid "No fiscal year defined for this date !"
"Please create one."
msgstr ""
@@ -2726,11 +2725,11 @@
#. module: account
#: help:account.account.type,close_method:0
-msgid "Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.\n"
+msgid "Set here the method that will be used to generate the end of year journal entries for all the accounts of this type."
"\n"
-" 'None' means that nothing will be done.\n"
-" 'Balance' will generally be used for cash accounts.\n"
-" 'Detail' will copy each existing journal item of the previous year, even the reconciled ones.\n"
+" 'None' means that nothing will be done."
+" 'Balance' will generally be used for cash accounts."
+" 'Detail' will copy each existing journal item of the previous year, even the reconciled ones."
" 'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."
msgstr ""
@@ -3101,7 +3100,7 @@
#. 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"
+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 ""
@@ -3628,7 +3627,7 @@
#. module: account
#: help:account.move.line,state:0
-msgid "When new move line is created the state will be 'Draft'.\n"
+msgid "When new move line is created the state will be 'Draft'."
"* When all the payments are done it will be in 'Valid' state."
msgstr ""
@@ -3683,7 +3682,7 @@
#. module: account
#: code:addons/account/invoice.py:0
#, python-format
-msgid "Tax base different !\n"
+msgid "Tax base different !"
"Click on compute to update tax base"
msgstr ""
@@ -3838,7 +3837,7 @@
#. module: account
#: code:addons/account/invoice.py:0
#, python-format
-msgid "Please verify the price of the invoice !\n"
+msgid "Please verify the price of the invoice !"
"The real total does not match the computed total."
msgstr ""
@@ -4142,7 +4141,7 @@
#. module: account
#: code:addons/account/account.py:0
#, python-format
-msgid "You can not modify a posted entry of this journal !\n"
+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 ""
@@ -4646,7 +4645,7 @@
#. module: account
#: code:addons/account/account.py:0
#, python-format
-msgid "There is no default default credit account defined \n"
+msgid "There is no default default credit account defined "
"on journal \"%s\""
msgstr ""
@@ -4910,7 +4909,7 @@
#. module: account
#: help:account.partner.reconcile.process,progress:0
-msgid "Shows you the progress made today on the reconciliation process. Given by \n"
+msgid "Shows you the progress made today on the reconciliation process. Given by"
"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
msgstr ""
@@ -5841,18 +5840,6 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "You can specify year, month and date in the name of the model using the following labels:\n"
-"\n"
-"%(year)s: To Specify Year \n"
-"%(month)s: To Specify Month \n"
-"%(date)s: Current Date\n"
-"\n"
-"e.g. My model on %(date)s"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_aged_income
msgid "Income Accounts"
msgstr ""
@@ -6056,23 +6043,22 @@
#. module: account
#: model:ir.module.module,description:account.module_meta_information
-msgid "Financial and accounting module that covers:\n"
-" General accountings\n"
-" Cost / Analytic accounting\n"
-" Third party accounting\n"
-" Taxes management\n"
-" Budgets\n"
-" Customer and Supplier Invoices\n"
-" Bank statements\n"
-" Reconciliation process by partner\n"
-" Creates a dashboard for accountants that includes:\n"
-" * List of uninvoiced quotations\n"
-" * Graph of aged receivables\n"
-" * Graph of aged incomes\n"
-"\n"
-"The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or\n"
-"grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a\n"
-"module named account_voucher.\n"
+msgid "Financial and accounting module that covers:"
+" General accountings"
+" Cost / Analytic accounting"
+" Third party accounting"
+" Taxes management"
+" Budgets"
+" Customer and Supplier Invoices"
+" Bank statements"
+" Reconciliation process by partner"
+" Creates a dashboard for accountants that includes:"
+" * List of uninvoiced quotations"
+" * Graph of aged receivables"
+" * Graph of aged incomes"
+"The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or"
+"grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a"
+"module named account_voucher."
" "
msgstr ""
@@ -7285,10 +7271,10 @@
#. module: account
#: help:account.invoice,state:0
-msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed Invoice. \n"
-"* The 'Pro-forma' when invoice is in Pro-forma state,invoice does not have an invoice number. \n"
-"* The 'Open' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \n"
-"* The 'Paid' state is set automatically when invoice is paid. \n"
+msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed Invoice."
+"* The 'Pro-forma' when invoice is in Pro-forma state,invoice does not have an invoice number."
+"* The 'Open' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice."
+"* The 'Paid' state is set automatically when invoice is paid."
"* The 'Cancelled' state is used when user cancel invoice."
msgstr ""
@@ -7776,7 +7762,7 @@
#. module: account
#: code:addons/account/wizard/account_move_bank_reconcile.py:0
#, python-format
-msgid "You have to define the bank account\n"
+msgid "You have to define the bank account"
"in the journal definition for reconciliation."
msgstr ""
@@ -7992,8 +7978,8 @@
#. 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"
+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 ""
@@ -8067,7 +8053,7 @@
#. 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"
+msgid "Maturity date of entry line generated by model line '%s' is based on partner payment term!"
"Please define partner on it!"
msgstr ""
@@ -8578,8 +8564,7 @@
#. module: account
#: code:addons/account/account_move_line.py:0
#, python-format
-msgid "Can not create an automatic sequence for this piece !\n"
-"\n"
+msgid "Can not create an automatic sequence for this piece !"
"Put a sequence in the journal definition for automatic numbering or create a sequence manually for this piece."
msgstr ""
=== modified file 'account_analytic_plans/i18n/account_analytic_plans.pot'
--- account_analytic_plans/i18n/account_analytic_plans.pot 2010-11-18 16:25:12 +0000
+++ account_analytic_plans/i18n/account_analytic_plans.pot 2010-11-24 11:05:24 +0000
@@ -339,35 +339,35 @@
#. 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"
-"are confirmed.\n"
-"\n"
-"For example, you can define the following analytic structure:\n"
-" Projects\n"
-" Project 1\n"
-" SubProj 1.1\n"
-" SubProj 1.2\n"
-" Project 2\n"
-" Salesman\n"
-" Eric\n"
-" Fabien\n"
-"\n"
-"Here, we have two plans: Projects and Salesman. An invoice line must\n"
-"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
-"Fabien. The amount can also be split. The following example is for\n"
-"an invoice that touches the two subproject and assigned to one salesman:\n"
-"\n"
-"Plan1:\n"
-" SubProject 1.1 : 50%\n"
-" SubProject 1.2 : 50%\n"
-"Plan2:\n"
-" Eric: 100%\n"
-"\n"
-"So when this line of invoice will be confirmed, it will generate 3 analytic lines,\n"
-"for one account entry.\n"
-"The analytic plan validates the minimum and maximum percentage at the time of creation\n"
-"of distribution models.\n"
+msgid "This module allows to use several analytic plans, according to the general journal,"
+"so that multiple analytic lines are created when the invoice or the entries"
+"are confirmed."
+"\n"
+"For example, you can define the following analytic structure:"
+" Projects"
+" Project 1"
+" SubProj 1.1"
+" SubProj 1.2"
+" Project 2"
+" Salesman"
+" Eric"
+" Fabien"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must"
+"be able to write analytic entries in the 2 plans: SubProj 1.1 and"
+"Fabien. The amount can also be split. The following example is for"
+"an invoice that touches the two subproject and assigned to one salesman:"
+"\n"
+"Plan1:"
+" SubProject 1.1 : 50%"
+" SubProject 1.2 : 50%"
+"Plan2:"
+" Eric: 100%"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic lines,"
+"for one account entry."
+"The analytic plan validates the minimum and maximum percentage at the time of creation"
+"of distribution models."
" "
msgstr ""
@@ -481,6 +481,12 @@
msgid "Start Date"
msgstr ""
+#. module: account
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0
+#, python-format
+msgid "There are no Analytic lines related to \"%s\" Account"
+msgstr ""
+
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "at"
=== 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-11-24 11:05:24 +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-11-18 16:25:12 +0000
+++ account_anglo_saxon/i18n/account_anglo_saxon.pot 2010-11-24 11:05:24 +0000
@@ -84,12 +84,12 @@
#. module: account_anglo_saxon
#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
-msgid "This module will support the Anglo-Saxons accounting methodology by\n"
-" changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries\n"
-" and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
-" Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at the moment the goods are shipped.\n"
-" This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account\n"
-" when the invoice is created to transfer this amount to the debtor or creditor account.\n"
+msgid "This module will support the Anglo-Saxons accounting methodology by"
+" changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries"
+" and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales."
+" Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at the moment the goods are shipped."
+" This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account"
+" when the invoice is created to transfer this amount to the debtor or creditor account."
" Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account"
msgstr ""
=== modified file 'account_budget/i18n/account_budget.pot'
--- account_budget/i18n/account_budget.pot 2010-11-18 16:25:12 +0000
+++ account_budget/i18n/account_budget.pot 2010-11-24 11:05:24 +0000
@@ -363,23 +363,17 @@
#. module: account_budget
#: model:ir.module.module,description:account_budget.module_meta_information
-msgid "This module allows accountants to manage analytic and crossovered budgets.\n"
-"\n"
-"Once the Master Budgets and the Budgets are defined (in Accounting/Budgets/),\n"
-"the Project Managers can set the planned amount on each Analytic Account.\n"
-"\n"
-"The accountant has the possibility to see the total of amount planned for each\n"
-"Budget and Master Budget in order to ensure the total planned is not\n"
-"greater/lower than what he planned for this Budget/Master Budget. Each list of\n"
-"record can also be switched to a graphical view of it.\n"
-"\n"
-"Three reports are available:\n"
-" 1. The first is available from a list of Budgets. It gives the spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
-"\n"
-" 2. The second is a summary of the previous one, it only gives the spreading, for the selected Budgets, of the Analytic Accounts.\n"
-"\n"
-" 3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts, of the Master Budgets per Budgets.\n"
-"\n"
+msgid "This module allows accountants to manage analytic and crossovered budgets."
+"Once the Master Budgets and the Budgets are defined (in Accounting/Budgets/),"
+"the Project Managers can set the planned amount on each Analytic Account."
+"The accountant has the possibility to see the total of amount planned for each"
+"Budget and Master Budget in order to ensure the total planned is not"
+"greater/lower than what he planned for this Budget/Master Budget. Each list of"
+"record can also be switched to a graphical view of it."
+"Three reports are available:"
+" 1. The first is available from a list of Budgets. It gives the spreading, for these Budgets, of the Analytic Accounts per Master Budgets."
+" 2. The second is a summary of the previous one, it only gives the spreading, for the selected Budgets, of the Analytic Accounts."
+" 3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts, of the Master Budgets per Budgets."
""
msgstr ""
=== modified file 'account_coda/i18n/account_coda.pot'
--- account_coda/i18n/account_coda.pot 2010-11-18 16:25:12 +0000
+++ account_coda/i18n/account_coda.pot 2010-11-24 11:05:24 +0000
@@ -169,7 +169,7 @@
#. 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"
+msgid "The bank account %s is not defined for the partner %s."
""
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-11-24 11:05:24 +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-11-18 16:25:12 +0000
+++ account_followup/i18n/account_followup.pot 2010-11-24 11:05:24 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:11:19+0000\n"
-"PO-Revision-Date: 2010-11-18 16:11:19+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:04+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,28 +27,6 @@
msgstr ""
#. module: account_followup
-#: model:ir.module.module,description:account_followup.module_meta_information
-msgid "\n"
-" Modules to automate letters for unpaid invoices, with multi-level recalls.\n"
-"\n"
-" You can define your multiple levels of recall through the menu:\n"
-" Accounting/Configuration/Miscellaneous/Follow-Ups\n"
-"\n"
-" Once it is defined, you can automatically print recalls every day\n"
-" through simply clicking on the menu:\n"
-" Accounting/Periodical Processing/Billing/Send followups\n"
-"\n"
-" It will generate a PDF with all the letters according to the the\n"
-" different levels of recall defined. You can define different policies\n"
-" for different companies. You can also send mail to the customer.\n"
-"\n"
-" Note that if you want to change the followup level for a given partner/account entry, you can do from in the menu:\n"
-" Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups Sent\n"
-"\n"
-""
-msgstr ""
-
-#. module: account_followup
#: view:account_followup.stat:0
msgid "Group By..."
msgstr ""
@@ -69,7 +47,6 @@
#: field:account_followup.followup,company_id:0
#: view:account_followup.stat:0
#: field:account_followup.stat,company_id:0
-#: field:account_followup.stat.by.partner,company_id:0
msgid "Company"
msgstr ""
@@ -84,11 +61,6 @@
msgstr ""
#. module: account_followup
-#: model:ir.actions.act_window,help:account_followup.action_followup_stat
-msgid "Follow up on the reminders sent over to your partners for unpaid invoices."
-msgstr ""
-
-#. module: account_followup
#: view:account.followup.print.all:0
#: view:account_followup.followup.line:0
msgid "Legend"
@@ -100,11 +72,6 @@
msgstr ""
#. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select Partners to Remind"
-msgstr ""
-
-#. module: account_followup
#: field:account.followup.print,date:0
msgid "Follow-up Sending Date"
msgstr ""
@@ -121,8 +88,8 @@
msgstr ""
#. module: account_followup
-#: view:account_followup.stat.by.partner:0
-msgid "Balance > 0"
+#: report:account_followup.followup.print:0
+msgid "VAT:"
msgstr ""
#. module: account_followup
@@ -141,14 +108,7 @@
msgstr ""
#. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:account_followup.stat,partner_id:0
-#: field:account_followup.stat.by.partner,partner_id:0
+#: field:account_followup.stat,name:0
msgid "Partner"
msgstr ""
@@ -163,12 +123,6 @@
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid "Invoices Reminder"
-msgstr ""
-
-#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup
msgid "Account Follow Up"
msgstr ""
@@ -184,11 +138,6 @@
msgstr ""
#. module: account_followup
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: account_followup
#: view:account.followup.print.all:0
msgid "%(user_signature)s: User name"
msgstr ""
@@ -199,8 +148,8 @@
msgstr ""
#. module: account_followup
-#: view:account.followup.print:0
-msgid "This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."
+#: field:account_followup.stat,account_type:0
+msgid "Account Type"
msgstr ""
#. module: account_followup
@@ -214,11 +163,6 @@
msgstr ""
#. module: account_followup
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: account_followup
#: view:account.followup.print.all:0
#: field:account.followup.print.all,email_body:0
msgid "Email body"
@@ -231,7 +175,6 @@
#. module: account_followup
#: field:account_followup.stat,date_followup:0
-#: field:account_followup.stat.by.partner,date_followup:0
msgid "Latest followup"
msgstr ""
@@ -265,6 +208,11 @@
#. module: account_followup
#: view:account.followup.print.all:0
+msgid "Select partners to remind"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
msgid "Partner Selection"
msgstr ""
@@ -283,11 +231,6 @@
msgstr ""
#. module: account_followup
-#: view:account_followup.stat.by.partner:0
-msgid "Partner to Remind"
-msgstr ""
-
-#. module: account_followup
#: field:account_followup.followup.line,followup_id:0
#: field:account_followup.stat,followup_id:0
msgid "Follow Ups"
@@ -307,6 +250,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:."
+msgstr ""
+
+#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
msgid "\n"
"Dear %(partner_name)s,\n"
@@ -334,11 +283,6 @@
msgstr ""
#. module: account_followup
-#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
-msgid "Followup Statistics by Partner"
-msgstr ""
-
-#. module: account_followup
#: model:ir.module.module,shortdesc:account_followup.module_meta_information
msgid "Accounting follow-ups management"
msgstr ""
@@ -425,14 +369,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
#: view:account.followup.print.all:0
msgid "%(company_name)s: User's Company name"
msgstr ""
@@ -475,7 +411,6 @@
#. module: account_followup
#: view:account_followup.stat:0
#: field:account_followup.stat,balance:0
-#: field:account_followup.stat.by.partner,balance:0
msgid "Balance"
msgstr ""
@@ -492,7 +427,6 @@
#. module: account_followup
#: field:account_followup.stat,date_move_last:0
-#: field:account_followup.stat.by.partner,date_move_last:0
msgid "Last move"
msgstr ""
@@ -507,6 +441,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 !"
+msgstr ""
+
+#. module: account_followup
#: view:account.followup.print:0
#: view:account.followup.print.all:0
msgid "Cancel"
@@ -518,8 +458,9 @@
msgstr ""
#. module: account_followup
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "\n\nE-Mail sent to following Partners successfully. !"
msgstr ""
#. module: account_followup
@@ -528,11 +469,6 @@
msgstr ""
#. module: account_followup
-#: field:account_followup.stat.by.partner,max_followup_id:0
-msgid "Max Follow Up Level"
-msgstr ""
-
-#. module: account_followup
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgstr ""
@@ -600,7 +536,6 @@
#. module: account_followup
#: field:account_followup.stat,date_move:0
-#: field:account_followup.stat.by.partner,date_move:0
msgid "First move"
msgstr ""
@@ -615,14 +550,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-11-24 11:05:24 +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:.") +'\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 !") +'\n\n'+ msg_unsent
+ msg_sent = msg_sent and _("E-Mail sent to following Partners successfully. !") +'\n\n'+ msg_sent
line = '=========================================================================='
summary = msg_unsent + line + msg_sent
context.update({'summary': summary})
=== modified file 'account_payment/i18n/account_payment.pot'
--- account_payment/i18n/account_payment.pot 2010-11-18 16:25:12 +0000
+++ account_payment/i18n/account_payment.pot 2010-11-24 11:05:24 +0000
@@ -60,14 +60,14 @@
#. module: account_payment
#: help:payment.order,state:0
-msgid "When an order is placed the state is 'Draft'.\n"
-" Once the bank is confirmed the state is set to 'Confirmed'.\n"
+msgid "When an order is placed the state is 'Draft'."
+" Once the bank is confirmed the state is set to 'Confirmed'."
" Then the order is paid the state is 'Done'."
msgstr ""
#. module: account_payment
#: help:account.invoice,amount_to_pay:0
-msgid "The amount which should be paid at the current date\n"
+msgid "The amount which should be paid at the current date"
"minus the amount which is already in payment order"
msgstr ""
=== modified file 'account_voucher/i18n/account_voucher.pot'
--- account_voucher/i18n/account_voucher.pot 2010-11-18 16:25:12 +0000
+++ account_voucher/i18n/account_voucher.pot 2010-11-24 11:05:24 +0000
@@ -69,11 +69,11 @@
#. module: account_voucher
#: model:ir.module.module,description:account_voucher.module_meta_information
-msgid "Account Voucher module includes all the basic requirements of\n"
-" Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc...\n"
-" * Voucher Entry\n"
-" * Voucher Receipt\n"
-" * Cheque Register\n"
+msgid "Account Voucher module includes all the basic requirements of"
+" Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc..."
+" * Voucher Entry"
+" * Voucher Receipt"
+" * Cheque Register"
" "
msgstr ""
=== modified file 'analytic/i18n/analytic.pot'
--- analytic/i18n/analytic.pot 2010-11-18 16:25:12 +0000
+++ analytic/i18n/analytic.pot 2010-11-24 11:05:24 +0000
@@ -37,7 +37,7 @@
#. module: analytic
#: model:ir.module.module,description:analytic.module_meta_information
-msgid "Module for defining analytic accounting object.\n"
+msgid "Module for defining analytic accounting object."
" "
msgstr ""
=== modified file 'auction/i18n/auction.pot'
--- auction/i18n/auction.pot 2010-11-18 16:25:12 +0000
+++ auction/i18n/auction.pot 2010-11-24 11:05:24 +0000
@@ -159,7 +159,7 @@
#. module: auction
#: help:auction.dates,state:0
-msgid "When auction starts the state is 'Draft'.\n"
+msgid "When auction starts the state is 'Draft'."
" At the end of auction, the state becomes 'Closed'."
msgstr ""
@@ -702,9 +702,9 @@
#. module: auction
#: help:auction.lots,state:0
-msgid " * The 'Draft' state is used when a object is encoding as a new object. \n"
-"* The 'Unsold' state is used when object does not sold for long time, user can also set it as draft state after unsold. \n"
-"* The 'Paid' state is used when user pay for the object \n"
+msgid " * The 'Draft' state is used when a object is encoding as a new object."
+"* The 'Unsold' state is used when object does not sold for long time, user can also set it as draft state after unsold."
+"* The 'Paid' state is used when user pay for the object"
"* The 'Sold' state is used when user buy the object."
msgstr ""
=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py 2010-11-23 10:08:10 +0000
+++ audittrail/audittrail.py 2010-11-24 11:05:24 +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 'base_action_rule/i18n/base_action_rule.pot'
--- base_action_rule/i18n/base_action_rule.pot 2010-11-18 16:25:12 +0000
+++ base_action_rule/i18n/base_action_rule.pot 2010-11-24 11:05:24 +0000
@@ -244,8 +244,8 @@
#. module: base_action_rule
#: help:base.action.rule,regex_name:0
-msgid "Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the string 'urgent'\n"
+msgid "Regular expression for matching name of the resource"
+"e.g.: 'urgent.*' will search for records having name starting with the string 'urgent'"
"Note: This is case sensitive search."
msgstr ""
=== modified file 'base_calendar/i18n/base_calendar.pot'
--- base_calendar/i18n/base_calendar.pot 2010-11-18 16:25:12 +0000
+++ base_calendar/i18n/base_calendar.pot 2010-11-24 11:05:24 +0000
@@ -1189,7 +1189,7 @@
#. module: base_calendar
#: help:calendar.alarm,description:0
-msgid "Provides a more complete description of the calendar component, than that provided by the \"SUMMARY\" property"
+msgid "Provides a more complete description of the calendar component, than that provided by the \"SUMMARY\" property"
msgstr ""
#. module: base_calendar
@@ -1367,10 +1367,10 @@
#. module: base_calendar
#: model:ir.module.module,description:base_calendar.module_meta_information
-msgid "Full featured calendar system that supports:\n"
-" - Calendar of events\n"
-" - Alerts (create requests)\n"
-" - Recurring events\n"
+msgid "Full featured calendar system that supports:"
+" - Calendar of events"
+" - Alerts (create requests)"
+" - Recurring events"
" - Invitations to people"
msgstr ""
@@ -1421,7 +1421,7 @@
#. module: base_calendar
#: help:calendar.alarm,name:0
-msgid "Contains the text to be used as the message subject for email or contains the text to be used for display"
+msgid "Contains the text to be used as the message subject for email or contains the text to be used for display"
msgstr ""
#. module: base_calendar
=== modified file 'base_contact/i18n/base_contact.pot'
--- base_contact/i18n/base_contact.pot 2010-11-18 16:25:12 +0000
+++ base_contact/i18n/base_contact.pot 2010-11-24 11:05:24 +0000
@@ -57,7 +57,7 @@
#. module: base_contact
#: help:res.partner.job,name:0
-msgid "You may enter Address first,Partner will be linked automatically if any."
+msgid "You may enter Address first,Partner will be linked automatically if any."
msgstr ""
#. module: base_contact
@@ -156,7 +156,7 @@
#. 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"
+msgid "Order of importance of this job title in the list of job title of the linked partner"
msgstr ""
#. module: base_contact
@@ -311,7 +311,7 @@
#. module: base_contact
#: help:res.partner.contact,active:0
-msgid "If the active field is set to true, it will allow you to hide the partner contact without removing it."
+msgid "If the active field is set to true,it will allow you to hide the partner contact without removing it."
msgstr ""
#. module: base_contact
@@ -489,6 +489,6 @@
#. 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"
+msgid "Order of importance of this address in the list of addresses of the linked contact"
msgstr ""
=== modified file 'base_module_quality/i18n/base_module_quality.pot'
--- base_module_quality/i18n/base_module_quality.pot 2010-11-18 16:25:12 +0000
+++ base_module_quality/i18n/base_module_quality.pot 2010-11-24 11:05:24 +0000
@@ -135,15 +135,6 @@
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
-#, python-format
-msgid "Error in Read method:\" + str(e))]\n"
-" else:\n"
-" if size < 5:\n"
-" speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _(\"Warning! Not enough demo data"
-msgstr ""
-
-#. module: base_module_quality
#: view:module.quality.detail:0
msgid "Save Report"
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-11-24 11:05:24 +0000
@@ -113,7 +113,11 @@
except Exception, e:
self.log.warning('Error in read method', exc_info=True)
list2 = [obj, _("Error in Read method")]
+<<<<<<< TREE
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)]
+>>>>>>> MERGE-SOURCE
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_report_creator/i18n/base_report_creator.pot'
--- base_report_creator/i18n/base_report_creator.pot 2010-11-18 16:25:12 +0000
+++ base_report_creator/i18n/base_report_creator.pot 2010-11-24 11:05:24 +0000
@@ -513,12 +513,11 @@
#. module: base_report_creator
#: model:ir.module.module,description:base_report_creator.module_meta_information
-msgid "This module allows you to create any statistic\n"
-"report on several objects. It's a SQL query builder and browser\n"
-"for and users.\n"
-"\n"
-"After installing the module, it adds a menu to define custom report in\n"
-"the \"Dashboard\" menu.\n"
+msgid "This module allows you to create any statistic"
+"report on several objects. It's a SQL query builder and browser"
+"for and users."
+"After installing the module, it adds a menu to define custom report in"
+"the \"Dashboard\" menu."
""
msgstr ""
=== modified file 'base_report_designer/i18n/base_report_designer.pot'
--- base_report_designer/i18n/base_report_designer.pot 2010-11-18 16:25:12 +0000
+++ base_report_designer/i18n/base_report_designer.pot 2010-11-24 11:05:24 +0000
@@ -170,9 +170,9 @@
#. module: base_report_designer
#: view:base.report.file.sxw:0
-msgid "This is the template of your requested report.\n"
-"Save it as a .SXW file and open it with OpenOffice.\n"
-"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+msgid "This is the template of your requested report."
+"Save it as a .SXW file and open it with OpenOffice."
+"Don't forget to install the OpenERP SA OpenOffice package to modify it."
"Once it is modified, re-upload it in OpenERP using this wizard."
msgstr ""
=== modified file 'base_setup/__init__.py'
--- base_setup/__init__.py 2010-10-09 09:36:34 +0000
+++ base_setup/__init__.py 2010-11-24 11:05:24 +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-11-18 16:25:12 +0000
+++ base_setup/i18n/base_setup.pot 2010-11-24 11:05:24 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:11:48+0000\n"
-"PO-Revision-Date: 2010-11-18 16:11:48+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:19+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -46,11 +46,6 @@
msgstr ""
#. module: base_setup
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: base_setup
#: field:base.setup.company,account_no:0
msgid "Bank Account No"
msgstr ""
@@ -96,10 +91,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
@@ -145,11 +138,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 ""
@@ -170,16 +158,16 @@
msgstr ""
#. module: base_setup
+#: view:base.setup.config:0
+msgid "Use Directly"
+msgstr ""
+
+#. module: base_setup
#: field:base.setup.installer,knowledge:0
msgid "Knowledge Management"
msgstr ""
#. module: base_setup
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-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 ""
@@ -195,11 +183,6 @@
msgstr ""
#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr ""
-
-#. module: base_setup
#: help:base.setup.installer,hr:0
msgid "Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more."
msgstr ""
@@ -328,8 +311,8 @@
#. module: base_setup
#: help:base.setup.company,rml_header1:0
-msgid "This sentence will appear at the top right corner of your reports.\n"
-"We suggest you to put a slogan here:\n"
+msgid "This sentence will appear at the top right corner of your reports."
+"We suggest you to put a slogan here:"
"\"Open Source Business Solutions\"."
msgstr ""
@@ -372,8 +355,8 @@
#. module: base_setup
#: help:base.setup.company,rml_footer1:0
-msgid "This sentence will appear at the bottom of your reports.\n"
-"We suggest you to write legal sentences here:\n"
+msgid "This sentence will appear at the bottom of your reports."
+"We suggest you to write legal sentences here:"
"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
msgstr ""
@@ -433,7 +416,8 @@
msgstr ""
#. module: base_setup
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
+#: code:addons/base_setup/__init__.py:0
+#, python-format
+msgid "The following users have been installed :"
msgstr ""
=== modified file 'board/i18n/board.pot'
--- board/i18n/board.pot 2010-11-18 16:25:12 +0000
+++ board/i18n/board.pot 2010-11-24 11:05:24 +0000
@@ -264,7 +264,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/caldav_data.xml'
--- caldav/caldav_data.xml 2010-11-22 10:30:29 +0000
+++ caldav/caldav_data.xml 2010-11-24 11:05:24 +0000
@@ -1,10 +1,15 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
+<<<<<<< TREE
<record model="document.directory" id="document.dir_calendars">
<field name="name">Calendars</field>
<field name="calendar_collection">True</field>
</record>
+=======
+
+
+>>>>>>> MERGE-SOURCE
<!-- Event attributes-->
<record model="basic.calendar.attributes" id="field_event_comment">
=== modified file 'caldav/caldav_setup.xml'
--- caldav/caldav_setup.xml 2010-11-22 09:45:27 +0000
+++ caldav/caldav_setup.xml 2010-11-24 11:05:24 +0000
@@ -11,7 +11,7 @@
<field name="storage_id" ref="document.storage_default"/>
<field name="type">directory</field>
<field eval="[(6,0,[])]" name="group_ids"/>
- <field name="name">calendars</field>
+ <field name="name">Calendars</field>
</record>
<record id="document_directory_resources1" model="document.directory">
<field name="domain">[]</field>
=== modified file 'caldav/calendar.py'
--- caldav/calendar.py 2010-11-18 16:21:31 +0000
+++ caldav/calendar.py 2010-11-24 11:05:24 +0000
@@ -770,7 +770,8 @@
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()
=== modified file 'caldav/calendar_collection.py'
--- caldav/calendar_collection.py 2010-11-22 10:30:29 +0000
+++ caldav/calendar_collection.py 2010-11-24 11:05:24 +0000
@@ -37,7 +37,7 @@
def _get_root_calendar_directory(self, cr, uid, context=None):
objid = self.pool.get('ir.model.data')
try:
- mid = objid._get_id(cr, uid, 'document', 'dir_calendars')
+ mid = objid._get_id(cr, uid, 'caldav', 'document_directory_calendars0')
if not mid:
return False
root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
=== modified file 'caldav/i18n/caldav.pot'
--- caldav/i18n/caldav.pot 2010-11-18 16:25:12 +0000
+++ caldav/i18n/caldav.pot 2010-11-24 11:05:24 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:11:50+0000\n"
-"PO-Revision-Date: 2010-11-18 16:11:50+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:20+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,133 +21,8 @@
msgstr ""
#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-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
-msgid "Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: caldav
@@ -161,100 +36,13 @@
msgstr ""
#. module: caldav
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,description:0
-msgid "description"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-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
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-msgid "Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
msgstr ""
#. module: caldav
@@ -263,50 +51,24 @@
msgstr ""
#. module: caldav
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
#: field:basic.calendar,has_webcal:0
msgid "WebCal"
msgstr ""
#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
msgstr ""
#. module: caldav
@@ -315,24 +77,8 @@
msgstr ""
#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
msgstr ""
#. module: caldav
@@ -341,67 +87,113 @@
msgstr ""
#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS file"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: caldav
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr ""
-
-#. module: caldav
#: help:basic.calendar,has_webcal:0
msgid "Also export a <name>.ics entry next to the calendar folder, with WebCal content."
msgstr ""
#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
#: field:basic.calendar.fields,fn:0
msgid "Function"
msgstr ""
#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
#: view:basic.calendar:0
msgid "Description"
msgstr ""
#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
#: help:basic.calendar.alias,cal_line_id:0
msgid "The calendar/line this mapping applies to"
msgstr ""
#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
#: field:basic.calendar.fields,mapping:0
msgid "Mapping"
msgstr ""
#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
#: view:calendar.event.import:0
msgid "_Import"
msgstr ""
@@ -412,13 +204,28 @@
msgstr ""
#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
#: model:ir.model,name:caldav.model_calendar_event_import
msgid "Event Import"
msgstr ""
#. module: caldav
#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
msgstr ""
#. module: caldav
@@ -432,6 +239,22 @@
msgstr ""
#. module: caldav
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr ""
+
+#. module: caldav
#: field:basic.calendar,name:0
#: field:basic.calendar.attributes,name:0
#: field:basic.calendar.fields,name:0
@@ -439,14 +262,20 @@
msgstr ""
#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr ""
+
+#. module: caldav
#: selection:basic.calendar.attributes,type:0
#: selection:basic.calendar.lines,name:0
msgid "Alarm"
msgstr ""
#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "_Cancel"
msgstr ""
#. module: caldav
@@ -456,14 +285,45 @@
msgstr ""
#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
#: model:ir.actions.act_window,name:caldav.action_calendar_event_export
#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
msgid "Export .ics File"
msgstr ""
#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
msgstr ""
#. module: caldav
@@ -472,6 +332,29 @@
msgstr ""
#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,description:0
+msgid "description"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: caldav
#: model:ir.module.module,shortdesc:caldav.module_meta_information
msgid "Share Calendar using CalDAV"
msgstr ""
@@ -482,8 +365,8 @@
msgstr ""
#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
msgstr ""
#. module: caldav
@@ -492,19 +375,70 @@
msgstr ""
#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
#: view:calendar.event.import:0
msgid "Import Message"
msgstr ""
#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+msgid "Calendar"
msgstr ""
#. module: caldav
@@ -517,3 +451,15 @@
msgid "For supporting clients, the order of this folder among the calendars"
msgstr ""
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
+
=== modified file 'claim_from_delivery/i18n/claim_from_delivery.pot'
--- claim_from_delivery/i18n/claim_from_delivery.pot 2010-11-18 16:25:12 +0000
+++ claim_from_delivery/i18n/claim_from_delivery.pot 2010-11-24 11:05:24 +0000
@@ -27,7 +27,7 @@
#. module: claim_from_delivery
#: model:ir.module.module,description:claim_from_delivery.module_meta_information
-msgid "Create Claim from delivery order:\n"
+msgid "Create Claim from delivery order:"
""
msgstr ""
=== 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-11-24 11:05:24 +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/i18n/crm.pot'
--- crm/i18n/crm.pot 2010-11-18 16:25:12 +0000
+++ crm/i18n/crm.pot 2010-11-24 11:05:24 +0000
@@ -657,7 +657,7 @@
#. module: crm
#: help:crm.phonecall,canal_id:0
-msgid "The channels represent the different communication modes available with the customer. With each commercial opportunity, you can indicate the canall which is this opportunity source."
+msgid "The channels represent the different communication modes available with the customer. With each commercial opportunity, you can indicate the canall which is this opportunity source."
msgstr ""
#. module: crm
@@ -845,31 +845,28 @@
#. module: crm
#: model:ir.module.module,description:crm.module_meta_information
-msgid "The generic OpenERP Customer Relationship Management\n"
-"system enables a group of people to intelligently and efficiently manage\n"
-"leads, opportunities, meeting, phonecall etc.\n"
-"It manages key tasks such as communication, identification, prioritization,\n"
-"assignment, resolution and notification.\n"
-"\n"
-"OpenERP ensures that all cases are successfully tracked by users, customers and\n"
-"suppliers. It can automatically send reminders, escalate the request, trigger\n"
-"specific methods and lots of other actions based on your own enterprise rules.\n"
-"\n"
-"The greatest thing about this system is that users don't need to do anything\n"
-"special. They can just send email to the request tracker. OpenERP will take\n"
-"care of thanking them for their message, automatically routing it to the\n"
-"appropriate staff, and make sure all future correspondence gets to the right\n"
-"place.\n"
-"\n"
-"The CRM module has a email gateway for the synchronisation interface\n"
-"between mails and OpenERP. \n"
-"Create dashboard for CRM that includes:\n"
-" * My Leads (list)\n"
-" * Leads by Stage (graph)\n"
-" * My Meetings (list)\n"
-" * Sales Pipeline by Stage (graph)\n"
-" * My Cases (list)\n"
-" * Jobs Tracking (graph)\n"
+msgid "The generic OpenERP Customer Relationship Management"
+"system enables a group of people to intelligently and efficiently manage"
+"leads, opportunities, meeting, phonecall etc."
+"It manages key tasks such as communication, identification, prioritization,"
+"assignment, resolution and notification."
+"OpenERP ensures that all cases are successfully tracked by users, customers and"
+"suppliers. It can automatically send reminders, escalate the request, trigger"
+"specific methods and lots of other actions based on your own enterprise rules."
+"The greatest thing about this system is that users don't need to do anything"
+"special. They can just send email to the request tracker. OpenERP will take"
+"care of thanking them for their message, automatically routing it to the"
+"appropriate staff, and make sure all future correspondence gets to the right"
+"place."
+"The CRM module has a email gateway for the synchronisation interface"
+"between mails and OpenERP."
+"Create dashboard for CRM that includes:"
+" * My Leads (list)"
+" * Leads by Stage (graph)"
+" * My Meetings (list)"
+" * Sales Pipeline by Stage (graph)"
+" * My Cases (list)"
+" * Jobs Tracking (graph)"
""
msgstr ""
@@ -2451,9 +2448,9 @@
#. module: crm
#: help:crm.lead,state:0
#: help:crm.phonecall,state:0
-msgid "The state is set to 'Draft', when a case is created. \n"
-"If the case is in progress the state is set to 'Open'. \n"
-"When the case is over, the state is set to 'Done'. \n"
+msgid "The state is set to 'Draft', when a case is created."
+"If the case is in progress the state is set to 'Open'."
+"When the case is over, the state is set to 'Done'."
"If the case needs to be reviewed then the state is set to 'Pending'."
msgstr ""
@@ -2928,7 +2925,7 @@
#. module: crm
#: help:crm.segmentation,exclusif:0
-msgid "Check if the category is limited to partners that match the segmentation criterions. \n"
+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 ""
@@ -2944,7 +2941,7 @@
#. module: crm
#: help:crm.meeting,date_deadline:0
-msgid "Deadline Date is automatically computed from Start Date + Duration"
+msgid "Deadline Date is automatically computed from Start Date + Duration"
msgstr ""
#. module: crm
@@ -3052,9 +3049,9 @@
#. module: crm
#: help:crm.segmentation,som_interval:0
-msgid "A period is the average number of days between two cycle of sale or purchase for this segmentation. \n"
-"It's mainly used to detect if a partner has not purchased or buy for a too long time, \n"
-"so we suppose that his state of mind has decreased because he probably bought goods to another supplier. \n"
+msgid "A period is the average number of days between two cycle of sale or purchase for this segmentation."
+"It's mainly used to detect if a partner has not purchased or buy for a too long time,"
+"so we suppose that his state of mind has decreased because he probably bought goods to another supplier."
"Use this functionality for recurring businesses."
msgstr ""
=== modified file 'crm/wizard/crm_send_email.py'
--- crm/wizard/crm_send_email.py 2010-10-28 06:54:18 +0000
+++ crm/wizard/crm_send_email.py 2010-11-24 11:05:24 +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_claim/i18n/crm_claim.pot'
--- crm_claim/i18n/crm_claim.pot 2010-11-18 16:25:12 +0000
+++ crm_claim/i18n/crm_claim.pot 2010-11-24 11:05:24 +0000
@@ -707,9 +707,9 @@
#. module: crm_claim
#: help:crm.claim,state:0
-msgid "The state is set to 'Draft', when a case is created. \n"
-"If the case is in progress the state is set to 'Open'. \n"
-"When the case is over, the state is set to 'Done'. \n"
+msgid "The state is set to 'Draft', when a case is created."
+"If the case is in progress the state is set to 'Open'."
+"When the case is over, the state is set to 'Done'."
"If the case needs to be reviewed then the state is set to 'Pending'."
msgstr ""
=== modified file 'crm_fundraising/i18n/crm_fundraising.pot'
--- crm_fundraising/i18n/crm_fundraising.pot 2010-11-18 16:25:12 +0000
+++ crm_fundraising/i18n/crm_fundraising.pot 2010-11-24 11:05:24 +0000
@@ -670,9 +670,9 @@
#. module: crm_fundraising
#: help:crm.fundraising,state:0
-msgid "The state is set to 'Draft', when a case is created. \n"
-"If the case is in progress the state is set to 'Open'. \n"
-"When the case is over, the state is set to 'Done'. \n"
+msgid "The state is set to 'Draft', when a case is created."
+"If the case is in progress the state is set to 'Open'."
+"When the case is over, the state is set to 'Done'."
"If the case needs to be reviewed then the state is set to 'Pending'."
msgstr ""
=== modified file 'crm_helpdesk/i18n/crm_helpdesk.pot'
--- crm_helpdesk/i18n/crm_helpdesk.pot 2010-11-18 16:25:12 +0000
+++ crm_helpdesk/i18n/crm_helpdesk.pot 2010-11-24 11:05:24 +0000
@@ -496,7 +496,7 @@
#. module: crm_helpdesk
#: help:crm.helpdesk,section_id:0
-msgid "Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway."
+msgid "Sales team to which Case belongs to.Define Responsible user and Email account for mail gateway."
msgstr ""
#. module: crm_helpdesk
@@ -616,9 +616,9 @@
#. module: crm_helpdesk
#: help:crm.helpdesk,state:0
-msgid "The state is set to 'Draft', when a case is created. \n"
-"If the case is in progress the state is set to 'Open'. \n"
-"When the case is over, the state is set to 'Done'. \n"
+msgid "The state is set to 'Draft', when a case is created."
+"If the case is in progress the state is set to 'Open'."
+"When the case is over, the state is set to 'Done'."
"If the case needs to be reviewed then the state is set to 'Pending'."
msgstr ""
=== 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-11-24 11:05:24 +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-11-18 16:25:12 +0000
+++ crm_profiling/i18n/crm_profiling.pot 2010-11-24 11:05:24 +0000
@@ -130,7 +130,7 @@
#. module: crm_profiling
#: help:crm.segmentation,profiling_active:0
-msgid "Check this box if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored"
+msgid "Check this box if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored"
msgstr ""
#. module: crm_profiling
=== modified file 'delivery/i18n/delivery.pot'
--- delivery/i18n/delivery.pot 2010-11-18 16:25:12 +0000
+++ delivery/i18n/delivery.pot 2010-11-24 11:05:24 +0000
@@ -206,10 +206,9 @@
#. module: delivery
#: model:ir.module.module,description:delivery.module_meta_information
-msgid "Allows you to add delivery methods in sale orders and picking.\n"
-" You can define your own carrier and delivery grids for prices.\n"
-" When creating invoices from picking, OpenERP is able to add and compute the shipping line.\n"
-"\n"
+msgid "Allows you to add delivery methods in sale orders and picking."
+" You can define your own carrier and delivery grids for prices."
+" When creating invoices from picking, OpenERP is able to add and compute the shipping line."
" "
msgstr ""
=== modified file 'document/i18n/document.pot'
--- document/i18n/document.pot 2010-11-18 16:25:12 +0000
+++ document/i18n/document.pot 2010-11-24 11:05:24 +0000
@@ -116,7 +116,7 @@
#. module: document
#: help:document.directory.dctx,expr:0
-msgid "A python expression used to evaluate the field.\n"
+msgid "A python expression used to evaluate the field."
"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference to the current record, in dynamic folders"
msgstr ""
@@ -461,19 +461,19 @@
#. module: document
#: model:ir.module.module,description:document.module_meta_information
-msgid "This is a complete document management system:\n"
-" * User Authentication\n"
-" * Document Indexation :- .pptx and .docx files are not support in windows platform.\n"
-" * Dashboard for Document that includes:\n"
-" * New Files (list)\n"
-" * Files by Resource Type (graph)\n"
-" * Files by Partner (graph)\n"
-" * Files by Month (graph)\n"
-" ATTENTION:\n"
-" - When you install this module in a running company that have already PDF files stored into the database,\n"
-" you will lose them all.\n"
-" - After installing this module PDF's are no longer stored into the database,\n"
-" but in the servers rootpad like /server/bin/filestore.\n"
+msgid "This is a complete document management system:"
+" * User Authentication"
+" * Document Indexation :- .pptx and .docx files are not support in windows platform."
+" * Dashboard for Document that includes:"
+" * New Files (list)"
+" * Files by Resource Type (graph)"
+" * Files by Partner (graph)"
+" * Files by Month (graph)"
+" ATTENTION:"
+" - When you install this module in a running company that have already PDF files stored into the database,"
+" you will lose them all."
+" - After installing this module PDF's are no longer stored into the database,"
+" but in the servers rootpad like /server/bin/filestore."
""
msgstr ""
@@ -512,7 +512,7 @@
#. 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"
+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 ""
=== modified file 'document_ftp/i18n/document_ftp.pot'
--- document_ftp/i18n/document_ftp.pot 2010-11-18 16:25:12 +0000
+++ document_ftp/i18n/document_ftp.pot 2010-11-24 11:05:24 +0000
@@ -107,10 +107,10 @@
#. module: document_ftp
#: model:ir.module.module,description:document_ftp.module_meta_information
-msgid "This is a support FTP Interface with document management system.\n"
-" With this module you would not only be able to access documents through OpenERP\n"
-" but you would also be able to connect with them through the file system using the\n"
-" FTP client.\n"
+msgid "This is a support FTP Interface with document management system."
+" With this module you would not only be able to access documents through OpenERP"
+" but you would also be able to connect with them through the file system using the"
+" FTP client."
""
msgstr ""
=== modified file 'document_ics/i18n/document_ics.pot'
--- document_ics/i18n/document_ics.pot 2010-11-18 16:25:12 +0000
+++ document_ics/i18n/document_ics.pot 2010-11-24 11:05:24 +0000
@@ -217,7 +217,7 @@
#. module: document_ics
#: help:document.directory.ics.fields,fn:0
-msgid "Alternate method of calculating the value"
+msgid "Alternate method of calculating the value"
msgstr ""
#. module: document_ics
@@ -312,7 +312,7 @@
#. module: document_ics
#: help:document.directory.content,obj_iterate:0
-msgid "If set, a separate instance will be created for each record of Object"
+msgid "If set, a separate instance will be created for each record of Object"
msgstr ""
#. module: document_ics
@@ -367,6 +367,6 @@
#. module: document_ics
#: help:document.directory.content,fname_field:0
-msgid "The field of the object used in the filename. Has to be a unique identifier."
+msgid "The field of the object used in the filename. Has to be a unique identifier."
msgstr ""
=== modified file 'document_webdav/webdav_setup.xml'
--- document_webdav/webdav_setup.xml 2010-11-22 10:30:29 +0000
+++ document_webdav/webdav_setup.xml 2010-11-24 11:05:24 +0000
@@ -17,7 +17,7 @@
<field name="storage_id" ref="document.storage_default"/>
<field name="type">directory</field>
<field eval="[(6,0,[])]" name="group_ids"/>
- <field name="name">principals</field>
+ <field name="name">Principals</field>
</record>
<record id="document_directory_groups0" model="document.directory">
=== 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-11-24 11:05:24 +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-11-18 16:25:12 +0000
+++ email_template/i18n/email_template.pot 2010-11-24 11:05:24 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:12:02+0000\n"
-"PO-Revision-Date: 2010-11-18 16:12:02+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:26+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,18 +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 ""
-
-#. module: email_template
#: view:email_template.mailbox:0
msgid "Personal Emails"
msgstr ""
@@ -69,10 +57,9 @@
msgstr ""
#. module: email_template
-#: help:email.template,model_object_field:0
-msgid "Select the field from the model you want to use.\n"
-"If it is a relationship field you will be able to choose the nested values in the box below\n"
-"(Note:If there are no values make sure you have selected the correct model)"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s failed on login. Probable Reason:Could not login to server\nError: %s"
msgstr ""
#. module: email_template
@@ -117,11 +104,6 @@
msgstr ""
#. module: email_template
-#: help:email_template.account,smtpuname:0
-msgid "Specify the username if your SMTP server requires authentication, otherwise leave it empty."
-msgstr ""
-
-#. module: email_template
#: field:email_template.mailbox,server_ref:0
msgid "Server Reference of mail"
msgstr ""
@@ -159,12 +141,6 @@
msgstr ""
#. module: email_template
-#: field:email_template.preview,to:0
-#: field:email_template.send.wizard,to:0
-msgid "To"
-msgstr ""
-
-#. module: email_template
#: field:email.template,from_account:0
msgid "Email Account"
msgstr ""
@@ -397,11 +373,6 @@
msgstr ""
#. module: email_template
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: email_template
#: selection:email.template,template_language:0
msgid "Mako Templates"
msgstr ""
@@ -418,6 +389,12 @@
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.Error: %s"
+msgstr ""
+
+#. module: email_template
#: view:email_template.account:0
msgid "Test Outgoing Connection"
msgstr ""
@@ -462,8 +439,10 @@
msgstr ""
#. module: email_template
-#: field:email.template,sub_model_object_field:0
-msgid "Sub Field"
+#: help:email.template,model_object_field:0
+msgid "Select the field from the model you want to use."
+"If it is a relationship field you will be able to choose the nested values in the box below"
+"(Note:If there are no values make sure you have selected the correct model)"
msgstr ""
#. module: email_template
@@ -558,11 +537,6 @@
msgstr ""
#. module: email_template
-#: selection:email_template.account,state:0
-msgid "Initiated"
-msgstr ""
-
-#. module: email_template
#: field:email.template,report_template:0
msgid "Report to send"
msgstr ""
@@ -713,9 +687,8 @@
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Datetime Extraction failed.Date:%s Error:%s"
+#: selection:email_template.account,state:0
+msgid "Initiated"
msgstr ""
#. module: email_template
@@ -752,6 +725,11 @@
msgstr ""
#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr ""
+
+#. module: email_template
#: help:email.template,attachment_ids:0
msgid "You may attach existing files to this template, so they will be added in all emails created from this template"
msgstr ""
@@ -778,13 +756,6 @@
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Mail from Account %s failed. Probable Reason:MIME Error\n"
-"Description: %s"
-msgstr ""
-
-#. module: email_template
#: field:email_template.account,smtptls:0
msgid "TLS"
msgstr ""
@@ -797,6 +768,7 @@
#. module: email_template
#: code:addons/email_template/email_template.py:0
#: 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
@@ -864,8 +836,9 @@
msgstr ""
#. module: email_template
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
msgstr ""
#. module: email_template
@@ -895,17 +868,6 @@
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
-#, python-format
-msgid "Error sending mail: %s"
-msgstr ""
-
-#. module: email_template
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: email_template
#: view:email_template.mailbox:0
msgid "Body (HTML-Web Client Only)"
msgstr ""
@@ -922,6 +884,12 @@
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. Either ask admin to enforce an account for this template or get yourself a personal email account."
+msgstr ""
+
+#. module: email_template
#: field:email.template,allowed_groups:0
msgid "Allowed User Groups"
msgstr ""
@@ -937,11 +905,6 @@
msgstr ""
#. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr ""
-
-#. module: email_template
#: view:email_template.account:0
#: selection:email_template.account,state:0
msgid "Suspended"
@@ -953,26 +916,24 @@
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"
-"Error: %s"
+#: help:email_template.account,smtpuname:0
+msgid "Specify the username if your SMTP server requires authentication, otherwise leave it empty."
msgstr ""
#. module: email_template
@@ -1029,6 +990,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 ""
@@ -1148,13 +1114,6 @@
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Mail from Account %s failed on login. Probable Reason:Could not login to server\n"
-"Error: %s"
-msgstr ""
-
-#. module: email_template
#: model:ir.model,name:email_template.model_email_template_send_wizard
msgid "This is the wizard for sending mail"
msgstr ""
@@ -1170,13 +1129,19 @@
msgstr ""
#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:MIME Error Description: %s"
+msgstr ""
+
+#. module: email_template
#: field:email_template.account,send_pref:0
msgid "Mail Format"
msgstr ""
#. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
+#: view:email.template:0
+msgid "Actions"
msgstr ""
#. module: email_template
=== modified file 'event/i18n/event.pot'
--- event/i18n/event.pot 2010-11-18 16:25:12 +0000
+++ event/i18n/event.pot 2010-11-24 11:05:24 +0000
@@ -262,19 +262,18 @@
#. module: event
#: model:ir.module.module,description:event.module_meta_information
-msgid "Oraganization and management of Event.\n"
-"\n"
-" This module allow you\n"
-" * to manage your events and their registrations\n"
-" * to use emails to automatically confirm and send acknowledgements for any registration to an event\n"
-" * ...\n"
-" A dashboard for associations that includes:\n"
-" * Registration by Events (graph)\n"
-" Note that:\n"
-" - You can define new types of events in\n"
-" Events / Configuration / Types of Events\n"
-" - You can access predefined reports about number of registration per event or per event category in:\n"
-" Events / Reporting\n"
+msgid "Oraganization and management of Event."
+" This module allow you"
+" * to manage your events and their registrations"
+" * to use emails to automatically confirm and send acknowledgements for any registration to an event"
+" * ..."
+" A dashboard for associations that includes:"
+" * Registration by Events (graph)"
+" Note that:"
+" - You can define new types of events in"
+" Events / Configuration / Types of Events"
+" - You can access predefined reports about number of registration per event or per event category in:"
+" Events / Reporting"
""
msgstr ""
=== modified file 'event_project/i18n/event_project.pot'
--- event_project/i18n/event_project.pot 2010-11-18 16:25:12 +0000
+++ event_project/i18n/event_project.pot 2010-11-24 11:05:24 +0000
@@ -37,9 +37,8 @@
#. module: event_project
#: model:ir.module.module,description:event_project.module_meta_information
-msgid "Organization and management of events.\n"
-"\n"
-" This module allows you to create retro planning for managing your events.\n"
+msgid "Organization and management of events."
+" This module allows you to create retro planning for managing your events."
""
msgstr ""
=== modified file 'fetchmail/fetchmail.py'
--- fetchmail/fetchmail.py 2010-11-04 13:21:37 +0000
+++ fetchmail/fetchmail.py 2010-11-24 11:05:24 +0000
@@ -125,7 +125,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-11-18 16:25:12 +0000
+++ fetchmail/i18n/fetchmail.pot 2010-11-24 11:05:24 +0000
@@ -271,12 +271,12 @@
#. module: fetchmail
#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid "Fetchmail: \n"
-" * Fetch email from Pop / IMAP server\n"
-" * Support SSL\n"
-" * Integrated with all Modules\n"
-" * Automatic Email Receive\n"
-" * Email based Records (Add, Update)\n"
+msgid "Fetchmail: "
+" * Fetch email from Pop / IMAP server"
+" * Support SSL"
+" * Integrated with all Modules"
+" * Automatic Email Receive"
+" * Email based Records (Add, Update)"
" "
msgstr ""
=== modified file 'google_map/i18n/google_map.pot'
--- google_map/i18n/google_map.pot 2010-11-18 16:25:12 +0000
+++ google_map/i18n/google_map.pot 2010-11-24 11:05:24 +0000
@@ -49,8 +49,8 @@
#. 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"
+msgid "The module adds google map field in partner address"
+"so that we can directly open google map from the"
"url widget."
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-11-24 11:05:24 +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-11-18 16:25:12 +0000
+++ hr_attendance/i18n/hr_attendance.pot 2010-11-24 11:05:24 +0000
@@ -460,7 +460,7 @@
#. 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"
+msgid "You tried to %s with a date anterior to another event !"
"Try to contact the administrator to correct attendances."
msgstr ""
=== modified file 'hr_evaluation/i18n/hr_evaluation.pot'
--- hr_evaluation/i18n/hr_evaluation.pot 2010-11-18 16:25:12 +0000
+++ hr_evaluation/i18n/hr_evaluation.pot 2010-11-24 11:05:24 +0000
@@ -186,26 +186,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-11-18 16:25:12 +0000
+++ hr_expense/i18n/hr_expense.pot 2010-11-24 11:05:24 +0000
@@ -780,10 +780,10 @@
#. module: hr_expense
#: help:hr.expense.expense,state:0
-msgid "When the expense request is created the state is 'Draft'.\n"
-" It is confirmed by the user and request is sent to admin, the state is 'Waiting Confirmation'. \n"
-"If the admin accepts it, the state is 'Accepted'.\n"
-" If an invoice is made for the expense request, the state is 'Invoiced'.\n"
+msgid "When the expense request is created the state is 'Draft'."
+" It is confirmed by the user and request is sent to admin, the state is 'Waiting Confirmation'."
+"If the admin accepts it, the state is 'Accepted'."
+" If an invoice is made for the expense request, the state is 'Invoiced'."
" If the expense is paid to user, the state is 'Reimbursed'."
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-11-24 11:05:24 +0000
@@ -366,13 +366,21 @@
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']
if leaves_rest < leave_asked:
+<<<<<<< TREE
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))
+>>>>>>> MERGE-SOURCE
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:
+<<<<<<< TREE
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))
+>>>>>>> MERGE-SOURCE
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-11-18 16:25:12 +0000
+++ hr_holidays/i18n/hr_holidays.pot 2010-11-24 11:05:24 +0000
@@ -49,18 +49,6 @@
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.' %(record.employee_id.name)))\n"
-" nb = -(record.number_of_days_temp)\n"
-" elif record.holiday_type == 'category' and record.type == 'remove':\n"
-" if record.category_id and not record.holiday_status_id.limit:\n"
-" 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']\n"
-" if leaves_rest < leave_asked:\n"
-" raise osv.except_osv(_('Warning!"
-msgstr ""
-
-#. module: hr_holidays
#: view:available.holidays.report:0
#: view:hr.holidays:0
#: view:hr.holidays.status:0
@@ -198,7 +186,7 @@
#. module: hr_holidays
#: help:hr.holidays,type:0
-msgid "Choose 'Leave Request' if someone wants to take an off-day. \n"
+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 ""
@@ -260,8 +248,8 @@
#. module: hr_holidays
#: help:hr.holidays,state:0
-msgid "When the holiday request is created the state is 'Draft'.\n"
-" It is confirmed by the user and request is sent to admin, the state is 'Waiting Approval'. If the admin accepts it, the state is 'Approved'. If it is refused, the state is 'Refused'."
+msgid "When the holiday request is created the state is 'Draft'."
+" It is confirmed by the user and request is sent to admin, the state is 'Waiting Approval'.If the admin accepts it, the state is 'Approved'. If it is refused, the state is 'Refused'."
msgstr ""
#. module: hr_holidays
@@ -299,27 +287,26 @@
#. module: hr_holidays
#: model:ir.module.module,description:hr_holidays.module_meta_information
-msgid "Human Resources: Holidays tracking and workflow\n"
-"\n"
-" This module allows you to manage leaves and leaves' requests.\n"
-" Implements a dashboard for human resource management that includes.\n"
-" * My Leaves\n"
-" * My Expenses\n"
-" Note that:\n"
-" - A synchronisation with an internal agenda (use of the CRM module) is possible: in order to automatically create a case when an holiday request is accepted, you have to link the holidays status to a case section. You can set up this info and your colour preferences in\n"
-" HR / Configuration / Holidays Status\n"
-" - An employee can make an ask for more off-days by making a new Allocation It will increase his total of that leave type available (if the request is accepted).\n"
-" - There are two ways to print the employee's holidays:\n"
-" * The first will allow to choose employees by department and is used by clicking the menu item located in\n"
-" HR / Holidays Request / Print Summary of Holidays\n"
-" * The second will allow you to choose the holidays report for specific employees. Go on the list\n"
-" HR / Employees / Employees\n"
-" then select the ones you want to choose, click on the print icon and select the option\n"
-" 'Print Summary of Employee's Holidays'\n"
-" - The wizard allows you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in\n"
-" Administration / Users / Users\n"
-" for example, you maybe will do it for the user 'admin'\n"
-" .\n"
+msgid "Human Resources: Holidays tracking and workflow"
+" This module allows you to manage leaves and leaves' requests."
+" Implements a dashboard for human resource management that includes."
+" * My Leaves"
+" * My Expenses"
+" Note that:"
+" - A synchronisation with an internal agenda (use of the CRM module) is possible: in order to automatically create a case when an holiday request is accepted, you have to link the holidays status to a case section. You can set up this info and your colour preferences in"
+" HR / Configuration / Holidays Status"
+" - An employee can make an ask for more off-days by making a new Allocation It will increase his total of that leave type available (if the request is accepted)."
+" - There are two ways to print the employee's holidays:"
+" * The first will allow to choose employees by department and is used by clicking the menu item located in"
+" HR / Holidays Request / Print Summary of Holidays"
+" * The second will allow you to choose the holidays report for specific employees. Go on the list"
+" HR / Employees / Employees"
+" then select the ones you want to choose, click on the print icon and select the option"
+" 'Print Summary of Employee's Holidays'"
+" - The wizard allows you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in"
+" Administration / Users / Users"
+" for example, you maybe will do it for the user 'admin'"
+" ."
""
msgstr ""
@@ -568,25 +555,6 @@
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.' %(record.category_id.name)))\n"
-" nb = -(record.number_of_days_temp)\n"
-" else:\n"
-" nb = record.number_of_days_temp\n"
-"\n"
-" if record.holiday_type == 'employee' and record.employee_id:\n"
-" user_id = record.employee_id.user_id and record.employee_id.user_id.id or uid\n"
-"\n"
-" self.write(cr, uid, [record.id], {'state':'confirm', 'number_of_days': nb, 'user_id': user_id })\n"
-" return True\n"
-"\n"
-" def holidays_refuse(self, cr, uid, ids, *args):\n"
-" vals = {'state': 'refuse'}\n"
-" ids2 = self.pool.get('hr.employee"
-msgstr ""
-
-#. module: hr_holidays
#: view:available.holidays.report:0
msgid " Year "
msgstr ""
@@ -694,7 +662,7 @@
#. module: hr_holidays
#: constraint:hr.holidays:0
-msgid "Start date should not be larger than end date!\n"
+msgid "Start date should not be larger than end date!"
"Number of Days should be greater than 1!"
msgstr ""
=== 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-11-24 11:05:24 +0000
@@ -176,7 +176,11 @@
exp = line.category_id.condition
calculate = eval(exp, obj)
except Exception, e:
+<<<<<<< TREE
raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
+=======
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s') % (e))
+>>>>>>> MERGE-SOURCE
if not calculate:
continue
@@ -191,7 +195,11 @@
#Please have a look at the configuration guide.
amt = eval(base, obj)
except Exception, e:
+<<<<<<< TREE
raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
+=======
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s') % (e))
+>>>>>>> MERGE-SOURCE
if sal_type in ('gross', 'net'):
if line.amount_type == 'per':
@@ -1147,7 +1155,11 @@
exp = line.category_id.condition
calculate = eval(exp, obj)
except Exception, e:
+<<<<<<< TREE
raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
+=======
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s') % (e))
+>>>>>>> MERGE-SOURCE
if not calculate:
continue
@@ -1162,7 +1174,11 @@
#Please have a look at the configuration guide.
amt = eval(base, obj)
except Exception, e:
+<<<<<<< TREE
raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
+=======
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s') % (e))
+>>>>>>> MERGE-SOURCE
if sal_type in ('gross', 'net'):
if line.amount_type == 'per':
@@ -1261,7 +1277,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 +1464,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-11-18 16:25:12 +0000
+++ hr_payroll/i18n/hr_payroll.pot 2010-11-24 11:05:24 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:12:11+0000\n"
-"PO-Revision-Date: 2010-11-18 16:12:11+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:31+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:31+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -148,12 +148,6 @@
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Variable Error: %s "
-msgstr ""
-
-#. module: hr_payroll
#: view:hr.passport:0
msgid "Expire"
msgstr ""
@@ -259,12 +253,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 ""
@@ -286,13 +274,6 @@
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"
@@ -385,15 +366,15 @@
#. module: hr_payroll
#: model:ir.module.module,description:hr_payroll.module_meta_information
-msgid "Generic Payroll system\n"
-" * Employee Details\n"
-" * Employee Contracts\n"
-" * Passport based Contract\n"
-" * Allowances / Deductions\n"
-" * Allow to configure Basic / Grows / Net Salary\n"
-" * Employee Payslip\n"
-" * Monthly Payroll Register\n"
-" * Integrated with Holiday Management\n"
+msgid "Generic Payroll system"
+" * Employee Details"
+" * Employee Contracts"
+" * Passport based Contract"
+" * Allowances / Deductions"
+" * Allow to configure Basic / Grows / Net Salary"
+" * Employee Payslip"
+" * Monthly Payroll Register"
+" * Integrated with Holiday Management"
" "
msgstr ""
@@ -541,11 +522,6 @@
msgstr ""
#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: hr_payroll
#: code:addons/hr_payroll/hr_payroll.py:0
#, python-format
msgid "Error !"
@@ -681,14 +657,6 @@
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Variable Error: %s ' % (e)))\n"
-"\n"
-" if sal_type in ('gross', 'net"
-msgstr ""
-
-#. module: hr_payroll
#: view:hr.contibution.register:0
msgid "Contribution Lines"
msgstr ""
@@ -1216,11 +1184,6 @@
msgstr ""
#. module: hr_payroll
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: hr_payroll
#: report:salary.structure:0
msgid "Salary"
msgstr ""
@@ -1399,27 +1362,6 @@
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Variable Error: %s ' % (e)))\n"
-"\n"
-" if not calculate:\n"
-" continue\n"
-"\n"
-" percent = 0.0\n"
-" value = 0.0\n"
-" base = False\n"
-"# company_contrib = 0.0\n"
-" base = line.category_id.base\n"
-"\n"
-" try:\n"
-" #Please have a look at the configuration guide.\n"
-" amt = eval(base, obj)\n"
-" except Exception, e:\n"
-" raise osv.except_osv(_('Variable Error !"
-msgstr ""
-
-#. module: hr_payroll
#: report:hr.payroll.register.sheet:0
msgid "Net Sal."
msgstr ""
@@ -1561,12 +1503,6 @@
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr ""
-
-#. module: hr_payroll
#: field:hr.passport,date_issue:0
msgid "Passport Issue Date"
msgstr ""
@@ -1648,8 +1584,3 @@
msgid "Contributions"
msgstr ""
-#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
=== 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-11-24 11:05:24 +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-11-18 16:25:12 +0000
+++ hr_payroll_account/i18n/hr_payroll_account.pot 2010-11-24 11:05:24 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:12:12+0000\n"
-"PO-Revision-Date: 2010-11-18 16:12:12+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:32+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:32+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,16 +27,6 @@
msgstr ""
#. module: hr_payroll_account
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: hr_payroll_account
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: hr_payroll_account
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
@@ -83,11 +73,6 @@
msgstr ""
#. module: hr_payroll_account
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: hr_payroll_account
#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
msgid "Payroll Register"
msgstr ""
@@ -109,9 +94,8 @@
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 !"
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: hr_payroll_account
@@ -120,12 +104,6 @@
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
-#, python-format
-msgid "Please defined bank account for %s !"
-msgstr ""
-
-#. module: hr_payroll_account
#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
msgid "Human Resource Payroll Accounting"
msgstr ""
@@ -180,10 +158,10 @@
#. module: hr_payroll_account
#: model:ir.module.module,description:hr_payroll_account.module_meta_information
-msgid "Generic Payroll system Integrated with Accountings\n"
-" * Expense Encoding\n"
-" * Payment Encoding\n"
-" * Company Contribution Management\n"
+msgid "Generic Payroll system Integrated with Accountings"
+" * Expense Encoding"
+" * Payment Encoding"
+" * Company Contribution Management"
" "
msgstr ""
@@ -240,11 +218,6 @@
msgstr ""
#. module: hr_payroll_account
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: hr_payroll_account
#: field:hr.payslip.account.move,slip_id:0
#: model:ir.model,name:hr_payroll_account.model_hr_payslip
msgid "Pay Slip"
@@ -262,12 +235,6 @@
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
-#, python-format
-msgid "Fiscal Year is not defined for slip date %s"
-msgstr ""
-
-#. module: hr_payroll_account
#: field:hr.contibution.register,analytic_account_id:0
#: field:hr.employee,analytic_account:0
#: field:hr.holidays.status,analytic_account_id:0
@@ -303,12 +270,6 @@
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
-#, python-format
-msgid "Period is not defined for slip date %s"
-msgstr ""
-
-#. module: hr_payroll_account
#: view:hr.employee:0
msgid "Accounting"
msgstr ""
=== modified file 'hr_timesheet/i18n/hr_timesheet.pot'
--- hr_timesheet/i18n/hr_timesheet.pot 2010-11-18 16:25:12 +0000
+++ hr_timesheet/i18n/hr_timesheet.pot 2010-11-24 11:05:24 +0000
@@ -646,7 +646,7 @@
#. module: hr_timesheet
#: code:addons/hr_timesheet/hr_timesheet.py:0
#, python-format
-msgid "No analytic account defined on the project.\n"
+msgid "No analytic account defined on the project."
"Please set one or we can not automatically fill the timesheet."
msgstr ""
=== modified file 'hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot'
--- hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot 2010-11-18 16:25:12 +0000
+++ hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot 2010-11-24 11:05:24 +0000
@@ -692,7 +692,7 @@
#. 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"
+msgid "Please fill in the partner and pricelist field in the analytic account:"
"%s"
msgstr ""
@@ -819,7 +819,7 @@
#. 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"
+msgid "Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:"
"%s"
msgstr ""
=== 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-11-24 11:05:24 +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/i18n/hr_timesheet_sheet.pot'
--- hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot 2010-11-18 16:25:12 +0000
+++ hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot 2010-11-24 11:05:24 +0000
@@ -731,8 +731,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 'idea/i18n/idea.pot'
--- idea/i18n/idea.pot 2010-11-18 16:25:12 +0000
+++ idea/i18n/idea.pot 2010-11-24 11:05:24 +0000
@@ -261,8 +261,8 @@
#. 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"
+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 ""
=== modified file 'l10n_be/i18n/l10n_be.pot'
--- l10n_be/i18n/l10n_be.pot 2010-11-18 16:25:12 +0000
+++ l10n_be/i18n/l10n_be.pot 2010-11-24 11:05:24 +0000
@@ -103,12 +103,12 @@
#. module: l10n_be
#: help:partner.vat.intra,period_code:0
msgid "This is where you have to set the period code for the intracom declaration using the format: ppyyyy\n"
-" PP can stand for a month: from '01' to '12'.\n"
-" PP can stand for a trimester: '31','32','33','34'\n"
-" The first figure means that it is a trimester,\n"
-" The second figure identify the trimester.\n"
-" PP can stand for a complete fiscal year: '00'.\n"
-" YYYY stands for the year (4 positions).\n"
+" PP can stand for a month: from '01' to '12'."
+" PP can stand for a trimester: '31','32','33','34'"
+" The first figure means that it is a trimester,"
+" The second figure identify the trimester."
+" PP can stand for a complete fiscal year: '00'."
+" YYYY stands for the year (4 positions)."
" "
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-11-24 11:05:24 +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 04:45:44 +0000
+++ l10n_ch/i18n/l10n_ch.pot 2010-11-24 11:05:24 +0000
@@ -492,7 +492,7 @@
#. module: l10n_ch
#: model:ir.actions.todo,note:l10n_ch.action_config_journal_todo
-msgid "Set accounts on financial journals defined by\n"
+msgid "Set accounts on financial journals defined by"
" Camptocamp l10n_ch module"
msgstr ""
@@ -530,7 +530,7 @@
#. module: l10n_ch
#: model:ir.actions.todo,note:l10n_ch.action_config_tax_todo
-msgid "Set account on financial taxes defined by \n"
+msgid "Set account on financial taxes defined by"
" Camptocamp l10n_ch_c2c_pcg module"
msgstr ""
@@ -572,7 +572,7 @@
#. module: l10n_ch
#: help:account.tax.template.todo,account_collected_id:0
-msgid "You can set here the invoice tax account"
+msgid "You can set here the invoice tax account"
msgstr ""
#. module: l10n_ch
@@ -682,7 +682,7 @@
#. module: l10n_ch
#: help:account.tax.template.todo,account_paid_id:0
-msgid "You can set here the refund tax account"
+msgid "You can set here the refund tax account"
msgstr ""
#. module: l10n_ch
@@ -727,8 +727,8 @@
#. 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."
+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_ch
=== modified file 'l10n_es/i18n/l10n_es.pot'
--- l10n_es/i18n/l10n_es.pot 2010-11-18 16:25:12 +0000
+++ l10n_es/i18n/l10n_es.pot 2010-11-24 11:05:24 +0000
@@ -125,16 +125,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-11-18 16:25:12 +0000
+++ l10n_fr/i18n/l10n_fr.pot 2010-11-24 11:05:24 +0000
@@ -32,9 +32,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-11-18 16:25:12 +0000
+++ l10n_gr/i18n/l10n_gr.pot 2010-11-24 11:05:24 +0000
@@ -57,8 +57,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-11-18 16:25:12 +0000
+++ l10n_in/i18n/l10n_in.pot 2010-11-24 11:05:24 +0000
@@ -52,8 +52,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-11-18 16:25:12 +0000
+++ l10n_uk/i18n/l10n_uk.pot 2010-11-24 11:05:24 +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 'mail_gateway/i18n/mail_gateway.pot'
--- mail_gateway/i18n/mail_gateway.pot 2010-11-18 16:25:12 +0000
+++ mail_gateway/i18n/mail_gateway.pot 2010-11-24 11:05:24 +0000
@@ -321,8 +321,8 @@
#. module: mail_gateway
#: model:ir.module.module,description:mail_gateway.module_meta_information
-msgid "The generic email gateway system allows to send and receive emails\n"
-" * History for Emails\n"
+msgid "The generic email gateway system allows to send and receive emails"
+" * History for Emails"
" * Easy Integration with any Module"
msgstr ""
=== modified file 'marketing_campaign/i18n/marketing_campaign.pot'
--- marketing_campaign/i18n/marketing_campaign.pot 2010-11-18 16:25:12 +0000
+++ marketing_campaign/i18n/marketing_campaign.pot 2010-11-24 11:05:24 +0000
@@ -115,11 +115,11 @@
#. module: marketing_campaign
#: help:marketing.campaign.activity,condition:0
-msgid "Python expression to decide whether the activity can be executed, otherwise it will be deleted or cancelled.The expression may use the following [browsable] variables:\n"
-" - activity: the campaign activity\n"
-" - workitem: the campaign workitem\n"
-" - resource: the resource object this campaign item represents\n"
-" - transitions: list of campaign transitions outgoing from this activity\n"
+msgid "Python expression to decide whether the activity can be executed, otherwise it will be deleted or cancelled.The expression may use the following [browsable] variables:"
+" - activity: the campaign activity"
+" - workitem: the campaign workitem"
+" - resource: the resource object this campaign item represents"
+" - transitions: list of campaign transitions outgoing from this activity"
"...- re: Python regular expression module"
msgstr ""
@@ -202,7 +202,7 @@
#. module: marketing_campaign
#: help:marketing.campaign,mode:0
-msgid "Test - It creates and process all the activities directly (without waiting for the delay on transitions) but does not send emails or produce reports.\n"
+msgid "Test - It creates and process all the activities directly (without waiting for the delay on transitions) but does not send emails or produce reports."
"Test in Realtime - It creates and processes all the activities directly but does not send emails or produce reports.\n"
"With Manual Confirmation - the campaigns runs normally, but the user has to validate all workitem manually.\n"
"Normal - the campaign runs normally and automatically sends all emails and reports (be very careful with this mode, you're live!)"
@@ -251,10 +251,10 @@
#. module: marketing_campaign
#: help:marketing.campaign.activity,type:0
-msgid "The type of action to execute when an item enters this activity, such as:\n"
-" - Email: send an email using a predefined email template\n"
-" - Report: print an existing Report defined on the resource item and save it into a specific directory\n"
-" - Custom Action: execute a predefined action, e.g. to modify the fields of the resource record\n"
+msgid "The type of action to execute when an item enters this activity, such as:"
+" - Email: send an email using a predefined email template"
+" - Report: print an existing Report defined on the resource item and save it into a specific directory"
+" - Custom Action: execute a predefined action, e.g. to modify the fields of the resource record"
" "
msgstr ""
=== modified file 'marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot'
--- marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot 2010-11-18 16:25:12 +0000
+++ marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot 2010-11-24 11:05:24 +0000
@@ -42,9 +42,9 @@
#. 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"
+msgid "Hello,Thanks for showing intrest and buying the OpenERP book."
+" If any further information required kindly revert back."
+" I really appreciate your co-operation on this."
" Regards,OpenERP Team,"
msgstr ""
@@ -95,10 +95,10 @@
#. 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"
+msgid "Hello, We have very good offer that might suit you."
+" For our silver partners,We are offering Gold partnership."
+" If any further information required kindly revert back."
+" I really appreciate your co-operation on this."
" Regards,OpenERP Team,"
msgstr ""
@@ -114,7 +114,7 @@
#. 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"
+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."
" Regards,OpenERP Team,"
msgstr ""
@@ -135,36 +135,36 @@
#. 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"
-" If any further information required kindly revert back.\n"
-" I really appreciate your co-operation on this.\n"
+msgid "Hello, We have very good offer that might suit you."
+" For our gold partners,We are arranging free technical training on june,2010."
+" If any further information required kindly revert back."
+" I really appreciate your co-operation on this."
" Regards,OpenERP Team,"
msgstr ""
#. module: marketing_campaign_crm_demo
#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_3
-msgid "Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.\n"
-" If any further information required kindly revert back.\n"
-" I really appreciate your co-operation on this.\n"
+msgid "Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day."
+" If any further information required kindly revert back."
+" I really appreciate your co-operation on this."
" Regards,OpenERP Team,"
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"
-" If any further information required kindly revert back.\n"
-" We really appreciate your co-operation on this.\n"
+msgid "Hello,We have very good offer that might suit you."
+" We propose you to subscribe to the OpenERP Discovery Day on May 2010."
+" If any further information required kindly revert back."
+" We really appreciate your co-operation on this."
" 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"
+msgid "Hello, We have very good offer that might suit you."
+" For our silver partners,We are paid technical training on june,2010."
+" If any further information required kindly revert back."
+" I really appreciate your co-operation on this."
" Regards,OpenERP Team,"
msgstr ""
=== modified file 'membership/i18n/membership.pot'
--- membership/i18n/membership.pot 2010-11-18 16:25:12 +0000
+++ membership/i18n/membership.pot 2010-11-24 11:05:24 +0000
@@ -194,12 +194,12 @@
#. module: membership
#: help:res.partner,membership_state:0
-msgid "It indicates the membership state.\n"
-" -Non Member: A member who has not applied for any membership.\n"
-" -Cancelled Member: A member who has cancelled his membership.\n"
-" -Old Member: A member whose membership date has expired.\n"
-" -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n"
-" -Invoiced Member: A member whose invoice has been created.\n"
+msgid "It indicates the membership state."
+" -Non Member: A member who has not applied for any membership."
+" -Cancelled Member: A member who has cancelled his membership."
+" -Old Member: A member whose membership date has expired."
+" -Waiting Member: A member who has applied for the membership and whose invoice is going to be created."
+" -Invoiced Member: A member whose invoice has been created."
" -Paid Member: A member who has paid the membership amount."
msgstr ""
@@ -379,12 +379,12 @@
#. module: membership
#: help:membership.membership_line,state:0
-msgid "It indicates the membership state.\n"
-" -Non Member: A member who has not applied for any membership.\n"
-" -Cancelled Member: A member who has cancelled his membership.\n"
-" -Old Member: A member whose membership date has expired.\n"
-" -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n"
-" -Invoiced Member: A member whose invoice has been created.\n"
+msgid "It indicates the membership state."
+" -Non Member: A member who has not applied for any membership."
+" -Cancelled Member: A member who has cancelled his membership."
+" -Old Member: A member whose membership date has expired."
+" -Waiting Member: A member who has applied for the membership and whose invoice is going to be created."
+" -Invoiced Member: A member whose invoice has been created."
" -Paid Member: A member who has paid the membership amount."
msgstr ""
=== modified file 'mrp/i18n/mrp.pot'
--- mrp/i18n/mrp.pot 2010-11-18 16:25:12 +0000
+++ mrp/i18n/mrp.pot 2010-11-24 11:05:24 +0000
@@ -988,8 +988,7 @@
#. module: mrp
#: help:mrp.installer,mrp_jit:0
-msgid "Enables Just In Time computation of procurement orders.\n"
-"\n"
+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 ""
@@ -1345,7 +1344,7 @@
#. module: mrp
#: sql_constraint:mrp.bom:0
-msgid "All product quantities must be greater than 0.\n"
+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 ""
@@ -1592,7 +1591,7 @@
#. module: mrp
#: help:mrp.product.produce,mode:0
-msgid "'Consume only' mode will only consume the products with the quantity selected.\n"
+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 ""
@@ -1774,11 +1773,11 @@
#. module: mrp
#: help:mrp.production,state:0
-msgid "When the production order is created the state is set to 'Draft'.\n"
-" If the order is confirmed the state is set to 'Waiting Goods'.\n"
-" If any exceptions are there, the state is set to 'Picking Exception'. \n"
-"If the stock is available then the state is set to 'Ready to Produce'.\n"
-" When the production gets started then the state is set to 'In Production'.\n"
+msgid "When the production order is created the state is set to 'Draft'."
+" If the order is confirmed the state is set to 'Waiting Goods'."
+" If any exceptions are there, the state is set to 'Picking Exception'."
+"If the stock is available then the state is set to 'Ready to Produce'."
+" When the production gets started then the state is set to 'In Production'."
" When the production is over, the state is set to 'Done'."
msgstr ""
=== modified file 'mrp_operations/i18n/mrp_operations.pot'
--- mrp_operations/i18n/mrp_operations.pot 2010-11-18 16:25:12 +0000
+++ mrp_operations/i18n/mrp_operations.pot 2010-11-24 11:05:24 +0000
@@ -216,10 +216,10 @@
#. module: mrp_operations
#: help:mrp.production.workcenter.line,state:0
-msgid "* When a work order is created it is set in 'Draft' state.\n"
-"* When user sets work order in start mode that time it will be set in 'In Progress' state.\n"
-"* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pause' state.\n"
-"* When the user cancels the work order it will be set in 'Canceled' state.\n"
+msgid "* When a work order is created it is set in 'Draft' state."
+"* When user sets work order in start mode that time it will be set in 'In Progress' state."
+"* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pause' state."
+"* When the user cancels the work order it will be set in 'Canceled' state."
"* When order is completely processed that time it is set in 'Finished' state."
msgstr ""
=== modified file 'mrp_repair/i18n/mrp_repair.pot'
--- mrp_repair/i18n/mrp_repair.pot 2010-11-18 16:25:12 +0000
+++ mrp_repair/i18n/mrp_repair.pot 2010-11-24 11:05:24 +0000
@@ -22,11 +22,11 @@
#. module: mrp_repair
#: help:mrp.repair,state:0
-msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed repair order. \n"
+msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed repair order.\n"
"* The 'Confirmed' state is used when a user confirms the repair order. \n"
-"* The 'Ready to Repair' state is used to start to repairing, user can start repairing only after repair order is confirmed. \n"
-"* The 'To be Invoiced' state is used to generate the invoice before or after repairing done. \n"
-"* The 'Done' state is set when repairing is completed. \n"
+"* The 'Ready to Repair' state is used to start to repairing, user can start repairing only after repair order is confirmed.\n"
+"* The 'To be Invoiced' state is used to generate the invoice before or after repairing done.\n"
+"* The 'Done' state is set when repairing is completed.\n"
"* The 'Cancelled' state is used when user cancel repair order."
msgstr ""
@@ -279,9 +279,9 @@
#. module: mrp_repair
#: help:mrp.repair.line,state:0
-msgid " * The 'Draft' state is set automatically as draft when repair order in draft state. \n"
-"* The 'Confirmed' state is set automatically as confirm when repair order in confirm state. \n"
-"* The 'Done' state is set automatically when repair order is completed. \n"
+msgid " * The 'Draft' state is set automatically as draft when repair order in draft state."
+"* The 'Confirmed' state is set automatically as confirm when repair order in confirm state."
+"* The 'Done' state is set automatically when repair order is completed."
"* The 'Cancelled' state is set automatically when user cancel repair order."
msgstr ""
=== modified file 'point_of_sale/i18n/point_of_sale.pot'
--- point_of_sale/i18n/point_of_sale.pot 2010-11-18 16:25:12 +0000
+++ point_of_sale/i18n/point_of_sale.pot 2010-11-24 11:05:24 +0000
@@ -359,19 +359,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.' %(journal.name)))\n"
-"\n"
-" number = \n"
-" if journal.sequence_id:\n"
-" number = sequence_obj.get_id(cr, uid, journal.sequence_id.id)\n"
-" else:\n"
-" number = sequence_obj.get(cr, uid, 'account.cash.statement"
-msgstr ""
-
-#. module: point_of_sale
#: constraint:stock.move:0
msgid "You try to assign a lot which is not from the same product"
msgstr ""
@@ -1698,7 +1685,7 @@
#. 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.\n"
+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 ""
@@ -2270,7 +2257,7 @@
#. 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"
+msgid "The maximum value you can still withdraw is exceeded."
" Remaining value is equal to %d "
msgstr ""
=== modified file 'procurement/i18n/procurement.pot'
--- procurement/i18n/procurement.pot 2010-11-18 16:25:12 +0000
+++ procurement/i18n/procurement.pot 2010-11-24 11:05:24 +0000
@@ -126,11 +126,11 @@
#. module: procurement
#: help:procurement.order,state:0
-msgid "When a procurement is created the state is set to 'Draft'.\n"
-" If the procurement is confirmed, the state is set to 'Confirmed'. \n"
-"After confirming the state is set to 'Running'.\n"
-" If any exception arises in the order then the state is set to 'Exception'.\n"
-" Once the exception is removed the state becomes 'Ready'.\n"
+msgid "When a procurement is created the state is set to 'Draft'."
+" If the procurement is confirmed, the state is set to 'Confirmed'."
+"After confirming the state is set to 'Running'."
+" If any exception arises in the order then the state is set to 'Exception'."
+" Once the exception is removed the state becomes 'Ready'."
" It is in 'Waiting'. state when the procurement is waiting for another one to finish."
msgstr ""
@@ -192,7 +192,7 @@
#. module: procurement
#: help:procurement.order,origin:0
-msgid "Reference of the document that created this Procurement.\n"
+msgid "Reference of the document that created this Procurement."
"This is automatically completed by OpenERP."
msgstr ""
=== modified file 'product/i18n/product.pot'
--- product/i18n/product.pot 2010-11-18 16:25:12 +0000
+++ product/i18n/product.pot 2010-11-24 11:05:24 +0000
@@ -484,7 +484,7 @@
#. module: product
#: code:addons/product/pricelist.py:0
#, python-format
-msgid "No active version for the selected pricelist !\n"
+msgid "No active version for the selected pricelist !"
"Please create or activate one."
msgstr ""
@@ -1372,7 +1372,7 @@
#. module: product
#: help:product.uom,factor:0
-msgid "How many times this UoM is smaller than the reference UoM in this category:\n"
+msgid "How many times this UoM is smaller than the reference UoM in this category:"
"1 * (reference unit) = ratio * (this unit)"
msgstr ""
@@ -1851,7 +1851,7 @@
#. module: product
#: help:product.uom,factor_inv:0
-msgid "How many times this UoM is bigger than the reference UoM in this category:\n"
+msgid "How many times this UoM is bigger than the reference UoM in this category:"
"1 * (this unit) = ratio * (reference unit)"
msgstr ""
@@ -1928,8 +1928,8 @@
#. 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"
+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 ""
@@ -2102,7 +2102,7 @@
#. module: product
#: help:product.template,uos_coeff:0
-msgid "Coefficient to convert UOM to UOS\n"
+msgid "Coefficient to convert UOM to UOS"
" uos = uom * coeff"
msgstr ""
=== modified file 'product_expiry/i18n/product_expiry.pot'
--- product_expiry/i18n/product_expiry.pot 2010-11-18 16:25:12 +0000
+++ product_expiry/i18n/product_expiry.pot 2010-11-24 11:05:24 +0000
@@ -92,7 +92,7 @@
#. module: product_expiry
#: model:ir.module.module,description:product_expiry.module_meta_information
-msgid "Track different dates on products and production lots:\n"
+msgid "Track different dates on products and production lots:"
" - end of life\n"
" - best before date\n"
" - removal date\n"
=== modified file 'profile_tools/i18n/profile_tools.pot'
--- profile_tools/i18n/profile_tools.pot 2010-11-18 16:25:12 +0000
+++ profile_tools/i18n/profile_tools.pot 2010-11-24 11:05:24 +0000
@@ -57,8 +57,8 @@
#. module: profile_tools
#: model:ir.module.module,description:profile_tools.module_meta_information
-msgid "Installs tools for lunch,survey,subscription and audittrail\n"
-" module\n"
+msgid "Installs tools for lunch,survey,subscription and audittrail"
+" module"
" "
msgstr ""
=== modified file 'project/i18n/project.pot'
--- project/i18n/project.pot 2010-11-18 16:25:12 +0000
+++ project/i18n/project.pot 2010-11-24 11:05:24 +0000
@@ -862,9 +862,9 @@
#. module: project
#: help:project.task,state:0
-msgid "If the task is created the state is 'Draft'.\n"
-" If the task is started, the state becomes 'In Progress'.\n"
-" If review is needed the task is in 'Pending' state. \n"
+msgid "If the task is created the state is 'Draft'."
+" If the task is started, the state becomes 'In Progress'."
+" If review is needed the task is in 'Pending' state."
" If the task is over, the states is set to 'Done'."
msgstr ""
@@ -1179,7 +1179,7 @@
#. module: project
#: help:res.company,project_time_mode_id:0
-msgid "This will set the unit of measure used in projects and tasks.\n"
+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 ""
@@ -1247,11 +1247,11 @@
#. module: project
#: model:ir.module.module,description:project.module_meta_information
-msgid "Project management module tracks multi-level projects, tasks,\n"
-"work done on tasks, eso. It is able to render planning, order tasks, eso.\n"
-" Dashboard for project members that includes:\n"
-" * List of my open tasks\n"
-" * Members list of project\n"
+msgid "Project management module tracks multi-level projects, tasks,"
+"work done on tasks, eso. It is able to render planning, order tasks, eso."
+" Dashboard for project members that includes:"
+" * List of my open tasks"
+" * Members list of project"
" "
msgstr ""
@@ -1347,7 +1347,7 @@
#. module: project
#: view:project.project:0
-msgid "ID: %(task_id)s"
+msgid "ID:"
msgstr ""
#. module: project
@@ -1524,7 +1524,7 @@
#. module: project
#: view:project.project:0
-msgid "Task: %(name)s"
+msgid "Task:"
msgstr ""
#. module: project
=== modified file 'project_caldav/i18n/project_caldav.pot'
--- project_caldav/i18n/project_caldav.pot 2010-11-18 16:25:12 +0000
+++ project_caldav/i18n/project_caldav.pot 2010-11-24 11:05:24 +0000
@@ -476,7 +476,7 @@
#. module: project_caldav
#: help:project.task,rrule:0
-msgid "Defines a rule or repeating pattern for recurring events\n"
+msgid "Defines a rule or repeating pattern for recurring events"
"e.g.: Every other month on the last Sunday of the month for 10 occurrences: FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
msgstr ""
=== modified file 'project_issue/i18n/project_issue.pot'
--- project_issue/i18n/project_issue.pot 2010-11-18 16:25:12 +0000
+++ project_issue/i18n/project_issue.pot 2010-11-24 11:05:24 +0000
@@ -817,9 +817,9 @@
#. module: project_issue
#: help:project.issue,state:0
-msgid "The state is set to 'Draft', when a case is created. \n"
-"If the case is in progress the state is set to 'Open'. \n"
-"When the case is over, the state is set to 'Done'. \n"
+msgid "The state is set to 'Draft', when a case is created."
+"If the case is in progress the state is set to 'Open'."
+"When the case is over, the state is set to 'Done'."
"If the case needs to be reviewed then the state is set to 'Pending'."
msgstr ""
@@ -851,7 +851,7 @@
#. module: project_issue
#: help:project.issue,section_id:0
-msgid "Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway."
+msgid "Sales team to which Case belongs to.Define Responsible user and Email account for mail gateway."
msgstr ""
#. module: 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-11-24 11:05:24 +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_long_term/i18n/project_long_term.pot'
--- project_long_term/i18n/project_long_term.pot 2010-11-18 16:25:12 +0000
+++ project_long_term/i18n/project_long_term.pot 2010-11-24 11:05:24 +0000
@@ -237,7 +237,7 @@
#. module: project_long_term
#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
-msgid "To schedule phases of all or a specified project. It then open a gantt view.\n"
+msgid "To schedule phases of all or a specified project. It then open a gantt view."
" "
msgstr ""
@@ -495,9 +495,9 @@
#. module: project_long_term
#: help:project.phase,state:0
-msgid "If the phase is created the state 'Draft'.\n"
-" If the phase is started, the state becomes 'In Progress'.\n"
-" If review is needed the phase is in 'Pending' state. \n"
+msgid "If the phase is created the state 'Draft'."
+" If the phase is started, the state becomes 'In Progress'."
+" If review is needed the phase is in 'Pending' state."
" If the phase is over, the states is set to 'Done'."
msgstr ""
=== modified file 'project_mailgate/i18n/project_mailgate.pot'
--- project_mailgate/i18n/project_mailgate.pot 2010-11-18 16:25:12 +0000
+++ project_mailgate/i18n/project_mailgate.pot 2010-11-24 11:05:24 +0000
@@ -57,10 +57,9 @@
#. module: project_mailgate
#: model:ir.module.module,description:project_mailgate.module_meta_information
-msgid "This module is an interface that synchronises mails with OpenERP Project Task.\n"
-"\n"
-"It allows creating tasks as soon as a new mail arrives in our configured mail server.\n"
-"Moreover, it keeps track of all further communications and task states.\n"
+msgid "This module is an interface that synchronises mails with OpenERP Project Task."
+"It allows creating tasks as soon as a new mail arrives in our configured mail server."
+"Moreover, it keeps track of all further communications and task states."
" "
msgstr ""
=== modified file 'project_scrum/i18n/project_scrum.pot'
--- project_scrum/i18n/project_scrum.pot 2010-11-18 16:25:12 +0000
+++ project_scrum/i18n/project_scrum.pot 2010-11-24 11:05:24 +0000
@@ -811,14 +811,6 @@
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid " Email Not send to the product owner %s!' % meeting_id.sprint_id.product_owner_id.name))\n"
-" else:\n"
-" raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgstr ""
@@ -829,14 +821,6 @@
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid " Email Not send to the scrum master %s!' % meeting_id.sprint_id.scrum_master_id.name))\n"
-" else:\n"
-" raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
#: view:project.scrum.sprint:0
msgid "Responsible"
msgstr ""
=== modified file 'project_scrum/project_scrum.py'
--- project_scrum/project_scrum.py 2010-11-23 05:36:19 +0000
+++ project_scrum/project_scrum.py 2010-11-24 11:05:24 +0000
@@ -330,7 +330,11 @@
if meeting_id and meeting_id.sprint_id.scrum_master_id.user_email:
res = self.email_send(cr, uid, ids, meeting_id.sprint_id.scrum_master_id.user_email)
if not res:
+<<<<<<< TREE
raise osv.except_osv(_('Error !'), _('Email notification could not be sent to the scrum master %s') % meeting_id.sprint_id.scrum_master_id.name)
+=======
+ raise osv.except_osv(_('Error !'), _('Email Not send to the scrum master %s!') % meeting_id.sprint_id.scrum_master_id.name)
+>>>>>>> MERGE-SOURCE
else:
raise osv.except_osv(_('Error !'), _('Please provide email address for scrum master defined on sprint.'))
return True
@@ -343,7 +347,11 @@
if meeting_id.sprint_id.product_owner_id.user_email:
res = self.email_send(cr,uid,ids,meeting_id.sprint_id.product_owner_id.user_email)
if not res:
+<<<<<<< TREE
raise osv.except_osv(_('Error !'), _('Email notification could not be sent to the product owner %s') % meeting_id.sprint_id.product_owner_id.name)
+=======
+ raise osv.except_osv(_('Error !'), _('Email Not send to the product owner %s!') % meeting_id.sprint_id.product_owner_id.name)
+>>>>>>> MERGE-SOURCE
else:
raise osv.except_osv(_('Error !'), _('Please provide email address for product owner defined on sprint.'))
return True
=== 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-11-24 11:05:24 +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-11-18 16:25:12 +0000
+++ project_timesheet/i18n/project_timesheet.pot 2010-11-24 11:05:24 +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 ""
@@ -112,7 +112,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 ""
@@ -210,7 +210,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 ""
=== modified file 'purchase/i18n/purchase.pot'
--- purchase/i18n/purchase.pot 2010-11-18 16:25:12 +0000
+++ purchase/i18n/purchase.pot 2010-11-24 11:05:24 +0000
@@ -242,7 +242,7 @@
#. 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"
+msgid "You have to select a pricelist or a supplier in the purchase form !"
"Please set one before choosing a product."
msgstr ""
@@ -556,8 +556,8 @@
#. 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"
+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 ""
@@ -1488,15 +1488,13 @@
#. module: purchase
#: view:purchase.order.group:0
-msgid " Please note that: \n"
-" \n"
-" Orders will only be merged if: \n"
-" * Purchase Orders are in draft \n"
-" * Purchase Orders belong to the same supplier \n"
-" * Purchase Orders are have same stock location, same pricelist \n"
-" \n"
-" Lines will only be merged if: \n"
-" * Order lines are exactly the same except for the product,quantity and unit \n"
+msgid " Please note that:"
+" Orders will only be merged if: "
+" * Purchase Orders are in draft "
+" * Purchase Orders belong to the same supplier "
+" * Purchase Orders are have same stock location, same pricelist"
+" Lines will only be merged if:"
+" * Order lines are exactly the same except for the product,quantity and unit"
" "
msgstr ""
@@ -1538,9 +1536,9 @@
#. module: purchase
#: help:purchase.order.line,state:0
-msgid " * The 'Draft' state is set automatically when purchase order in draft state. \n"
-"* The 'Confirmed' state is set automatically as confirm when purchase order in confirm state. \n"
-"* The 'Done' state is set automatically when purchase order is set as done. \n"
+msgid " * The 'Draft' state is set automatically when purchase order in draft state."
+"* The 'Confirmed' state is set automatically as confirm when purchase order in confirm state."
+"* The 'Done' state is set automatically when purchase order is set as done."
"* The 'Cancelled' state is set automatically when user cancel purchase order."
msgstr ""
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2010-11-02 17:07:13 +0000
+++ purchase/purchase.py 2010-11-24 11:05:24 +0000
@@ -229,7 +229,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 +639,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 'report_designer/i18n/report_designer.pot'
--- report_designer/i18n/report_designer.pot 2010-11-18 16:25:12 +0000
+++ report_designer/i18n/report_designer.pot 2010-11-24 11:05:24 +0000
@@ -82,7 +82,7 @@
#. module: report_designer
#: model:ir.module.module,description:report_designer.module_meta_information
-msgid "Installer for reporting tools selection\n"
+msgid "Installer for reporting tools selection"
" "
msgstr ""
=== modified file 'report_webkit/i18n/report_webkit.pot'
--- report_webkit/i18n/report_webkit.pot 2010-11-18 16:25:12 +0000
+++ report_webkit/i18n/report_webkit.pot 2010-11-24 11:05:24 +0000
@@ -91,9 +91,9 @@
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:0
#, python-format
-msgid "Please install executable on your system'+\n"
-" ' (sudo apt-get install wkhtmltopdf) or download it from here:'+\n"
-" ' http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+\n"
+msgid "Please install executable on your system'+"
+" ' (sudo apt-get install wkhtmltopdf) or download it from here:'+"
+" ' http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+"
" ' path to the executable on the Company form."
msgstr ""
@@ -105,7 +105,7 @@
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:0
#, python-format
-msgid "Wrong Wkhtmltopdf path set in company'+\n"
+msgid "Wrong Wkhtmltopdf path set in company'+"
" 'Given path is not executable or path is wrong"
msgstr ""
@@ -215,40 +215,34 @@
#. module: report_webkit
#: model:ir.module.module,description:report_webkit.module_meta_information
-msgid "This module adds a new Report Engine based on WebKit library (wkhtmltopdf) to support reports designed in HTML + CSS.\n"
-"The module structure and some code is inspired by the report_openoffice module.\n"
-"The module allows:\n"
-" -HTML report definition\n"
-" -Multi header support \n"
-" -Multi logo\n"
-" -Multi company support\n"
-" -HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
-" -JavaScript support \n"
-" -Raw HTML debugger\n"
-" -Book printing capabilities\n"
-" -Margins definition \n"
-" -Paper size definition\n"
-"and much more\n"
-"\n"
-"Multiple headers and logos can be defined per company.\n"
-"CSS style, header and footer body are defined per company\n"
-"\n"
-"The library to install can be found here\n"
-"http://code.google.com/p/wkhtmltopdf/\n";
-"The system libraries are available for Linux, Mac OS X i386 and Windows 32.\n"
-"\n"
-"After installing the wkhtmltopdf library on the OpenERP Server machine, you need to set the\n"
-"path to the wkthtmltopdf executable file on the Company.\n"
-"\n"
-"For a sample report see also the webkit_report_sample module, and this video:\n"
-" http://files.me.com/nbessi/06n92k.mov \n"
-"\n"
-"\n"
-"TODO :\n"
-"JavaScript support activation deactivation\n"
-"Collated and book format support\n"
-"Zip return for separated PDF\n"
-"Web client WYSIWYG\n"
+msgid "This module adds a new Report Engine based on WebKit library (wkhtmltopdf) to support reports designed in HTML + CSS."
+"The module structure and some code is inspired by the report_openoffice module."
+"The module allows:"
+" -HTML report definition"
+" -Multi header support"
+" -Multi logo"
+" -Multi company support"
+" -HTML and CSS-3 support (In the limit of the actual WebKIT version)"
+" -JavaScript support"
+" -Raw HTML debugger"
+" -Book printing capabilities"
+" -Margins definition"
+" -Paper size definition"
+"and much more"
+"Multiple headers and logos can be defined per company."
+"CSS style, header and footer body are defined per company"
+"The library to install can be found here"
+"http://code.google.com/p/wkhtmltopdf/";
+"The system libraries are available for Linux, Mac OS X i386 and Windows 32."
+"After installing the wkhtmltopdf library on the OpenERP Server machine, you need to set the"
+"path to the wkthtmltopdf executable file on the Company."
+"For a sample report see also the webkit_report_sample module, and this video:"
+" http://files.me.com/nbessi/06n92k.mov "
+"TODO :"
+"JavaScript support activation deactivation"
+"Collated and book format support"
+"Zip return for separated PDF"
+"Web client WYSIWYG"
" "
msgstr ""
=== modified file 'report_webkit/webkit_report.py'
--- report_webkit/webkit_report.py 2010-10-26 13:22:54 +0000
+++ report_webkit/webkit_report.py 2010-11-24 11:05:24 +0000
@@ -144,7 +144,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-11-18 16:25:12 +0000
+++ report_webkit_sample/i18n/report_webkit_sample.pot 2010-11-24 11:05:24 +0000
@@ -32,13 +32,11 @@
#. module: report_webkit_sample
#: model:ir.module.module,description:report_webkit_sample.module_meta_information
-msgid "Samples for Webkit Report Engine (report_webkit module).\n"
-"\n"
-" A sample invoice report is included in this module, as well as a wizard to\n"
-" add Webkit Report entries on any Document in the system.\n"
-" \n"
-" You have to create the print buttons by calling the wizard. For more details see:\n"
-" http://files.me.com/nbessi/06n92k.mov \n"
+msgid "Samples for Webkit Report Engine (report_webkit module)."
+" A sample invoice report is included in this module, as well as a wizard to"
+" add Webkit Report entries on any Document in the system."
+" You have to create the print buttons by calling the wizard. For more details see:"
+" http://files.me.com/nbessi/06n92k.mov "
" "
msgstr ""
=== modified file 'sale/i18n/sale.pot'
--- sale/i18n/sale.pot 2010-11-18 16:25:12 +0000
+++ sale/i18n/sale.pot 2010-11-24 11:05:24 +0000
@@ -313,8 +313,8 @@
#. 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"
+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 ""
@@ -573,10 +573,10 @@
#. 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"
-" - The 'Shipping & Manual Invoice' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.\n"
-" - The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all picking lists have been finished.\n"
+msgid "The Shipping Policy is used to synchronise invoice and delivery operations."
+" - The 'Pay before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice."
+" - The 'Shipping & Manual Invoice' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice."
+" - The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all picking lists have been finished."
" - The 'Invoice from the picking' choice is used to create an invoice during the picking process."
msgstr ""
@@ -702,7 +702,7 @@
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
#, python-format
-msgid "You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'."
+msgid "You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'."
msgstr ""
#. module: sale
@@ -780,8 +780,8 @@
#. 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"
+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 ""
@@ -1055,17 +1055,17 @@
#. 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"
+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
#: 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"
-"* The 'Exception' state is set when the related sale order is set as exception. \n"
-"* The 'Done' state is set when the sale order line has been picked. \n"
+msgid "* The 'Draft' state is set when the related sale order in draft state."
+"* The 'Confirmed' state is set when the related sale order is confirmed."
+"* The 'Exception' state is set when the related sale order is set as exception."
+"* The 'Done' state is set when the sale order line has been picked."
"* The 'Cancelled' state is set when a user cancel the sale order related."
msgstr ""
@@ -1433,7 +1433,7 @@
#. 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"
+msgid "You plan to sell %.2f %s but you only have %.2f %s available !"
"The real stock is %.2f %s. (without reservations)"
msgstr ""
@@ -1578,7 +1578,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid " Type of ul: "
+msgid " Type of Shipping Unit: "
msgstr ""
#. module: sale
@@ -1680,7 +1680,7 @@
#. module: sale
#: code:addons/sale/sale.py:0
#, python-format
-msgid "You have to select a customer in the sale form !\n"
+msgid "You have to select a customer in the sale form !"
"Please set one customer before choosing a product."
msgstr ""
=== modified file 'sale/sale.py'
--- sale/sale.py 2010-11-11 06:22:25 +0000
+++ sale/sale.py 2010-11-24 11:05:24 +0000
@@ -1057,7 +1057,7 @@
qty_pack = pack.qty
type_ul = pack.ul
warn_msg = _("You selected a quantity of %d Units.\nBut it's not compatible with the selected packaging.\nHere is a proposition of quantities according to the packaging: ") % (qty)
- warn_msg = warn_msg + "\n\n" + _("EAN: ") + str(ean) + _(" Quantity: ") + str(qty_pack) + _(" Type of ul: ") + str(type_ul.name)
+ warn_msg = _("%s \n\n EAN: %s Quantity: %s Type of Shipping Unit: %s") % (warn_msg, str(ean), str(qty_pack), type_ul.name)
warning = {
'title': _('Picking Information !'),
'message': warn_msg
=== 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-11-24 11:05:24 +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_crm/wizard/crm_make_sale.py'
--- sale_crm/wizard/crm_make_sale.py 2010-10-22 07:23:46 +0000
+++ sale_crm/wizard/crm_make_sale.py 2010-11-24 11:05:24 +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 'share/i18n/share.pot'
--- share/i18n/share.pot 2010-11-18 16:25:12 +0000
+++ share/i18n/share.pot 2010-11-24 11:05:24 +0000
@@ -51,7 +51,7 @@
#. 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"
+msgid "You may use your existing login and password to view it. As a reminder, your login is %s."
""
msgstr ""
@@ -163,7 +163,7 @@
#. 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"
+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 ""
@@ -193,7 +193,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 "This additional data has been automatically added to your current access."
""
msgstr ""
@@ -344,7 +344,7 @@
#. 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"
+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 ""
@@ -361,7 +361,7 @@
#. module: share
#: code:addons/share/wizard/share_wizard.py:0
#, python-format
-msgid "To access it, you can go to the following URL:\n"
+msgid "To access it, you can go to the following URL:"
" %s"
msgstr ""
=== 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-11-24 11:05:24 +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-11-18 16:25:12 +0000
+++ stock/i18n/stock.pot 2010-11-24 11:05:24 +0000
@@ -88,18 +88,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-" product_qty = partial_data.get('product_qty',0.0)\n"
-" move_product_qty[move.id] = product_qty\n"
-" product_uom = partial_data.get('product_uom',False)\n"
-" product_price = partial_data.get('product_price',0.0)\n"
-" product_currency = partial_data.get('product_currency',False)\n"
-" prodlot_ids[move.id] = partial_data.get('prodlot_id"
-msgstr ""
-
-#. module: stock
#: model:ir.actions.act_window,help:stock.action_picking_tree
msgid "This is the list of all delivery orders that must be prepared, according to your different sales orders and your logistics rules."
msgstr ""
@@ -287,10 +275,10 @@
#. module: stock
#: help:stock.move,state:0
-msgid "When the stock move is created it is in the 'Draft' state.\n"
-" After that it is set to 'Confirmed' state.\n"
-" If stock is available state is set to 'Available'.\n"
-" When the picking is done the state is 'Done'. \n"
+msgid "When the stock move is created it is in the 'Draft' state."
+" After that it is set to 'Confirmed' state."
+" If stock is available state is set to 'Available'."
+" When the picking is done the state is 'Done'."
"The state is 'Waiting' if the move is waiting for another one."
msgstr ""
@@ -1058,37 +1046,35 @@
#. 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"
+msgid ""
+"Date: %(date)s"
+"\n"
+"Dear %(partner_name)s,"
+"Please find in attachment a reminder of all your unpaid invoices, for a total amount due of:"
+"%(followup_amount).2f %(company_currency)s"
+"\n"
+"Thanks,"
+"--"
+"%(user_signature)s"
+"%(company_name)s"
" "
msgstr ""
#. module: stock
#: help:stock.location,usage:0
-msgid "* Supplier Location: Virtual location representing the source location for products coming from your suppliers\n"
-" \n"
-"* View: Virtual location used to create a hierarchical structures for your warehouse, aggregating its child locations ; can't directly contain products\n"
-" \n"
-"* Internal Location: Physical locations inside your own warehouses,\n"
-" \n"
-"* Customer Location: Virtual location representing the destination location for products sent to your customers\n"
-" \n"
-"* Inventory: Virtual location serving as counterpart for inventory operations used to correct stock levels (Physical inventories)\n"
-" \n"
-"* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (supplier or production) is not known yet. This location should be empty when the procurement scheduler has finished running.\n"
-" \n"
-"* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products\n"
+msgid "* Supplier Location: Virtual location representing the source location for products coming from your suppliers"
+" "
+"* View: Virtual location used to create a hierarchical structures for your warehouse, aggregating its child locations ; can't directly contain products"
+" "
+"* Internal Location: Physical locations inside your own warehouses,"
+" "
+"* Customer Location: Virtual location representing the destination location for products sent to your customers"
+" "
+"* Inventory: Virtual location serving as counterpart for inventory operations used to correct stock levels (Physical inventories)"
+" "
+"* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (supplier or production) is not known yet. This location should be empty when the procurement scheduler has finished running."
+" "
+"* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products"
" "
msgstr ""
@@ -1205,18 +1191,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-" product_qty = partial_data.get('product_qty',0.0)\n"
-" move_product_qty[move.id] = product_qty\n"
-" product_uom = partial_data.get('product_uom',False)\n"
-" product_price = partial_data.get('product_price',0.0)\n"
-" product_currency = partial_data.get('product_currency',False)\n"
-" prodlot_id = partial_data.get('prodlot_id"
-msgstr ""
-
-#. module: stock
#: view:report.stock.inventory:0
#: view:report.stock.move:0
msgid "Total quantity"
@@ -1255,7 +1229,7 @@
#. module: stock
#: help:stock.location,chained_auto_packing:0
-msgid "This is used only if you select a chained location type.\n"
+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 ""
@@ -1550,11 +1524,11 @@
#. module: stock
#: help:stock.picking,state:0
-msgid "* Draft: not confirmed yet and will not be scheduled until confirmed\n"
-"* Confirmed: still waiting for the availability of products\n"
-"* Available: products reserved, simply waiting for confirmation.\n"
-"* Waiting: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n"
-"* Done: has been processed, can't be modified or cancelled anymore\n"
+msgid "* Draft: not confirmed yet and will not be scheduled until confirmed"
+"* Confirmed: still waiting for the availability of products"
+"* Available: products reserved, simply waiting for confirmation."
+"* Waiting: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)"
+"* Done: has been processed, can't be modified or cancelled anymore"
"* Cancelled: has been cancelled, can't be confirmed anymore"
msgstr ""
@@ -1658,14 +1632,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid "Variation Account is not specified for Product Category: %s' % (product_obj.categ_id.name)))\n"
-" move_ids = []\n"
-" loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-msgstr ""
-
-#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_UNDO"
msgstr ""
@@ -2079,21 +2045,21 @@
#. module: stock
#: model:ir.module.module,description:stock.module_meta_information
-msgid "OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations.\n"
-"Thanks to the double entry management, the inventory controlling is powerful and flexible:\n"
-"* Moves history and planning,\n"
-"* Different inventory methods (FIFO, LIFO, ...)\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules (stock level, JIT, ...)\n"
-"* Bar code supported\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (upstream/downstream, production lots, serial number, ...)\n"
-"* Dashboard for warehouse that includes:\n"
-" * Products to receive in delay (date < = today)\n"
-" * Procurement in exception\n"
-" * Graph : Number of Receive products vs planned (bar graph on week par day)\n"
-" * Graph : Number of Delivery products vs planned (bar graph on week par day)\n"
+msgid "OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations."
+"Thanks to the double entry management, the inventory controlling is powerful and flexible:"
+"* Moves history and planning,"
+"* Different inventory methods (FIFO, LIFO, ...)"
+"* Stock valuation (standard or average price, ...)"
+"* Robustness faced with Inventory differences"
+"* Automatic reordering rules (stock level, JIT, ...)"
+"* Bar code supported"
+"* Rapid detection of mistakes through double entry system"
+"* Traceability (upstream/downstream, production lots, serial number, ...)"
+"* Dashboard for warehouse that includes:"
+" * Products to receive in delay (date < = today)"
+" * Procurement in exception"
+" * Graph : Number of Receive products vs planned (bar graph on week par day)"
+" * Graph : Number of Delivery products vs planned (bar graph on week par day)"
" "
msgstr ""
@@ -3530,10 +3496,10 @@
#. module: stock
#: help:stock.location,chained_location_type:0
-msgid "Determines whether this location is chained to another location, i.e. any incoming product in this location \n"
-"should next go to the chained location. The chained location is determined according to the type :\n"
-"* None: No chaining at all\n"
-"* Customer: The chained location will be taken from the Customer Location field on the Partner form of the Partner that is specified in the Picking list of the incoming products.\n"
+msgid "Determines whether this location is chained to another location, i.e. any incoming product in this location "
+"should next go to the chained location. The chained location is determined according to the type :"
+"* None: No chaining at all"
+"* Customer: The chained location will be taken from the Customer Location field on the Partner form of the Partner that is specified in the Picking list of the incoming products."
"* Fixed Location: The chained location is taken from the next field: Chained Location if Fixed."
msgstr ""
@@ -3699,7 +3665,7 @@
#. module: stock
#: help:stock.change.standard.price,new_price:0
-msgid "If cost price is increased, stock variation account will be debited and stock output account will be credited with the value = (difference of amount * quantity available).\n"
+msgid "If cost price is increased, stock variation account will be debited and stock output account will be credited with the value = (difference of amount * quantity available)."
"If cost price is decreased, stock variation account will be creadited and stock input account will be debited."
msgstr ""
@@ -3914,10 +3880,10 @@
#. module: stock
#: help:report.stock.inventory,state:0
-msgid "When the stock move is created it is in the 'Draft' state.\n"
-" After that it is set to 'Confirmed' state.\n"
-" If stock is available state is set to 'Avaiable'.\n"
-" When the picking it done the state is 'Done'. \n"
+msgid "When the stock move is created it is in the 'Draft' state."
+" After that it is set to 'Confirmed' state."
+" If stock is available state is set to 'Avaiable'."
+" When the picking it done the state is 'Done'."
"The state is 'Waiting' if the move is waiting for another one."
msgstr ""
=== modified file 'stock/product.py'
--- stock/product.py 2010-11-19 12:20:03 +0000
+++ stock/product.py 2010-11-24 11:05:24 +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-19 12:20:03 +0000
+++ stock/stock.py 2010-11-24 11:05:24 +0000
@@ -1143,7 +1143,11 @@
if move.state in ('done', 'cancel'):
continue
partial_data = partial_datas.get('move%s'%(move.id), False)
+<<<<<<< TREE
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))
+>>>>>>> MERGE-SOURCE
product_qty = partial_data.get('product_qty',0.0)
move_product_qty[move.id] = product_qty
product_uom = partial_data.get('product_uom',False)
@@ -2244,7 +2248,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)
@@ -2274,7 +2278,11 @@
if move.state in ('done', 'cancel'):
continue
partial_data = partial_datas.get('move%s'%(move.id), False)
+<<<<<<< TREE
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))
+>>>>>>> MERGE-SOURCE
product_qty = partial_data.get('product_qty',0.0)
move_product_qty[move.id] = product_qty
product_uom = partial_data.get('product_uom',False)
@@ -2442,7 +2450,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': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S'), 'move_ids': [(6, 0, move_ids)]})
return True
=== modified file 'stock_location/i18n/stock_location.pot'
--- stock_location/i18n/stock_location.pot 2010-11-18 16:25:12 +0000
+++ stock_location/i18n/stock_location.pot 2010-11-24 11:05:24 +0000
@@ -114,7 +114,7 @@
#. 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"
+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 validated by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
msgstr ""
@@ -269,7 +269,7 @@
#. module: stock_location
#: help:product.pulled.flow,procure_method:0
-msgid "'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."
+msgid "'Make to Stock': When needed, take from the stock or wait until re-supplying.'Make to Order': When needed, purchase or produce for the procurement request."
msgstr ""
#. module: stock_location
=== modified file 'stock_planning/i18n/stock_planning.pot'
--- stock_planning/i18n/stock_planning.pot 2010-11-18 16:25:12 +0000
+++ stock_planning/i18n/stock_planning.pot 2010-11-24 11:05:24 +0000
@@ -370,10 +370,10 @@
#. module: stock_planning
#: help:stock.planning,stock_simulation:0
-msgid "Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
+msgid "Stock simulation at the end of selected Period."
+" For current period it is:"
+"Initial Stock - Already Out + Already In - Expected Out + Incoming Left."
+"For periods ahead it is: "
"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned In."
msgstr ""
@@ -646,118 +646,87 @@
#. module: stock_planning
#: model:ir.module.module,description:stock_planning.module_meta_information
-msgid "\n"
-"This module is based on original OpenERP SA module stock_planning version 1.0 of the same name Master Procurement Schedule.\n"
-"\n"
-"Purpose of MPS is to allow create a manual procurement (requisition) apart of MRP scheduler (which works automatically on minimum stock rules).\n"
-"\n"
-"Terms used in the module:\n"
-"- Stock and Sales Period - is the time (between Start Date and End Date) for which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-"- Stock and Sales Forecast - is the quantity of products you plan to sell in the Period.\n"
-"- Stock Planning - is the quantity of products you plan to purchase or produce for the Period.\n"
-"\n"
-"Because we have another module sale_forecast which uses terms \"Sales Forecast\" and \"Planning\" as amount values we will use terms \"Stock and Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity values. \n"
-"\n"
-"Activity with this module is divided to three steps:\n"
-"- Creating Periods. Mandatory step.\n"
-"- Creating Sale Forecasts and entering quantities to them. Optional step but useful for further planning.\n"
-"- Creating Planning lines, entering quantities to them and making Procurement. Making procurement is the final step for the Period.\n"
-"\n"
-"Periods\n"
-"=======\n"
-"You have two menu items for Periods in \"Sales Management - Configuration\". There are:\n"
-"- \"Create Sales Periods\" - Which automates creating daily, weekly or monthly periods.\n"
-"- \"Stock and sales Periods\" - Which allows to create any type of periods, change the dates and change the State of period.\n"
-"\n"
-"Creating periods is the first step you have to do to use modules features. You can create custom periods using \"New\" button in \"Stock and Sales Periods\" form or view but it is recommended to use automating tool.\n"
-"\n"
-"Remarks:\n"
-"- These periods (officially Stock and Sales Periods) are separated of Financial or other periods in the system.\n"
-"- Periods are not assigned to companies (when you use multicompany feature at all). Module suppose that you use the same periods across companies. If you wish to use different periods for different companies define them as you wish (they can overlap). Later on in this text will be indications how to use such periods.\n"
-"- When periods are created automatically their start and finish dates are with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. \n"
-"- If you use overlapping periods for the same product, warehouse and company results can be unpredictable.\n"
-"- If current date doesn't belong to any period or you have holes between periods results can be unpredictable.\n"
-"\n"
-"Sales Forecasts\n"
-"===============\n"
-"You have few menus for Sales forecast in \"Sales Management - Sales Forecasts\".\n"
-"- \"Create Sales Forecasts for Sales Periods\" - which automates creating forecasts lines according to some parameters.\n"
-"- \"Sales Forecasts\" - few menus for working with forecasts lists and forms.\n"
-"\n"
-"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for products from selected Category, for selected Period and for selected Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other settings of period before this one to created one.\n"
-"\n"
-"Remarks:\n"
-"- This tool doesn't create lines, if relevant lines (for the same Product, Period, Warehouse and validated or created by you) already exists. If you wish to create another forecast, if relevant lines exists you have to do it manually using menus described bellow.\n"
-"- When created lines are validated by someone else you can use this tool to create another lines for the same Period, Product and Warehouse. \n"
-"- When you choose \"Copy Last Forecast\" created line takes quantity and some settings from your (validated by you or created by you if not validated yet) forecast which is for last period before period of created forecast. If there are few your forecasts for period before this one (it is possible) system takes one of them (no rule which of them).\n"
-"\n"
-"\n"
-"Menus \"Sales Forecasts\"\n"
-"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in \"Product Quantity\". Further calculation can work for draft forecasts. But validation can save your data against any accidental changes. You can click \"Validate\" button but it is not mandatory.\n"
-"\n"
-"Instead of forecast quantity you can enter amount of forecast sales in field \"Product Amount\". System will count quantity from amount according to Sale price of the Product.\n"
-"\n"
-"All values on the form are expressed in unit of measure selected on form. You can select one of unit of measure from default category or from second category. When you change unit of measure the quanities will be recalculated according to new UoM: editable values (blue fields) immediately, non edited fields after clicking of \"Calculate Planning\" button.\n"
-"\n"
-"To find proper value for Sale Forecast you can use \"Sales History\" table for this product. You have to enter parameters to the top and left of this table and system will count sale quantities according to these parameters. So you can select fe. your department (at the top) then (to the left): last period, period before last and period year ago.\n"
-"\n"
-"Remarks:\n"
-"\n"
-"\n"
-"Procurement Planning\n"
-"====================\n"
-"Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-"- \"Create Stock Planning Lines\" - allows you to automate creating planning lines according to some parameters.\n"
-"- \"Master Procurement Scheduler\" - is the most important menu of the module which allows to create procurement.\n"
-"\n"
-"As Sales forecast is phase of planning sales. The Procurement Planning (Planning) is the phase of scheduling Purchasing or Producing. You can create Procurement Planning quickly using tool from menu \"Create Stock Planning Lines\", then you can review created planning and make procurement using menu \"Master Procurement Schedule\".\n"
-"\n"
-"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning lines for products from selected Category, for selected Period, and for selected Warehouse. When you check option \"All Products with Forecast\" system creates lines for all products having forecast for selected Period and Warehouse. Selected Category will be ignored in this case.\n"
-"\n"
-"Under menu \"Master Procurement Scheduler\" you can generally change the values \"Planned Out\" and \"Planned In\" to observe the field \"Stock Simulation\" and decide if this value would be accurate for end of the Period. \n"
-"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of all forecasts for Period and Warehouse. But your planning can be based on any other information you have. It is not necessary to have any forecast. \n"
-"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which is the quantity to be procured to make stock as indicated in \"Stock Simulation\" at the end of Period. You can compare \"Stock Simulation\" quantity to minimum stock rules visible on the form. But you can plan different quantity than in Minimum Stock Rules. Calculation is made for whole Warehouse by default. But if you want to see values for Stock location of calculated warehouse you can use check box \"Stock Location Only\".\n"
-"\n"
-"If after few tries you decide that you found correct quantities for \"Planned Out\" and \"Planned In\" and you are satisfied with end of period stock calculated in \"Stock Simulation\" you can click \"Procure Incoming Left\" button to procure quantity of field \"Incoming Left\" into the Warehouse. System creates appropriate Procurement Order. You can decide if procurement will be made to Stock or Input location of calculated Warehouse. \n"
-"\n"
-"If you don't want to Produce or Buy the product but just pick calculated quantity from another warehouse you can click \"Supply from Another Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list with move from selected source Warehouse to calculated Warehouse (as destination). You can also decide if this pick should be done from Stock or Output location of source warehouse. Destination location (Stock or Input) of destination warehouse will be used as set for \"Procure Incoming Left\". \n"
-"\n"
-"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", \"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you have to click button \"Calculate Planning\".\n"
-"\n"
-"All values on the form are expressed in unit of measure selected on form. You can select one of unit of measure from default category or from second category. When you change unit of measure the quanities will be recalculated according to new UoM: editable values (blue fields) immediately, non edited fields after clicking of \"Calculate Planning\" button.\n"
-"\n"
-"How Stock Simulation field is calculated:\n"
-"Generally Stock Simulation shows the stock for end of the calculated period according to some planned or confirmed stock moves. Calculation always starts with quantity of real stock of beginning of current period. Then calculation adds or subtracts quantities of calculated period or periods before calculated.\n"
-"When you are in the same period (current period is the same as calculated) Stock Simulation is calculated as follows:\n"
-"Stock Simulation = \n"
-" Stock of beginning of current Period\n"
-" - Planned Out \n"
-" + Planned In\n"
-"\n"
-"When you calculate period next to current:\n"
-"Stock Simulation = \n"
-" Stock of beginning of current Period\n"
-" - Planned Out of current Period \n"
-" + Confirmed In of current Period (incl. Already In)\n"
-" - Planned Out of calculated Period \n"
-" + Planned In of calculated Period .\n"
-"\n"
-"As you see calculated Period is taken the same way like in case above. But calculation of current Period are made a little bit different. First you should note that system takes for current Period only Confirmed In moves. It means that you have to make planning and procurement for current Period before this calculation (for Period next to current). \n"
-"\n"
-"When you calculate Period ahead:\n"
-"Stock Simulation = \n"
-" Stock of beginning of current Period \n"
-" - Sum of Planned Out of Periods before calculated \n"
-" + Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-" - Planned Out of calculated Period \n"
-" + Planned In of calculated Period.\n"
-"\n"
-"Periods before calculated means periods starting from current till period before calculated.\n"
-"\n"
-"Remarks:\n"
-"- Remember to make planning for all periods before calculated because omitting these quantities and procurements can cause wrong suggestions for procurements few periods ahead.\n"
-"- If you made planning few periods ahead and you find that real Confirmed Out is bigger than Planned Out in some periods before you can repeat Planning and make another procurement. You should do it in the same planning line. If you create another planning line the suggestions can be wrong.\n"
-"- When you wish to work with different periods for some part of products define two kinds of periods (fe. Weekly and Monthly) and use them for different products. Example: If you use always Weekly periods for Products A, and Monthly periods for Products B your all calculations will work correctly. You can also use different kind of periods for the same products from different warehouse or companies. But you cannot use overlapping periods for the same product, warehouse and company because results can be unpredictable. The same apply to Forecasts lines.\n"
+msgid ""
+"This module is based on original OpenERP SA module stock_planning version 1.0 of the same name Master Procurement Schedule."
+"Purpose of MPS is to allow create a manual procurement (requisition) apart of MRP scheduler (which works automatically on minimum stock rules)."
+"Terms used in the module:"
+"- Stock and Sales Period - is the time (between Start Date and End Date) for which you plan Stock and Sales Forecast and make Procurement Planning."
+"- Stock and Sales Forecast - is the quantity of products you plan to sell in the Period."
+"- Stock Planning - is the quantity of products you plan to purchase or produce for the Period."
+"Because we have another module sale_forecast which uses terms \"Sales Forecast\" and \"Planning\" as amount values we will use terms \"Stock and Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity values."
+"Activity with this module is divided to three steps:"
+"- Creating Periods. Mandatory step."
+"- Creating Sale Forecasts and entering quantities to them. Optional step but useful for further planning."
+"- Creating Planning lines, entering quantities to them and making Procurement. Making procurement is the final step for the Period."
+"Periods"
+"======="
+"You have two menu items for Periods in \"Sales Management - Configuration\". There are:"
+"- \"Create Sales Periods\" - Which automates creating daily, weekly or monthly periods."
+"- \"Stock and sales Periods\" - Which allows to create any type of periods, change the dates and change the State of period."
+"Creating periods is the first step you have to do to use modules features. You can create custom periods using \"New\" button in \"Stock and Sales Periods\" form or view but it is recommended to use automating tool."
+"Remarks:"
+"- These periods (officially Stock and Sales Periods) are separated of Financial or other periods in the system."
+"- Periods are not assigned to companies (when you use multicompany feature at all). Module suppose that you use the same periods across companies. If you wish to use different periods for different companies define them as you wish (they can overlap). Later on in this text will be indications how to use such periods."
+"- When periods are created automatically their start and finish dates are with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. "
+"- If you use overlapping periods for the same product, warehouse and company results can be unpredictable."
+"- If current date doesn't belong to any period or you have holes between periods results can be unpredictable."
+"Sales Forecasts"
+"==============="
+"You have few menus for Sales forecast in \"Sales Management - Sales Forecasts\"."
+"- \"Create Sales Forecasts for Sales Periods\" - which automates creating forecasts lines according to some parameters."
+"- \"Sales Forecasts\" - few menus for working with forecasts lists and forms."
+"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for products from selected Category, for selected Period and for selected Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other settings of period before this one to created one."
+"Remarks:"
+"- This tool doesn't create lines, if relevant lines (for the same Product, Period, Warehouse and validated or created by you) already exists. If you wish to create another forecast, if relevant lines exists you have to do it manually using menus described bellow."
+"- When created lines are validated by someone else you can use this tool to create another lines for the same Period, Product and Warehouse."
+"- When you choose \"Copy Last Forecast\" created line takes quantity and some settings from your (validated by you or created by you if not validated yet) forecast which is for last period before period of created forecast. If there are few your forecasts for period before this one (it is possible) system takes one of them (no rule which of them)."
+"Menus \"Sales Forecasts\" "
+"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in \"Product Quantity\". Further calculation can work for draft forecasts. But validation can save your data against any accidental changes. You can click \"Validate\" button but it is not mandatory."
+"Instead of forecast quantity you can enter amount of forecast sales in field \"Product Amount\". System will count quantity from amount according to Sale price of the Product."
+"All values on the form are expressed in unit of measure selected on form. You can select one of unit of measure from default category or from second category. When you change unit of measure the quanities will be recalculated according to new UoM: editable values (blue fields) immediately, non edited fields after clicking of \"Calculate Planning\" button."
+"To find proper value for Sale Forecast you can use \"Sales History\" table for this product. You have to enter parameters to the top and left of this table and system will count sale quantities according to these parameters. So you can select fe. your department (at the top) then (to the left): last period, period before last and period year ago."
+"Remarks:"
+"Procurement Planning"
+"===================="
+"Menu for Planning you can find in \"Warehouse - Stock Planning\"."
+"- \"Create Stock Planning Lines\" - allows you to automate creating planning lines according to some parameters."
+"- \"Master Procurement Scheduler\" - is the most important menu of the module which allows to create procurement."
+"As Sales forecast is phase of planning sales. The Procurement Planning (Planning) is the phase of scheduling Purchasing or Producing. You can create Procurement Planning quickly using tool from menu \"Create Stock Planning Lines\", then you can review created planning and make procurement using menu \"Master Procurement Schedule\"."
+"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning lines for products from selected Category, for selected Period, and for selected Warehouse. When you check option \"All Products with Forecast\" system creates lines for all products having forecast for selected Period and Warehouse. Selected Category will be ignored in this case."
+"Under menu \"Master Procurement Scheduler\" you can generally change the values \"Planned Out\" and \"Planned In\" to observe the field \"Stock Simulation\" and decide if this value would be accurate for end of the Period."
+"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of all forecasts for Period and Warehouse. But your planning can be based on any other information you have. It is not necessary to have any forecast."
+"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which is the quantity to be procured to make stock as indicated in \"Stock Simulation\" at the end of Period. You can compare \"Stock Simulation\" quantity to minimum stock rules visible on the form. But you can plan different quantity than in Minimum Stock Rules. Calculation is made for whole Warehouse by default. But if you want to see values for Stock location of calculated warehouse you can use check box \"Stock Location Only\"."
+"If after few tries you decide that you found correct quantities for \"Planned Out\" and \"Planned In\" and you are satisfied with end of period stock calculated in \"Stock Simulation\" you can click \"Procure Incoming Left\" button to procure quantity of field \"Incoming Left\" into the Warehouse. System creates appropriate Procurement Order. You can decide if procurement will be made to Stock or Input location of calculated Warehouse."
+"If you don't want to Produce or Buy the product but just pick calculated quantity from another warehouse you can click \"Supply from Another Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list with move from selected source Warehouse to calculated Warehouse (as destination). You can also decide if this pick should be done from Stock or Output location of source warehouse. Destination location (Stock or Input) of destination warehouse will be used as set for \"Procure Incoming Left\"."
+"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", \"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you have to click button \"Calculate Planning\"."
+"All values on the form are expressed in unit of measure selected on form. You can select one of unit of measure from default category or from second category. When you change unit of measure the quanities will be recalculated according to new UoM: editable values (blue fields) immediately, non edited fields after clicking of \"Calculate Planning\" button."
+"How Stock Simulation field is calculated:"
+"Generally Stock Simulation shows the stock for end of the calculated period according to some planned or confirmed stock moves. Calculation always starts with quantity of real stock of beginning of current period. Then calculation adds or subtracts quantities of calculated period or periods before calculated."
+"When you are in the same period (current period is the same as calculated) Stock Simulation is calculated as follows:"
+"Stock Simulation = "
+" Stock of beginning of current Period"
+" - Planned Out"
+" + Planned In"
+"When you calculate period next to current:"
+"Stock Simulation = "
+" Stock of beginning of current Period"
+" - Planned Out of current Period "
+" + Confirmed In of current Period (incl. Already In)"
+" - Planned Out of calculated Period"
+" + Planned In of calculated Period ."
+"As you see calculated Period is taken the same way like in case above. But calculation of current Period are made a little bit different. First you should note that system takes for current Period only Confirmed In moves. It means that you have to make planning and procurement for current Period before this calculation (for Period next to current)."
+"When you calculate Period ahead:"
+"Stock Simulation = "
+" Stock of beginning of current Period "
+" - Sum of Planned Out of Periods before calculated "
+" + Sum of Confirmed In of Periods before calculated (incl. Already In)"
+" - Planned Out of calculated Period "
+" + Planned In of calculated Period."
+"Periods before calculated means periods starting from current till period before calculated."
+"Remarks:"
+"- Remember to make planning for all periods before calculated because omitting these quantities and procurements can cause wrong suggestions for procurements few periods ahead."
+"- If you made planning few periods ahead and you find that real Confirmed Out is bigger than Planned Out in some periods before you can repeat Planning and make another procurement. You should do it in the same planning line. If you create another planning line the suggestions can be wrong."
+"- When you wish to work with different periods for some part of products define two kinds of periods (fe. Weekly and Monthly) and use them for different products. Example: If you use always Weekly periods for Products A, and Monthly periods for Products B your all calculations will work correctly. You can also use different kind of periods for the same products from different warehouse or companies. But you cannot use overlapping periods for the same product, warehouse and company because results can be unpredictable. The same apply to Forecasts lines."
""
msgstr ""
=== modified file 'stock_planning/stock_planning.py'
--- stock_planning/stock_planning.py 2010-09-30 05:28:13 +0000
+++ stock_planning/stock_planning.py 2010-11-24 11:05:24 +0000
@@ -632,13 +632,13 @@
'location_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or obj.warehouse_id.lot_input_id.id,
'procure_method': 'make_to_order',
'note' : _("Procurement created in MPS by user: ") + str(user.login) + _(" Creation Date: ") + \
- time.strftime('%Y-%m-%d %H:%M:%S') + \
- _("\nFor period: ") + obj.period_id.name + _(" according to state:") + \
- _("\n Warehouse Forecast: ") + str(obj.warehouse_forecast) + \
- _("\n Initial Stock: ") + str(obj.stock_start) + \
- _("\n Planned Out: ") + str(obj.planned_outgoing) + _(" Planned In: ") + str(obj.to_procure) + \
- _("\n Already Out: ") + str(obj.already_out) + _(" Already In: ") + str(obj.already_in) + \
- _("\n Confirmed Out: ") + str(obj.outgoing) + _(" Confirmed In: ") + str(obj.incoming) + \
+ time.strftime('%Y-%m-%d %H:%M:%S') + '\n' +\
+ _("For period: ") + obj.period_id.name + _(" according to state:") +'\n' + \
+ _("\n Warehouse Forecast: ") + str(obj.warehouse_forecast) +'\n' + \
+ _("\n Initial Stock: ") + str(obj.stock_start) +'\n' +\
+ _("\n Planned Out: ") + str(obj.planned_outgoing) + _(" Planned In: ") + str(obj.to_procure) + '\n' +\
+ _("\n Already Out: ") + str(obj.already_out) + _(" Already In: ") + str(obj.already_in) + '\n' +\
+ _("\n Confirmed Out: ") + str(obj.outgoing) + _(" Confirmed In: ") + str(obj.incoming) + '\n' +\
_("\n Planned Out Before: ") + str(obj.outgoing_before) + _(" Confirmed In Before: ") + \
str(obj.incoming_before) + \
_("\n Expected Out: ") + str(obj.outgoing_left) + _(" Incoming Left: ") + str(obj.incoming_left) + \
=== modified file 'subscription/i18n/subscription.pot'
--- subscription/i18n/subscription.pot 2010-11-18 16:25:12 +0000
+++ subscription/i18n/subscription.pot 2010-11-24 11:05:24 +0000
@@ -186,7 +186,7 @@
#. module: subscription
#: code:addons/subscription/subscription.py:0
#, python-format
-msgid "You cannot modify the Object linked to the Document Type!\n"
+msgid "You cannot modify the Object linked to the Document Type!"
"Create another Document instead !"
msgstr ""
@@ -334,7 +334,7 @@
#. module: subscription
#: code:addons/subscription/subscription.py:0
#, python-format
-msgid "Please provide another source document.\n"
+msgid "Please provide another source document."
"This one does not exist !"
msgstr ""
=== modified file 'subscription/subscription.py'
--- subscription/subscription.py 2010-11-15 11:12:22 +0000
+++ subscription/subscription.py 2010-11-24 11:05:24 +0000
@@ -41,7 +41,7 @@
def write(self, cr, uid, ids, vals, context=None):
if 'model' in vals:
- raise osv.except_osv(_('Error !'),_('You cannot modify the Object linked to the Document Type!\nCreate another Document instead !'))
+ raise osv.except_osv(_('Error !'),_('You cannot modify the Object linked to the Document Type! Create another Document instead !'))
return super(subscription_document, self).write(cr, uid, ids, vals, context=context)
subscription_document()
@@ -112,7 +112,7 @@
id = int(id)
model = self.pool.get(model_name)
except:
- raise osv.except_osv(_('Wrong Source Document !'), _('Please provide another source document.\nThis one does not exist !'))
+ raise osv.except_osv(_('Wrong Source Document !'), _('Please provide another source document.This one does not exist !'))
default = {'state':'draft'}
doc_obj = self.pool.get('subscription.document')
=== modified file 'survey/i18n/survey.pot'
--- survey/i18n/survey.pot 2010-11-18 16:25:12 +0000
+++ survey/i18n/survey.pot 2010-11-24 11:05:24 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:13:19+0000\n"
-"PO-Revision-Date: 2010-11-18 16:13:19+0000\n"
+"POT-Creation-Date: 2010-10-18 17:47:06+0000\n"
+"PO-Revision-Date: 2010-10-18 17:47:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,15 +16,24 @@
"Plural-Forms: \n"
#. module: survey
-#: view:survey.print:0
-#: view:survey.print.answer:0
-msgid "Print Option"
+#: view:survey.response.line:0
+msgid "Single Textboxes"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+#: model:ir.ui.menu,name:survey.menu_print_survey_form
+#: model:ir.ui.menu,name:survey.menu_reporting
+#: model:ir.ui.menu,name:survey.menu_survey_form
+#: model:ir.ui.menu,name:survey.menu_surveys
+msgid "Surveys"
msgstr ""
#. module: survey
#: code:addons/survey/survey.py:0
#, python-format
-msgid "Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
+msgid "You must enter one or more menu choices"
+"in column heading"
msgstr ""
#. module: survey
@@ -39,9 +48,8 @@
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d."
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "Survey Questions"
msgstr ""
#. module: survey
@@ -56,15 +64,6 @@
msgstr ""
#. module: survey
-#: model:ir.actions.act_window,name:survey.action_survey_form1
-#: model:ir.ui.menu,name:survey.menu_print_survey_form
-#: model:ir.ui.menu,name:survey.menu_reporting
-#: model:ir.ui.menu,name:survey.menu_survey_form
-#: model:ir.ui.menu,name:survey.menu_surveys
-msgid "Surveys"
-msgstr ""
-
-#. module: survey
#: view:survey:0
msgid "Set to draft"
msgstr ""
@@ -113,12 +112,6 @@
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "You must enter one or more menu choices in column heading (white spaces not allowed)"
-msgstr ""
-
-#. module: survey
#: view:survey:0
#: view:survey.page:0
#: view:survey.question:0
@@ -155,6 +148,12 @@
msgstr ""
#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Letter (8.5\" x 11\")"
+msgstr ""
+
+#. module: survey
#: view:survey:0
msgid "Completed"
msgstr ""
@@ -165,8 +164,16 @@
msgstr ""
#. module: survey
-#: view:survey:0
-msgid "Open Date"
+#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
+msgid "Send Invitations"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Maximum Required Answer you"
+"entered for your maximum is greater than the number of answer."
+"Please use a number that is smaller than %d."
msgstr ""
#. module: survey
@@ -180,9 +187,8 @@
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
+#: selection:survey.request,state:0
+msgid "Wating Answer"
msgstr ""
#. module: survey
@@ -201,16 +207,16 @@
msgstr ""
#. module: survey
-#: model:ir.actions.act_window,name:survey.action_survey_question_form
-msgid "Survey Questions"
-msgstr ""
-
-#. module: survey
#: view:survey.response.line:0
msgid "Table Answer"
msgstr ""
#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr ""
+
+#. module: survey
#: selection:survey.question,type:0
msgid "Matrix of Choices (Only One Answers Per Row)"
msgstr ""
@@ -292,9 +298,8 @@
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
-#, python-format
-msgid "Error!"
+#: field:survey.answer,type:0
+msgid "Type of Answer"
msgstr ""
#. module: survey
@@ -308,6 +313,11 @@
msgstr ""
#. module: survey
+#: field:survey.question.column.heading,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible ??"
+msgstr ""
+
+#. module: survey
#: model:ir.actions.report.xml,name:survey.survey_analysis
msgid "Survey Statistics"
msgstr ""
@@ -325,6 +335,12 @@
msgstr ""
#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid "You can not give answer because of survey is not open for answer"
+msgstr ""
+
+#. module: survey
#: field:survey.question,comment_field_type:0
msgid "Comment Field Type"
msgstr ""
@@ -360,8 +376,11 @@
msgstr ""
#. module: survey
-#: view:survey.response.line:0
-msgid "Survey Answer Line"
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Maximum Required Answer you"
+"entered for your maximum is greater than the number of answer."
+"Please use a number that is smaller than %d."
msgstr ""
#. module: survey
@@ -375,8 +394,15 @@
msgstr ""
#. module: survey
-#: field:survey.question,is_validation_require:0
-msgid "Validate Text"
+#: view:survey.response.line:0
+msgid "Survey Answer Line"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the question is not answered, display this error message:"
msgstr ""
#. module: survey
@@ -385,12 +411,6 @@
msgstr ""
#. module: survey
-#: selection:survey.print,paper_size:0
-#: selection:survey.print.answer,paper_size:0
-msgid "Letter (8.5\" x 11\")"
-msgstr ""
-
-#. module: survey
#: view:survey:0
#: field:survey,responsible_id:0
msgid "Responsible"
@@ -414,8 +434,8 @@
msgstr ""
#. module: survey
-#: selection:survey.request,state:0
-msgid "Wating Answer"
+#: model:ir.model,name:survey.model_survey_tbl_column_heading
+msgid "survey.tbl.column.heading"
msgstr ""
#. module: survey
@@ -460,27 +480,11 @@
msgstr ""
#. module: survey
-#: view:survey.send.invitation:0
-msgid "Send"
-msgstr ""
-
-#. module: survey
#: field:survey.question.wiz,name:0
msgid "Number"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "You must enter one or more menu choices in column heading"
-msgstr ""
-
-#. module: survey
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: survey
#: view:survey:0
#: view:survey.request:0
#: field:survey.request,state:0
@@ -528,11 +532,6 @@
msgstr ""
#. module: survey
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: survey
#: selection:survey.response,state:0
msgid "Not Finished"
msgstr ""
@@ -543,6 +542,12 @@
msgstr ""
#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:0
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr ""
+
+#. module: survey
#: view:survey.send.invitation:0
msgid "Select Partner"
msgstr ""
@@ -553,23 +558,11 @@
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
-#, python-format
-msgid "You can not answer this survey more than %s times"
-msgstr ""
-
-#. module: survey
#: model:ir.actions.act_window,name:survey.act_survey_answer
msgid "Answers"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
-#, python-format
-msgid "You can not answer because the survey is not open"
-msgstr ""
-
-#. module: survey
#: selection:survey.response,response_type:0
msgid "Link"
msgstr ""
@@ -658,14 +651,8 @@
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
-#, python-format
-msgid "Please enter an integer value"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_browse_answer
-msgid "survey.browse.answer"
+#: view:survey.send.invitation:0
+msgid "Send"
msgstr ""
#. module: survey
@@ -674,12 +661,6 @@
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d."
-msgstr ""
-
-#. module: survey
#: view:survey.request:0
msgid "Watting Answer"
msgstr ""
@@ -688,13 +669,6 @@
#: view:survey:0
#: view:survey.page:0
#: view:survey.question:0
-msgid "When the question is not answered, display this error message:"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.page:0
-#: view:survey.question:0
msgid "Options"
msgstr ""
@@ -720,8 +694,11 @@
msgstr ""
#. module: survey
-#: selection:survey.answer,type:0
-msgid "Selection"
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "#Required Answer you entered"
+"is greater than the number of answer."
+"Please use a number that is smaller than %d."
msgstr ""
#. module: survey
@@ -748,6 +725,13 @@
msgstr ""
#. module: survey
+#: field:survey,page_ids:0
+#: view:survey.question:0
+#: field:survey.response.line,page_id:0
+msgid "Page"
+msgstr ""
+
+#. module: survey
#: field:survey.question,comment_column:0
msgid "Add comment column in matrix"
msgstr ""
@@ -771,9 +755,11 @@
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_selection.py:0
-#, python-format
-msgid "You can not give more response. Please contact the author of this survey for further assistance."
+#: field:survey.history,user_id:0
+#: view:survey.request:0
+#: field:survey.request,user_id:0
+#: field:survey.response,user_id:0
+msgid "User"
msgstr ""
#. module: survey
@@ -814,9 +800,9 @@
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
-#, python-format
-msgid "Cannot locate survey for the question wizard!"
+#: view:survey.print:0
+#: view:survey.print.answer:0
+msgid "Print Option"
msgstr ""
#. module: survey
@@ -845,6 +831,12 @@
msgstr ""
#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid "You can not give answer for this survey more than %s times"
+msgstr ""
+
+#. module: survey
#: field:survey,date_close:0
msgid "Survey Close Date"
msgstr ""
@@ -855,8 +847,8 @@
msgstr ""
#. module: survey
-#: field:survey.question.column.heading,in_visible_rating_weight:0
-msgid "Is Rating Scale Invisible ??"
+#: view:survey:0
+msgid "Open Date"
msgstr ""
#. module: survey
@@ -922,18 +914,11 @@
msgstr ""
#. module: survey
-#: field:survey,max_response_limit:0
-msgid "Maximum Answer Limit"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
-msgid "Send Invitations"
-msgstr ""
-
-#. module: survey
-#: field:survey.name.wiz,store_ans:0
-msgid "Store Answer"
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "#Required Answer you entered is "
+"greater than the number of answer."
+"Please use a number that is smaller than %d."
msgstr ""
#. module: survey
@@ -987,11 +972,6 @@
msgstr ""
#. module: survey
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
-#. module: survey
#: field:survey.question,no_of_rows:0
msgid "No of Rows"
msgstr ""
@@ -1018,10 +998,8 @@
msgstr ""
#. module: survey
-#: view:survey:0
-#: view:survey.page:0
-#: view:survey.question:0
-msgid "Validation"
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
msgstr ""
#. module: survey
@@ -1057,14 +1035,6 @@
msgstr ""
#. module: survey
-#: field:survey.history,user_id:0
-#: view:survey.request:0
-#: field:survey.request,user_id:0
-#: field:survey.response,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: survey
#: field:survey.name.wiz,transfer:0
msgid "Page Transfer"
msgstr ""
@@ -1087,8 +1057,20 @@
msgstr ""
#. module: survey
-#: model:ir.model,name:survey.model_survey_tbl_column_heading
-msgid "survey.tbl.column.heading"
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Maximum Required Answer is greater"
+"than Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+msgid "Give Survey Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_browse_answer
+msgid "survey.browse.answer"
msgstr ""
#. module: survey
@@ -1097,9 +1079,8 @@
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_selection.py:0
-#, python-format
-msgid "You can not give response for this survey more than %s times"
+#: selection:survey.answer,type:0
+msgid "Selection"
msgstr ""
#. module: survey
@@ -1134,16 +1115,19 @@
msgstr ""
#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Minimum Required Answer"
+"you entered is greater than the number of answer."
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
#: model:ir.model,name:survey.model_survey_question_wiz
msgid "survey.question.wiz"
msgstr ""
#. module: survey
-#: view:survey:0
-msgid "History"
-msgstr ""
-
-#. module: survey
#: help:survey.browse.answer,response_id:0
msgid "If this field is empty, all answers of the selected survey will be print."
msgstr ""
@@ -1201,6 +1185,13 @@
#. module: survey
#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Validation"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
msgid "Other"
msgstr ""
@@ -1249,11 +1240,6 @@
msgstr ""
#. module: survey
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: survey
#: field:survey,tot_start_survey:0
msgid "Total Started Survey"
msgstr ""
@@ -1295,11 +1281,6 @@
msgstr ""
#. module: survey
-#: model:ir.actions.act_window,name:survey.action_view_survey_name
-msgid "Give Survey Answer"
-msgstr ""
-
-#. module: survey
#: model:ir.model,name:survey.model_res_users
msgid "res.users"
msgstr ""
@@ -1326,25 +1307,13 @@
msgstr ""
#. module: survey
-#: field:survey.answer,type:0
-msgid "Type of Answer"
-msgstr ""
-
-#. module: survey
#: field:survey.question,required_type:0
msgid "Respondent must answer"
msgstr ""
#. module: survey
-#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
-#: view:survey.send.invitation:0
-msgid "Send Invitation"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
-#, python-format
-msgid "You cannot select the same answer more than one time"
+#: field:survey,max_response_limit:0
+msgid "Maximum Answer Limit"
msgstr ""
#. module: survey
@@ -1353,11 +1322,6 @@
msgstr ""
#. module: survey
-#: field:survey,title:0
-msgid "Survey Title"
-msgstr ""
-
-#. module: survey
#: selection:survey.question,type:0
msgid "Single Textbox"
msgstr ""
@@ -1382,6 +1346,19 @@
msgstr ""
#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
+#: view:survey.send.invitation:0
+msgid "Send Invitation"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You must enter one or more menu "
+"choices in column heading (white spaces not allowed)"
+msgstr ""
+
+#. module: survey
#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log
#: model:ir.model,name:survey.model_survey_send_invitation_log
msgid "survey.send.invitation.log"
@@ -1426,6 +1403,11 @@
msgstr ""
#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr ""
+
+#. module: survey
#: model:ir.actions.report.xml,name:survey.survey_browse_response
#: field:survey.browse.answer,response_id:0
msgid "Survey Answers"
@@ -1447,15 +1429,14 @@
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
+#: field:survey.question,is_validation_require:0
+msgid "Validate Text"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_selection.py:0
#, python-format
-msgid "You cannot select same answer more than one time'"
+msgid "You can not give more response. Please contact the author of this survey for further assistance."
msgstr ""
#. module: survey
@@ -1505,27 +1486,16 @@
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
-msgstr ""
-
-#. module: survey
#: field:survey.answer,menu_choice:0
msgid "Menu Choices"
msgstr ""
#. module: survey
-#: field:survey,page_ids:0
-#: view:survey.question:0
-#: field:survey.response.line,page_id:0
-msgid "Page"
-msgstr ""
-
-#. module: survey
#: code:addons/survey/survey.py:0
#, python-format
-msgid "Maximum Required Answer is greater than Minimum Required Answer"
+msgid "Minimum Required Answer you"
+"entered is greater than the number of answer."
+"Please use a number that is smaller than %d."
msgstr ""
#. module: survey
@@ -1570,11 +1540,6 @@
msgstr ""
#. module: survey
-#: view:survey.response.line:0
-msgid "Single Textboxes"
-msgstr ""
-
-#. module: survey
#: code:addons/survey/wizard/survey_send_invitation.py:0
#, python-format
msgid "%sSurvey is not in open state"
=== modified file 'survey/wizard/survey_answer.py'
--- survey/wizard/survey_answer.py 2010-11-18 16:21:31 +0000
+++ survey/wizard/survey_answer.py 2010-11-24 11:05:24 +0000
@@ -120,14 +120,14 @@
if ((context.has_key('active') and not context.get('active', False)) \
or not context.has_key('active')) and not sur_name_rec.page_no + 1:
if sur_rec.state != "open" :
- raise osv.except_osv(_('Warning !'),_("You can not answer because the survey is not open"))
+ raise osv.except_osv(_('Warning !'),_("You can not give answer because of survey is not open for answer"))
cr.execute('select count(id) from survey_history where user_id=%s\
and survey_id=%s', (uid,survey_id))
res = cr.fetchone()[0]
user_limit = survey_obj.browse(cr, uid, survey_id)
user_limit = user_limit.response_user
if user_limit and res >= user_limit:
- raise osv.except_osv(_('Warning !'),_("You can not answer this survey more than %s times") % (user_limit))
+ raise osv.except_osv(_('Warning !'),_("You can not give answer for this survey more than %s times") % (user_limit))
if sur_rec.max_response_limit and sur_rec.max_response_limit <= sur_rec.tot_start_survey and not sur_name_rec.page_no + 1:
survey_obj.write(cr, uid, survey_id, {'state':'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S")})
@@ -692,7 +692,7 @@
if error:
for res in resp_id_list:
sur_name_read['store_ans'].pop(res)
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['comment_valid_err_msg']))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['comment_valid_err_msg']))
resp_obj.write(cr, uid, resp_id, {'comment':val1})
sur_name_read['store_ans'][resp_id].update({key1:val1})
@@ -731,7 +731,7 @@
if error:
for res in resp_id_list:
sur_name_read['store_ans'].pop(res)
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['validation_valid_err_msg']))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['validation_valid_err_msg']))
if key1.split('_')[1] == "single" :
resp_obj.write(cr, uid, resp_id, {'single_text':val1})
@@ -785,7 +785,7 @@
if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
for res in resp_id_list:
sur_name_read['store_ans'].pop(res)
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "'\n" + _("You cannot select the same answer more than one time"))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + _("You cannot select the same answer more than one time"))
if not select_count:
resp_obj.write(cr, uid, resp_id, {'state':'skip'})
@@ -892,7 +892,7 @@
if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val) == None:
error = True
if error:
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['comment_valid_err_msg']))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['comment_valid_err_msg']))
resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
sur_name_read['store_ans'][update].update({key:val})
@@ -928,7 +928,7 @@
if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val) == None:
error = True
if error:
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['validation_valid_err_msg']))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['validation_valid_err_msg']))
if key.split('_')[1] == "single" :
resp_obj.write(cr, uid, update, {'single_text':val,'state': 'done'})
else:
@@ -975,7 +975,6 @@
if comment_field and comment_value:
raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' " + tools.ustr(que_rec['make_comment_field_err_msg']))
-
if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "\n" + _("You cannot select same answer more than one time'"))
=== renamed file 'thunderbird/plugin/openerp_plugin.xpi' => 'thunderbird/plugin/openerp_plugin.xpi.OTHER'
Binary files thunderbird/plugin/openerp_plugin.xpi 2010-11-23 11:27:25 +0000 and thunderbird/plugin/openerp_plugin.xpi.OTHER 2010-11-24 11:05:24 +0000 differ
=== renamed file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar' => 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar.OTHER'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar 2010-11-23 12:35:25 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar.OTHER 2010-11-24 11:05:24 +0000 differ
=== modified file 'wiki_faq/i18n/wiki_faq.pot'
--- wiki_faq/i18n/wiki_faq.pot 2010-11-18 16:25:12 +0000
+++ wiki_faq/i18n/wiki_faq.pot 2010-11-24 11:05:24 +0000
@@ -27,7 +27,7 @@
#. module: wiki_faq
#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid "This module provides a wiki FAQ Template\n"
+msgid "This module provides a wiki FAQ Template"
" "
msgstr ""
=== modified file 'wiki_quality_manual/i18n/wiki_quality_manual.pot'
--- wiki_quality_manual/i18n/wiki_quality_manual.pot 2010-11-18 16:25:12 +0000
+++ wiki_quality_manual/i18n/wiki_quality_manual.pot 2010-11-24 11:05:24 +0000
@@ -27,7 +27,7 @@
#. module: wiki_quality_manual
#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid "Quality Manual Template\n"
+msgid "Quality Manual Template"
" "
msgstr ""
=== modified file 'wiki_sale_faq/i18n/wiki_sale_faq.pot'
--- wiki_sale_faq/i18n/wiki_sale_faq.pot 2010-11-18 16:25:12 +0000
+++ wiki_sale_faq/i18n/wiki_sale_faq.pot 2010-11-24 11:05:24 +0000
@@ -59,7 +59,7 @@
#. module: wiki_sale_faq
#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
-msgid "This module provides a wiki FAQ Template\n"
+msgid "This module provides a wiki FAQ Template"
" "
msgstr ""
Follow ups
