diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index f2b0cceddc0..54275f6a4b3 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -133,7 +133,7 @@
From this view, have an analysis of your different financial accounts. The document shows your debit and credit taking in consideration some criteria you can choose by using the search tool.
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 452bf6d1c34..7d6a4003b53 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -56,6 +56,11 @@
+
+
+
+
+
@@ -106,15 +114,12 @@
-
-
-
-
+
@@ -131,7 +136,7 @@
-
+
From this view, have an analysis of your treasury. It sums the balance of every accounting entries made on liquidity accounts per period.
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 3a3d247769d..8ca35426427 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -96,17 +96,9 @@ class account_config_settings(osv.osv_memory):
'module_account_voucher': fields.boolean('Manage Customer Payments',
help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
This installs the module account_voucher."""),
- 'module_account_followup': fields.boolean('Manage Customer Payment Follow-Ups',
+ 'module_account_followup': fields.boolean('Manage Customer Payment Follow-ups',
help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
This installs the module account_followup."""),
- 'module_account_invoice_layout': fields.boolean('Allow Notes and Subtotals',
- help="""This provides some features to improve the layout of invoices.
- It gives you the possibility to:
- * order all the lines of an invoice
- * add titles, comment lines, sub total lines
- * draw horizontal lines and put page breaks.
- This installs the module account_invoice_layout."""),
-
'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices',
implied_group='account.group_proforma_invoices',
help="Allows you to put invoices in pro-forma state."),
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index a27513a9f0c..c6bd026882a 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -17,8 +17,9 @@
-
-
+
+ or
+
@@ -98,7 +99,6 @@
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
-
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index b8e719acc35..d0ff56924e9 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -9,8 +9,9 @@
-
-
-
+
+
+ or
+
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index ed397668148..49e7f09863d 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -20,7 +20,7 @@
##############################################################################
{
- 'name': 'Followup Management',
+ 'name': 'Follow-up Management',
'version': '1.0',
'category': 'Accounting & Finance',
'description': """
@@ -28,16 +28,16 @@ Module to automate letters for unpaid invoices, with multi-level recalls.
==========================================================================
You can define your multiple levels of recall through the menu:
- Accounting/Configuration/Miscellaneous/Follow-Ups
+ Accounting/Configuration/Miscellaneous/Follow-ups
Once it is defined, you can automatically print recalls every day through simply clicking on the menu:
- Accounting/Periodical Processing/Billing/Send followups
+ Accounting/Periodical Processing/Billing/Send follow-ups
It will generate a PDF with all the letters according to the the
different levels of recall defined. You can define different policies
for different companies. You can also send mail to the customer.
-Note that if you want to check the followup level for a given partner/account entry, you can do from in the menu:
+Note that if you want to check the follow-up level for a given partner/account entry, you can do from in the menu:
Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent
""",
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index b53558ab0e7..60499603295 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -23,11 +23,11 @@ from osv import fields, osv
class followup(osv.osv):
_name = 'account_followup.followup'
- _description = 'Account Follow Up'
+ _description = 'Account Follow-up'
_columns = {
'name': fields.char('Name', size=64, required=True),
'description': fields.text('Description'),
- 'followup_line': fields.one2many('account_followup.followup.line', 'followup_id', 'Follow-Up'),
+ 'followup_line': fields.one2many('account_followup.followup.line', 'followup_id', 'Follow-up'),
'company_id': fields.many2one('res.company', 'Company', required=True),
}
_defaults = {
@@ -38,7 +38,7 @@ followup()
class followup_line(osv.osv):
_name = 'account_followup.followup.line'
- _description = 'Follow-Up Criteria'
+ _description = 'Follow-up Criteria'
_columns = {
'name': fields.char('Name', size=64, required=True),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of follow-up lines."),
diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml
index 4c3d84fb642..7103ffa0386 100644
--- a/addons/account_followup/account_followup_demo.xml
+++ b/addons/account_followup/account_followup_demo.xml
@@ -3,7 +3,7 @@
- Default Follow-Up
+ Default Follow-upFirst letter after 15 net days, 30 net days and 45 days end of month levels.
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index c2e89202553..9c11815e05b 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -6,7 +6,7 @@
account_followup.followup.linetree
-
+
@@ -19,7 +19,7 @@
account_followup.followup.lineform
-
- Follow-Ups
+ Follow-upsir.actions.act_windowaccount_followup.followupform
- Define follow up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages.
+ Define follow-up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages.
-
+ account.move.line.partner.tree
diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot
index 908bca04f70..c0173b056a0 100644
--- a/addons/account_followup/i18n/account_followup.pot
+++ b/addons/account_followup/i18n/account_followup.pot
@@ -17,7 +17,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.followup:0
-msgid "Search Followup"
+msgid "Search Follow-up"
msgstr ""
#. module: account_followup
@@ -34,12 +34,12 @@ msgstr ""
#. module: account_followup
#: view:account_followup.followup:0
#: field:account_followup.followup,followup_line:0
-msgid "Follow-Up"
+msgid "Follow-up"
msgstr ""
#. module: account_followup
#: help:account.followup.print.all,test_print:0
-msgid "Check if you want to print followups without changing followups level."
+msgid "Check if you want to print follow-ups without changing follow-ups level."
msgstr ""
#. module: account_followup
@@ -80,7 +80,7 @@ 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."
+msgid "Follow-up on the reminders sent over to your partners for unpaid invoices."
msgstr ""
#. module: account_followup
@@ -91,7 +91,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.stat:0
-msgid "Follow up Entries with period in current year"
+msgid "Follow-up Entries with period in current year"
msgstr ""
#. module: account_followup
@@ -117,7 +117,7 @@ msgstr ""
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
#: model:ir.ui.menu,name:account_followup.account_followup_menu
-msgid "Follow-Ups"
+msgid "Follow-ups"
msgstr ""
#. module: account_followup
@@ -175,7 +175,7 @@ msgstr ""
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup
-msgid "Account Follow Up"
+msgid "Account Follow-up"
msgstr ""
#. module: account_followup
@@ -227,7 +227,7 @@ msgstr ""
#. module: account_followup
#: field:account_followup.stat,date_followup:0
#: field:account_followup.stat.by.partner,date_followup:0
-msgid "Latest followup"
+msgid "Latest follow-up"
msgstr ""
#. module: account_followup
@@ -269,7 +269,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
#: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
#: model:ir.ui.menu,name:account_followup.account_followup_print_menu
-msgid "Send followups"
+msgid "Send follow-ups"
msgstr ""
#. module: account_followup
@@ -280,13 +280,13 @@ msgstr ""
#. module: account_followup
#: field:account_followup.followup.line,followup_id:0
#: field:account_followup.stat,followup_id:0
-msgid "Follow Ups"
+msgid "Follow-ups"
msgstr ""
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:296
#, python-format
-msgid "All E-mails have been successfully sent to Partners:.\n"
+msgid "All Emails have been successfully sent to Partners:.\n"
"\n"
"%s"
msgstr ""
@@ -308,7 +308,7 @@ msgstr ""
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
-msgid "Followup Statistics by Partner"
+msgid "Follow-up Statistics by Partner"
msgstr ""
#. module: account_followup
@@ -326,7 +326,7 @@ msgstr ""
#, python-format
msgid "\n"
"\n"
-"E-Mail sent to following Partners successfully. !\n"
+"Email sent to following Partners successfully. !\n"
"\n"
"%s"
msgstr ""
@@ -354,7 +354,7 @@ msgstr ""
#. module: account_followup
#: view:account.followup.print.all:0
-msgid "Print Follow Ups"
+msgid "Print Follow-ups"
msgstr ""
#. module: account_followup
@@ -364,7 +364,7 @@ msgstr ""
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_stat
-msgid "Followup Statistics"
+msgid "Follow-up Statistics"
msgstr ""
#. module: account_followup
@@ -430,7 +430,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.stat:0
-msgid "Follow-Up lines"
+msgid "Follow-up lines"
msgstr ""
#. module: account_followup
@@ -453,7 +453,7 @@ msgstr ""
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_print
#: model:ir.model,name:account_followup.model_account_followup_print_all
-msgid "Print Followup & Send Mail to Customers"
+msgid "Print Follow-up & Send Mail to Customers"
msgstr ""
#. module: account_followup
@@ -464,12 +464,12 @@ msgstr ""
#. module: account_followup
#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
-msgid "Followup Report"
+msgid "Follow-up Report"
msgstr ""
#. module: account_followup
#: view:account_followup.followup.line:0
-msgid "Follow-Up Steps"
+msgid "Follow-up Steps"
msgstr ""
#. module: account_followup
@@ -480,7 +480,7 @@ msgstr ""
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:307
#, python-format
-msgid "Followup Summary"
+msgid "Follow-up Summary"
msgstr ""
#. module: account_followup
@@ -496,12 +496,12 @@ msgstr ""
#. module: account_followup
#: field:account_followup.stat.by.partner,max_followup_id:0
-msgid "Max Follow Up Level"
+msgid "Max Follow-up Level"
msgstr ""
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
-msgid "Review Invoicing Follow-Ups"
+msgid "Review Invoicing Follow-ups"
msgstr ""
#. module: account_followup
@@ -511,7 +511,7 @@ msgstr ""
#. module: account_followup
#: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
-msgid "Define follow up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages."
+msgid "Define follow-up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages."
msgstr ""
#. module: account_followup
@@ -522,7 +522,7 @@ msgstr ""
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format
-msgid "E-Mail not sent to following Partners, E-mail not available !\n"
+msgid "Email not sent to following Partners, Email not available !\n"
"\n"
"%s"
msgstr ""
@@ -545,7 +545,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.stat:0
-msgid "Followup Level"
+msgid "Follow-up Level"
msgstr ""
#. module: account_followup
@@ -556,7 +556,7 @@ msgstr ""
#. module: account_followup
#: constraint:account_followup.followup:0
-msgid "Only One Followup by Company."
+msgid "Only One Follow-up by Company."
msgstr ""
#. module: account_followup
@@ -682,11 +682,11 @@ msgstr ""
#. module: account_followup
#: view:account_followup.stat:0
-msgid "Latest Followup Date"
+msgid "Latest Follow-up Date"
msgstr ""
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup_line
-msgid "Follow-Up Criteria"
+msgid "Follow-up Criteria"
msgstr ""
diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index ae581528a1e..3d096ecf3ac 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py
index c2a842cfd4c..ceb8a389c0e 100644
--- a/addons/account_followup/report/account_followup_report.py
+++ b/addons/account_followup/report/account_followup_report.py
@@ -24,7 +24,7 @@ import tools
class account_followup_stat(osv.osv):
_name = "account_followup.stat"
- _description = "Followup Statistics"
+ _description = "Follow-up Statistics"
_rec_name = 'partner_id'
_auto = False
_columns = {
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 9627d12aa88..2bdf8eb74bf 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -7,7 +7,7 @@
account_followup.stattree
-
+
@@ -28,7 +28,7 @@
account_followup.statgraph
-
+
@@ -47,7 +47,7 @@
+ help="Follow-up Entries with period in current year"/>
-
-
+
+
@@ -77,7 +77,7 @@
tree,graph{'search_default_followup_level':1}
- Follow up on the reminders sent over to your partners for unpaid invoices.
+ Follow-up on the reminders sent over to your partners for unpaid invoices.
diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml
index f21c21e2367..fd90e16fec8 100644
--- a/addons/account_followup/security/account_followup_security.xml
+++ b/addons/account_followup/security/account_followup_security.xml
@@ -3,14 +3,14 @@
- Account Followup multi company rule
+ Account Follow-up multi company rule['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
- Account Followup Statistics by Partner Rule
+ Account Follow-up Statistics by Partner Rule['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml
index 5d4a7f3bd47..5b9ffa3d51c 100644
--- a/addons/account_followup/test/account_followup.yml
+++ b/addons/account_followup/test/account_followup.yml
@@ -1,23 +1,23 @@
-
- In order to test account followup module in OpenERP, I change the state of invoice to "open".
+ In order to test account follow-up module in OpenERP, I change the state of invoice to "open".
-
!record {model: account.invoice, id: account.demo_invoice_0}:
check_total: 14.0
-
!workflow {model: account.invoice, action: invoice_open, ref: account.demo_invoice_0}
-
- I create a followup.
+ I create a follow-up.
-
!record {model: account.followup.print, id: account_followup_print_0}:
{}
-
- I select the followup to send it to the partner.
+ I select the follow-up to send it to the partner.
-
!python {model: account.followup.print}: |
self.do_continue(cr, uid, [ref("account_followup_print_0")], {"active_ids": [ref("account_followup.account_followup_print_menu")], "active_id": ref("account_followup.account_followup_print_menu"),
})
-
- I select partners whom I want to send followups.
+ I select partners whom I want to send follow-ups.
-
!record {model: account.followup.print.all, id: account_followup_print_all_0}:
email_body: 'Date : %(date)s\n\nDear %(partner_name)s,\n\nPlease find in attachment
@@ -28,7 +28,7 @@
- base.res_partner_desertic_hispafuentes
partner_lang: 1
-
- I send a followup mail to partner.
+ I send a follow-up mail to partner.
-
!python {model: account.followup.print.all}: |
import time
diff --git a/addons/account_followup/test/account_followup_report.yml b/addons/account_followup/test/account_followup_report.yml
index 1aab384dc3b..f2ad8a5bb9f 100644
--- a/addons/account_followup/test/account_followup_report.yml
+++ b/addons/account_followup/test/account_followup_report.yml
@@ -1,10 +1,10 @@
-
- In order to test the report I print followup report.
+ In order to test the report I print follow-up report.
-
!python {model: account.followup.print.all}: |
import time
ctx = {'form_view_ref':'account_followup.view_account_followup_print_all', 'followup_id': ref('account_followup.demo_followup1'),'date': time.strftime('%Y-%m-%d'),'model': 'account_followup.followup','active_ids':[ref('account_followup_print_all_0')], 'company_id':ref('base.main_company')}
data_dict = {'email_conf': 1}
from tools import test_reports
- test_reports.try_report_action(cr, uid, 'action_account_followup_print_all', context=ctx, wiz_data=data_dict,wiz_buttons=["Print Follow Ups"], our_module='account_followup')
+ test_reports.try_report_action(cr, uid, 'action_account_followup_print_all', context=ctx, wiz_data=data_dict,wiz_buttons=["Print Follow-ups"], our_module='account_followup')
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 088ff868ca0..b4629062455 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -28,7 +28,7 @@ from tools.translate import _
class account_followup_print(osv.osv_memory):
_name = 'account.followup.print'
- _description = 'Print Followup & Send Mail to Customers'
+ _description = 'Print Follow-up & Send Mail to Customers'
_columns = {
'date': fields.date('Follow-up Sending Date', required=True, help="This field allow you to select a forecast date to plan your follow-ups"),
'followup_id': fields.many2one('account_followup.followup', 'Follow-up', required=True),
@@ -71,14 +71,14 @@ account_followup_print()
class account_followup_stat_by_partner(osv.osv):
_name = "account_followup.stat.by.partner"
- _description = "Followup Statistics by Partner"
+ _description = "Follow-up Statistics by Partner"
_rec_name = 'partner_id'
_auto = False
_columns = {
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
'date_move':fields.date('First move', readonly=True),
'date_move_last':fields.date('Last move', readonly=True),
- 'date_followup':fields.date('Latest followup', readonly=True),
+ 'date_followup':fields.date('Latest follow-up', readonly=True),
'max_followup_id': fields.many2one('account_followup.followup.line',
'Max Follow Up Level', readonly=True, ondelete="cascade"),
'balance':fields.float('Balance', readonly=True),
@@ -90,7 +90,7 @@ class account_followup_stat_by_partner(osv.osv):
# Here we don't have other choice but to create a virtual ID based on the concatenation
# of the partner_id and the company_id, because if a partner is shared between 2 companies,
# we want to see 2 lines for him in this table. It means that both company should be able
- # to send him followups separately . An assumption that the number of companies will not
+ # to send him follow-ups separately . An assumption that the number of companies will not
# reach 10 000 records is made, what should be enough for a time.
cr.execute("""
create or replace view account_followup_stat_by_partner as (
@@ -118,7 +118,7 @@ account_followup_stat_by_partner()
class account_followup_print_all(osv.osv_memory):
_name = 'account.followup.print.all'
- _description = 'Print Followup & Send Mail to Customers'
+ _description = 'Print Follow-up & Send Mail to Customers'
_columns = {
'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True),
'email_conf': fields.boolean('Send email confirmation'),
@@ -126,7 +126,7 @@ class account_followup_print_all(osv.osv_memory):
'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'),
'email_body': fields.text('Email body'),
'summary': fields.text('Summary', required=True, readonly=True),
- 'test_print': fields.boolean('Test Print', help='Check if you want to print followups without changing followups level.')
+ 'test_print': fields.boolean('Test Print', help='Check if you want to print follow-ups without changing follow-ups level.')
}
def _get_summary(self, cr, uid, context=None):
if context is None:
@@ -289,15 +289,15 @@ class account_followup_print_all(osv.osv_memory):
msg += partner.name + '\n'
msg_unsent += msg
if not msg_unsent:
- summary = _("All E-mails have been successfully sent to Partners:.\n\n%s") % msg_sent
+ summary = _("All Emails have been successfully sent to Partners:.\n\n%s") % msg_sent
else:
- msg_unsent = _("E-Mail not sent to following Partners, E-mail not available !\n\n%s") % msg_unsent
- msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n%s") % msg_sent
+ msg_unsent = _("Email not sent to following Partners, Email not available !\n\n%s") % msg_unsent
+ msg_sent = msg_sent and _("\n\nEmail sent to following Partners successfully. !\n\n%s") % msg_sent
line = '=========================================================================='
summary = msg_unsent + line + msg_sent
context.update({'summary': summary})
else:
- context.update({'summary': '\n\n\nE-Mail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'})
+ context.update({'summary': '\n\n\nEmail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'})
return {
'name': _('Followup Summary'),
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 32b6383a8cc..058feedcde3 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -7,12 +7,13 @@
account.followup.printform
-
- [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account') ]] [[ o.currency_id.symbol ]]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [[ format(o.comment or removeParentNode('blockTable')) ]]
-
-
-
-
-
-
-
-
-
- [[ o.payment_term and o.payment_term.name ]] : [[ (o.payment_term and o.payment_term.note and format(o.payment_term.note)) or removeParentNode('blockTable') ]]
-
-
-
-
-
-
-
-
diff --git a/addons/account_invoice_layout/report/special_message_invoice.py b/addons/account_invoice_layout/report/special_message_invoice.py
deleted file mode 100644
index 8aee48c4649..00000000000
--- a/addons/account_invoice_layout/report/special_message_invoice.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import time
-
-from report import report_sxw
-import pooler
-
-
-class account_invoice_with_message(report_sxw.rml_parse):
- def __init__(self, cr, uid, name, context):
- super(account_invoice_with_message, self).__init__(cr, uid, name, context=context)
- self.localcontext.update({
- 'time': time,
- 'spcl_msg': self.spcl_msg,
- 'invoice_lines': self.invoice_lines,
-
- })
- self.context = context
-
- def spcl_msg(self, form):
- msg_id = form['message'][0]
- account_msg_data = pooler.get_pool(self.cr.dbname).get('notify.message').browse(self.cr, self.uid, msg_id)
- msg = account_msg_data.msg
- return msg
-
- def invoice_lines(self, invoice):
- result = []
- sub_total = {}
- info = []
- res = {}
- list_in_seq = {}
- ids = self.pool.get('account.invoice.line').search(self.cr, self.uid, [('invoice_id', '=', invoice.id)])
- ids.sort()
- for id in range(0, len(ids)):
- info = self.pool.get('account.invoice.line').browse(self.cr, self.uid, ids[id], self.context.copy())
- list_in_seq[info] = info.sequence
- i = 1
- j = 0
- final = sorted(list_in_seq.items(), lambda x, y: cmp(x[1], y[1]))
- invoice_list = [x[0] for x in final]
- sum_flag = {}
- sum_flag[j] = -1
- for entry in invoice_list:
- res = {}
-
- if entry.state == 'article':
- self.cr.execute('select tax_id from account_invoice_line_tax where invoice_line_id=%s', (entry.id,))
- tax_ids = self.cr.fetchall()
-
- if tax_ids == []:
- res['tax_types'] = ''
- else:
- tax_names_dict = {}
- for item in range(0, len(tax_ids)):
- self.cr.execute('select name from account_tax where id=%s', (tax_ids[item][0],))
- type = self.cr.fetchone()
- tax_names_dict[item] = type[0]
- tax_names = ','.join([tax_names_dict[x] for x in range(0, len(tax_names_dict))])
- res['tax_types'] = tax_names
- res['name'] = entry.name
- res['quantity'] = self.formatLang(entry.quantity, digits=self.get_digits(dp='Account'))
- res['price_unit'] = self.formatLang(entry.price_unit, digits=self.get_digits(dp='Account'))
- res['discount'] = self.formatLang(entry.discount, digits=self.get_digits(dp='Account'))
- res['price_subtotal'] = self.formatLang(entry.price_subtotal, digits=self.get_digits(dp='Account'))
- sub_total[i] = entry.price_subtotal
- i = i + 1
- res['note'] = entry.note
- res['currency'] = invoice.currency_id.symbol
- res['type'] = entry.state
-
- if entry.uos_id.id == False:
- res['uos'] = ''
- else:
- uos_name = self.pool.get('product.uom').read(self.cr, self.uid, entry.uos_id.id, ['name'], self.context.copy())
- res['uos'] = uos_name['name']
- else:
- res['quantity'] = ''
- res['price_unit'] = ''
- res['discount'] = ''
- res['tax_types'] = ''
- res['type'] = entry.state
- res['note'] = entry.note
- res['uos'] = ''
-
- if entry.state == 'subtotal':
- res['name'] = entry.name
- sum = 0
- sum_id = 0
- if sum_flag[j] == -1:
- temp = 1
- else:
- temp = sum_flag[j]
-
- for sum_id in range(temp, len(sub_total)+1):
- sum += sub_total[sum_id]
- sum_flag[j+1] = sum_id +1
-
- j = j + 1
- res['price_subtotal'] = "%.2f" % (sum)
- res['currency'] = invoice.currency_id.symbol
- res['quantity'] = ''
- res['price_unit'] = ''
- res['discount'] = ''
- res['tax_types'] = ''
- res['uos'] = ''
- elif entry.state == 'title':
- res['name'] = entry.name
- res['price_subtotal'] = ''
- res['currency'] = ''
- elif entry.state == 'text':
- res['name'] = entry.name
- res['price_subtotal'] = ''
- res['currency'] = ''
- elif entry.state == 'line':
- res['quantity'] = '_______________'
- res['price_unit'] = '______________'
- res['discount'] = '____________'
- res['tax_types'] = '____________________'
- res['uos'] = '_____'
- res['name'] = '_______________________________________________'
- res['price_subtotal'] = '____________'
- res['currency'] = '____'
- elif entry.state == 'break':
- res['type'] = entry.state
- res['name'] = entry.name
- res['price_subtotal'] = ''
- res['currency'] = ''
- else:
- res['name'] = entry.name
- res['price_subtotal'] = ''
- res['currency'] = invoice.currency_id.symbol
-
- result.append(res)
- return result
-
-report_sxw.report_sxw('report.notify_account.invoice', 'account.invoice', 'addons/account_invoice_layout/report/special_message_invoice.rml', parser=account_invoice_with_message)
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
deleted file mode 100644
index 8bfcfd17654..00000000000
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ /dev/null
@@ -1,501 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [[ repeatIn(objects,'o') ]]
- [[ setLang(o.partner_id.lang) ]]
-
-
-
-
-
-
-
-
- [[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]
- [[ display_address(o.partner_id) ]]
-
-
-
- Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]
- Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]
- VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]
-
-
-
-
-
-
- Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]
- PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]
- Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]
- Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]
- Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]
- Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]
- Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]
-
-
-
-
-
-
-
-
-
- Description
-
-
- Invoice Date
-
-
- Source
-
-
- Your Reference
-
-
-
-
-
-
- [[ o.name ]]
-
-
- [[ formatLang(o.date_invoice,date=True) ]]
-
-
- [[ o.name or '' ]]
-
-
- [[ ( o.partner_id.ref) or ' ' ]]
-
-
-
-
-
-
-
-
-
- Description / Taxes
-
-
- Quantity
-
-
- Unit Price
-
-
- Disc. (%)
-
-
- Price
-
-
-
-
- [[ repeatIn(invoice_lines(o), 'a') ]]
-
-
-
- [[ a['type']=='text' and removeParentNode('blockTable')]]
-
-
- [[ ((a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]][[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] +' )' ) ]]
-
-
- [[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]][[ a['quantity'] ]] [[ a['uos'] ]]
-
-
- [[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]][[ a['price_unit'] ]]
-
-
- [[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]][[ a['discount'] ]]
-
-
- [[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ a['price_subtotal'] ]] [[ a['currency'] ]]
-
-
-
-
-
-
-
-
-
- Note: [[ (a['note'] and format(a['note'])) or removeParentNode('tr') ]]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]
-
-
- [[ a['type']=='text' and '' ]]
-
-
-
- [[ a['type']!='break' and removeParentNode('pageBreak')]]
-
-
-
- Description / Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]
-
- [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account') ]] [[ o.currency_id.symbol ]]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [[ format(o.comment or removeParentNode('blockTable')) ]]
-
-
-
-
-
-
-
-
-
- [[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]
-
-
-
-
-
-
-
-
-
- [[ repeatIn((spcl_msg(data['form']) and spcl_msg(data['form']).splitlines()) or [], 'note') ]]
- [[ note or removeParentNode('para') ]]
-
-
-
-
-
-
-
-
diff --git a/addons/account_invoice_layout/security/ir.model.access.csv b/addons/account_invoice_layout/security/ir.model.access.csv
deleted file mode 100644
index 98878fc91bf..00000000000
--- a/addons/account_invoice_layout/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_notify_message,notify.message,model_notify_message,account.group_account_invoice,1,1,1,1
diff --git a/addons/account_invoice_layout/test/account_invoice_layout_report.yml b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
deleted file mode 100644
index 61ca39c654b..00000000000
--- a/addons/account_invoice_layout/test/account_invoice_layout_report.yml
+++ /dev/null
@@ -1,19 +0,0 @@
--
- Print the Invoice layout report in Normal Mode
--
- !python {model: account.invoice}: |
- import netsvc, tools, os
- (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('account.demo_invoice_0')], {}, {})
- if tools.config['test_report_directory']:
- file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout.'+format), 'wb+').write(data)
-
--
- Print the Invoice Layout Report with Message through wizard
--
- !python {model: account.invoice}: |
- ctx={}
- ctx.update({'model': 'account.invoice','active_ids': [ref('account.demo_invoice_0')]})
- data_dict = {'message':ref('account_invoice_layout.demo_message1')}
- from tools import test_reports
- test_reports.try_report_action(cr, uid, 'action_account_invoice_special_msg',wiz_data=data_dict, context=ctx, our_module='account_invoice_layout')
-
diff --git a/addons/account_invoice_layout/wizard/account_invoice_special_message.py b/addons/account_invoice_layout/wizard/account_invoice_special_message.py
deleted file mode 100644
index 27f6044a964..00000000000
--- a/addons/account_invoice_layout/wizard/account_invoice_special_message.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-from osv import osv, fields
-
-class account_invoice_special_msg(osv.osv_memory):
- _name = 'account.invoice.special.msg'
- _description = 'Account Invoice Special Message'
-
- _columns = {
- 'message': fields.many2one('notify.message', 'Message', required = True, help="Message to Print at the bottom of report"),
- }
-
- def check_report(self, cr, uid, ids, context=None):
- if context is None:
- context = {}
-
- data = self.read(cr, uid, ids, [], context=context)[0]
- datas = {
- 'ids': context.get('active_ids',[]),
- 'model': 'account.invoice',
- 'form': data
- }
- return {
- 'type': 'ir.actions.report.xml',
- 'report_name': 'notify_account.invoice',
- 'datas': datas,
- }
-
-account_invoice_special_msg()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
deleted file mode 100644
index 1ddef75e05b..00000000000
--- a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
- Account Invioce Special Message
- account.invoice.special.msg
- form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Invoices and Message
- ir.actions.act_window
- account.invoice.special.msg
- form
- form
-
- new
-
-
-
-
- Account Invioce Special Message
- client_print_multi
-
- action
- account.invoice
-
-
-
-
diff --git a/addons/account_payment/account_payment_demo.xml b/addons/account_payment/account_payment_demo.xml
index 02170c38fea..33f3687f4cf 100644
--- a/addons/account_payment/account_payment_demo.xml
+++ b/addons/account_payment/account_payment_demo.xml
@@ -1,14 +1,14 @@
-
+ Reserve Bank00987654321bank
-
+ Direct Payment
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index aa4cd18308f..cf91dcc80a2 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -106,13 +106,13 @@
-
-
+
+ or
+
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index b208864700b..1a3d96cbc33 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -327,7 +327,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
reply_to = emailfrom
if not emailfrom:
raise osv.except_osv(_('Error!'),
- _("No E-Mail ID Found for your Company address!"))
+ _("No Email ID Found for your Company address!"))
return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model='base.action.rule', reply_to=reply_to, res_id=obj.id)
diff --git a/addons/base_action_rule/i18n/ar.po b/addons/base_action_rule/i18n/ar.po
index 42070d4161e..ffa14e16d39 100644
--- a/addons/base_action_rule/i18n/ar.po
+++ b/addons/base_action_rule/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -331,8 +331,8 @@ msgstr "نشط"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "لا يوجد هوية للبريد الالكتروني لعنوان شركتك!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -528,3 +528,7 @@ msgstr "تاريخ تريجر"
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr "يسمح لك هذا النموذج بتطبيق قواعد الاجراء لاي هدف."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "لا يوجد هوية للبريد الالكتروني لعنوان شركتك!"
diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot
index ee3c87629b1..9b09e28a1f3 100644
--- a/addons/base_action_rule/i18n/base_action_rule.pot
+++ b/addons/base_action_rule/i18n/base_action_rule.pot
@@ -286,7 +286,7 @@ msgstr ""
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/bg.po b/addons/base_action_rule/i18n/bg.po
index 0e4b3b030e6..65175f9f607 100644
--- a/addons/base_action_rule/i18n/bg.po
+++ b/addons/base_action_rule/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -310,7 +310,7 @@ msgstr "Активен"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/bs.po b/addons/base_action_rule/i18n/bs.po
index 7ca94da11e6..f6d8bb8e743 100644
--- a/addons/base_action_rule/i18n/bs.po
+++ b/addons/base_action_rule/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -320,8 +320,8 @@ msgstr "Aktivan"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Nije pronađen E-Mail ID za adresu Vašeg poduzeća!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -518,3 +518,7 @@ msgstr "Datum okidanja"
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Ovaj modul omogućuje da implementirate pravila radnji za bilo koji objekat."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Nije pronađen E-Mail ID za adresu Vašeg poduzeća!"
diff --git a/addons/base_action_rule/i18n/ca.po b/addons/base_action_rule/i18n/ca.po
index b3b921cba5f..4758ba0bee3 100644
--- a/addons/base_action_rule/i18n/ca.po
+++ b/addons/base_action_rule/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -340,8 +340,8 @@ msgstr "Actiu"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "No s'ha trobat Email en l'adreça de la seva companyia!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -538,5 +538,9 @@ msgstr "Data d'activació"
#~ msgstr ""
#~ "Aquest mòdul permet implementar regles d'accions per a qualsevol objecte."
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "No s'ha trobat Email en l'adreça de la seva companyia!"
+
#~ msgid "Special Keywords to Be Used in The Body"
#~ msgstr "Paraules clau especials per ser utilitzades en el missatge"
diff --git a/addons/base_action_rule/i18n/da.po b/addons/base_action_rule/i18n/da.po
index 1b2fbc0521c..60cadce5714 100644
--- a/addons/base_action_rule/i18n/da.po
+++ b/addons/base_action_rule/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -309,7 +309,7 @@ msgstr "Aktiv"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po
index fb5c9264799..fdfbfd021f4 100644
--- a/addons/base_action_rule/i18n/de.po
+++ b/addons/base_action_rule/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -334,8 +334,8 @@ msgstr "Aktiv"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "EMail Daten fehlen bei den Adressdaten Ihrer Firma!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -531,6 +531,10 @@ msgstr "Auslösetermin"
#~ msgid "Special Keywords to Be Used in The Body"
#~ msgstr "Schlüsselwörter zur Benutzung im Haupttext"
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "EMail Daten fehlen bei den Adressdaten Ihrer Firma!"
+
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Dieses Modul ermöglicht die Definition von Regeln für bestimmte Aktionen von "
diff --git a/addons/base_action_rule/i18n/el.po b/addons/base_action_rule/i18n/el.po
index 6de2217ea2e..cb70ea7aa4d 100644
--- a/addons/base_action_rule/i18n/el.po
+++ b/addons/base_action_rule/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -312,7 +312,7 @@ msgstr "Ενεργό"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/es.po b/addons/base_action_rule/i18n/es.po
index 494715097b0..02ba275ca89 100644
--- a/addons/base_action_rule/i18n/es.po
+++ b/addons/base_action_rule/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -339,9 +339,8 @@ msgstr "Activo"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
-"¡No se ha encontrado un ID de email para su dirección de la compañía!"
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -540,3 +539,8 @@ msgstr "Fecha activación"
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Este módulo permite implementar reglas de acciones para cualquier objeto."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr ""
+#~ "¡No se ha encontrado un ID de email para su dirección de la compañía!"
diff --git a/addons/base_action_rule/i18n/es_CR.po b/addons/base_action_rule/i18n/es_CR.po
index 02db82f62fb..29831a5edd3 100644
--- a/addons/base_action_rule/i18n/es_CR.po
+++ b/addons/base_action_rule/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
"Language: es\n"
#. module: base_action_rule
@@ -340,9 +340,8 @@ msgstr "Activo"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
-"¡No se ha encontrado un ID de email para su dirección de la compañía!"
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -538,6 +537,11 @@ msgstr "Fecha activación"
#~ msgid "Special Keywords to Be Used in The Body"
#~ msgstr "Palabras especiales a usar en el mensaje"
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr ""
+#~ "¡No se ha encontrado un ID de email para su dirección de la compañía!"
+
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Este módulo permite implementar reglas de acciones para cualquier objeto."
diff --git a/addons/base_action_rule/i18n/es_EC.po b/addons/base_action_rule/i18n/es_EC.po
index d02f3e23359..b740c070618 100644
--- a/addons/base_action_rule/i18n/es_EC.po
+++ b/addons/base_action_rule/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -314,7 +314,7 @@ msgstr ""
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/es_PY.po b/addons/base_action_rule/i18n/es_PY.po
index 0bdd1fff2d6..2b8ccaac91d 100644
--- a/addons/base_action_rule/i18n/es_PY.po
+++ b/addons/base_action_rule/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -335,9 +335,8 @@ msgstr "Activo"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
-"¡No se ha encontrado un ID de email para su dirección de la compañía!"
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -536,3 +535,8 @@ msgstr "Fecha activación"
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Este módulo permite implementar reglas de acciones para cualquier objeto."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr ""
+#~ "¡No se ha encontrado un ID de email para su dirección de la compañía!"
diff --git a/addons/base_action_rule/i18n/fa.po b/addons/base_action_rule/i18n/fa.po
index e8b64ea0013..75fc2cc2279 100644
--- a/addons/base_action_rule/i18n/fa.po
+++ b/addons/base_action_rule/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -309,7 +309,7 @@ msgstr ""
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/fi.po b/addons/base_action_rule/i18n/fi.po
index 384bc079ba6..461a0d399b7 100644
--- a/addons/base_action_rule/i18n/fi.po
+++ b/addons/base_action_rule/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -321,8 +321,8 @@ msgstr "Aktiivinen"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Sähköpostiosoitetta ei löytynyt yrityksen tiedoista!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -517,3 +517,7 @@ msgstr "Liipaisupäivämäärä"
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Tämä moduuli mahdolistaa toimintosääntöjen luomisen mille tahansa objektille."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Sähköpostiosoitetta ei löytynyt yrityksen tiedoista!"
diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_action_rule/i18n/fr.po
index 49dc58e3692..0a3d8a1cac1 100644
--- a/addons/base_action_rule/i18n/fr.po
+++ b/addons/base_action_rule/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -336,8 +336,8 @@ msgstr "Actif"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Pas de courriel défini dans l'adresse de votre société"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -538,3 +538,7 @@ msgstr "Date de déclenchement"
#~ msgid "Special Keywords to Be Used in The Body"
#~ msgstr "Mots-clés spéciaux à utiliser dans le corps du texte"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Pas de courriel défini dans l'adresse de votre société"
diff --git a/addons/base_action_rule/i18n/gl.po b/addons/base_action_rule/i18n/gl.po
index ef89baa495d..93fd06edf22 100644
--- a/addons/base_action_rule/i18n/gl.po
+++ b/addons/base_action_rule/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -335,8 +335,8 @@ msgstr "Activo"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Non se atopou ningún ID de email para o enderezo da súa compañía!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -534,3 +534,7 @@ msgstr "Data de activación"
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Este módulo permite implementar regras de accións para calquera obxecto."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Non se atopou ningún ID de email para o enderezo da súa compañía!"
diff --git a/addons/base_action_rule/i18n/gu.po b/addons/base_action_rule/i18n/gu.po
index 963f2b35185..64de67c903f 100644
--- a/addons/base_action_rule/i18n/gu.po
+++ b/addons/base_action_rule/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -309,7 +309,7 @@ msgstr "કાર્યશીલ"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/hr.po b/addons/base_action_rule/i18n/hr.po
index 4fe807d9f08..6bc267af06f 100644
--- a/addons/base_action_rule/i18n/hr.po
+++ b/addons/base_action_rule/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -331,7 +331,7 @@ msgstr "Aktivan"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/hu.po b/addons/base_action_rule/i18n/hu.po
index d509940ccc6..8991306d89b 100644
--- a/addons/base_action_rule/i18n/hu.po
+++ b/addons/base_action_rule/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -331,8 +331,8 @@ msgstr "aktív"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Nem található e-mail ID az Ön válallatának címéhez!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -529,6 +529,10 @@ msgstr "Indítás dátuma"
#~ msgid "Special Keywords to Be Used in The Body"
#~ msgstr "Speciális kulcsszavak használata a levéltözsben"
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Nem található e-mail ID az Ön válallatának címéhez!"
+
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Ez a modul lehetővé teszi bármely objektumhoz tartozó műveleti szabály "
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_action_rule/i18n/it.po
index 4403028685e..9ba91b1fead 100644
--- a/addons/base_action_rule/i18n/it.po
+++ b/addons/base_action_rule/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -327,8 +327,8 @@ msgstr "Attivo"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Nessun Email ID trovato per l'indirizzo della tua azienda"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -529,3 +529,7 @@ msgstr "Data Programmata"
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Questo modulo permette di implementare regole d'azione per alcuni oggetti"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Nessun Email ID trovato per l'indirizzo della tua azienda"
diff --git a/addons/base_action_rule/i18n/ja.po b/addons/base_action_rule/i18n/ja.po
index 960ad6f657c..e25e5039751 100644
--- a/addons/base_action_rule/i18n/ja.po
+++ b/addons/base_action_rule/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -315,8 +315,8 @@ msgstr "アクティブ"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "あなたの会社住所にEメールアドレスが見つかりません。"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -502,3 +502,7 @@ msgstr "状態の条件"
#: field:base.action.rule,trg_date_type:0
msgid "Trigger Date"
msgstr "トリガー日"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "あなたの会社住所にEメールアドレスが見つかりません。"
diff --git a/addons/base_action_rule/i18n/lt.po b/addons/base_action_rule/i18n/lt.po
index 538436b3e37..bdb426cf798 100644
--- a/addons/base_action_rule/i18n/lt.po
+++ b/addons/base_action_rule/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -161,11 +161,16 @@ msgid ""
"specific sales team, or an opportunity which still has status pending after "
"14 days might trigger an automatic reminder email."
msgstr ""
+"Naudokite automatinius veiksmus, kad automatiškai iškviesti veiksmus "
+"įvairiuose atvejuose. Pavyzdžiui, iniciatyva sukurta tam tikro žmogaus "
+"turėtų būti automatiškai perduota pardavimų komandai, arba galimybė, kuri "
+"turi statusą \"Laukiama\" jau 14 dienų, turėtų būti priminta el. paštu "
+"atsakingam asmeniui."
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_email:0
msgid "Email-id of the persons whom mail is to be sent"
-msgstr ""
+msgstr "Asmens, kuriam turi būti nusiųstas laiškas, el. pašto ID"
#. module: base_action_rule
#: view:base.action.rule:0
@@ -228,6 +233,8 @@ msgid ""
"Use a python expression to specify the right field on which one than we will "
"use for the 'To' field of the header"
msgstr ""
+"Naudokite Python išraišką teisingo laukelio nurodymui, kuris bus naudojamas "
+"antraštės \"Kam\" laukeliui."
#. module: base_action_rule
#: view:base.action.rule:0
@@ -296,6 +303,8 @@ msgid ""
"Use a python expression to specify the right field on which one than we will "
"use for the 'From' field of the header"
msgstr ""
+"Naudokite Python išraišką teisingo laukelio nurodymui, kuris bus naudojamas "
+"antraštės \"Nuo\" laukeliui."
#. module: base_action_rule
#: field:base.action.rule,trg_date_range:0
@@ -314,6 +323,9 @@ msgid ""
"need a delay before the trigger date, like sending a reminder 15 minutes "
"before a meeting."
msgstr ""
+"Delsa po iškvietimo datos,nurodo, kad galite įterpti neigiamą skaičių. Jei "
+"Jums reikia delsos prieš iškvietimo datą, pavyzdžiui siųsti priminimą 15 "
+"min. prieš susitikimą."
#. module: base_action_rule
#: field:base.action.rule,active:0
@@ -323,8 +335,8 @@ msgstr "Aktyvus"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Jūsų kompanijos adrese nerastas el. pašto ID!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -517,3 +529,7 @@ msgstr "Įvykio data"
#~ msgid "Special Keywords to Be Used in The Body"
#~ msgstr "Specialūs raktažodžiai naudojami tekste"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Jūsų kompanijos adrese nerastas el. pašto ID!"
diff --git a/addons/base_action_rule/i18n/lv.po b/addons/base_action_rule/i18n/lv.po
index 2aea834f5a2..9d90296ba3d 100644
--- a/addons/base_action_rule/i18n/lv.po
+++ b/addons/base_action_rule/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -309,7 +309,7 @@ msgstr "Aktīvs"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/mn.po b/addons/base_action_rule/i18n/mn.po
index 791e282f169..5a6ec729eb2 100644
--- a/addons/base_action_rule/i18n/mn.po
+++ b/addons/base_action_rule/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -316,8 +316,8 @@ msgstr "Идэвхитэй"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Таны компаны хаягийн санд Э-мэйл ID байхгүй байна!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -506,5 +506,9 @@ msgstr "Нөхцөл байдал"
msgid "Trigger Date"
msgstr "Гарааны огноо"
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Таны компаны хаягийн санд Э-мэйл ID байхгүй байна!"
+
#~ msgid "Special Keywords to Be Used in The Body"
#~ msgstr "Их биенд тусгай түлхүүр үгсийг хэрэглэсэн байх"
diff --git a/addons/base_action_rule/i18n/nl.po b/addons/base_action_rule/i18n/nl.po
index 41e79f4c8b2..a49c3ebb18c 100644
--- a/addons/base_action_rule/i18n/nl.po
+++ b/addons/base_action_rule/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -336,8 +336,8 @@ msgstr "Actief"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Geen email-ID gevonden bij uw bedrijfsadres!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -535,3 +535,7 @@ msgstr "Activeerdatum"
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr "Deze module laat u actieregels voor elk object implementeren."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Geen email-ID gevonden bij uw bedrijfsadres!"
diff --git a/addons/base_action_rule/i18n/pl.po b/addons/base_action_rule/i18n/pl.po
index effd847b868..eb5852c78e5 100644
--- a/addons/base_action_rule/i18n/pl.po
+++ b/addons/base_action_rule/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -310,8 +310,8 @@ msgstr "Aktywne"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Brak ID email dla adresu twojej firmy !"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -498,3 +498,7 @@ msgstr ""
#~ msgid "Special Keywords to Be Used in The Body"
#~ msgstr "Specjalne słowa kluczowe do zastosowania w treści"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Brak ID email dla adresu twojej firmy !"
diff --git a/addons/base_action_rule/i18n/pt.po b/addons/base_action_rule/i18n/pt.po
index 8729928632c..f62330d679a 100644
--- a/addons/base_action_rule/i18n/pt.po
+++ b/addons/base_action_rule/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -335,8 +335,8 @@ msgstr "Ativo"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Nenhum ID de e-mail encontrado para o endereço da empresa!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -532,6 +532,10 @@ msgstr "Data Limite"
#~ msgid "Special Keywords to Be Used in The Body"
#~ msgstr "Palavras-chave especial para ser usado no corpo"
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Nenhum ID de e-mail encontrado para o endereço da empresa!"
+
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Este módulo permite a aplicação das regras de acção para qualquer objecto."
diff --git a/addons/base_action_rule/i18n/pt_BR.po b/addons/base_action_rule/i18n/pt_BR.po
index 94e5d6ab3f4..26c34b1bf31 100644
--- a/addons/base_action_rule/i18n/pt_BR.po
+++ b/addons/base_action_rule/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -327,8 +327,8 @@ msgstr "Ativo"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Nenhum ID de Email foi encontrado para o endereço da empresa!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -518,6 +518,10 @@ msgstr ""
msgid "Trigger Date"
msgstr "Data de Disparo"
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Nenhum ID de Email foi encontrado para o endereço da empresa!"
+
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Este módulo permite implementar regras de ações para qualquer objeto."
diff --git a/addons/base_action_rule/i18n/ro.po b/addons/base_action_rule/i18n/ro.po
index b79bcdf43e7..998bf5aa400 100644
--- a/addons/base_action_rule/i18n/ro.po
+++ b/addons/base_action_rule/i18n/ro.po
@@ -14,15 +14,16 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
msgid ""
"Check this if you want the rule to send an email to the responsible person."
msgstr ""
-"Bifati daca doriti ca regula sa trimita un mesaj persoanei responsabile."
+"Bifati aici daca doriti ca regula sa trimita un e-mail persoanei "
+"responsabile."
#. module: base_action_rule
#: field:base.action.rule,act_remind_partner:0
@@ -32,17 +33,17 @@ msgstr "Memento Partener"
#. module: base_action_rule
#: field:base.action.rule,trg_partner_categ_id:0
msgid "Partner Category"
-msgstr "Categoria partenerului"
+msgstr "Categorie Partener"
#. module: base_action_rule
#: field:base.action.rule,act_mail_to_watchers:0
msgid "Mail to Watchers (CC)"
-msgstr "Mail catre observatori (CC)"
+msgstr "Mail catre Observatori (CC)"
#. module: base_action_rule
#: field:base.action.rule,trg_state_to:0
msgid "Button Pressed"
-msgstr "Buton apăsat"
+msgstr "Buton apasat"
#. module: base_action_rule
#: field:base.action.rule,model_id:0
@@ -52,7 +53,7 @@ msgstr "Obiect"
#. module: base_action_rule
#: field:base.action.rule,act_mail_to_email:0
msgid "Mail to these Emails"
-msgstr "Mail catre aceste email-uri"
+msgstr "Mesaj la aceste e-mail-uri"
#. module: base_action_rule
#: field:base.action.rule,act_state:0
@@ -77,7 +78,7 @@ msgstr "Zile"
#. module: base_action_rule
#: field:base.action.rule,last_run:0
msgid "Last Run"
-msgstr "Ultima rulare"
+msgstr "Ultima executare"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:328
@@ -88,7 +89,7 @@ msgstr "Eroare!"
#. module: base_action_rule
#: field:base.action.rule,act_reply_to:0
msgid "Reply-To"
-msgstr "Răspunde către:"
+msgstr "Raspunde"
#. module: base_action_rule
#: help:base.action.rule,act_email_cc:0
@@ -114,7 +115,7 @@ msgstr "Numele regulii"
msgid ""
"Check this if you want the rule to send a reminder by email to the partner."
msgstr ""
-"Bifaţi aici dacă doriţi ca regula să trimită un memento prin email "
+"Bifati aici daca doriti ca regula sa trimita un memento prin e-mail "
"partenerului."
#. module: base_action_rule
@@ -125,7 +126,7 @@ msgstr "Conditii pe Partener Model"
#. module: base_action_rule
#: selection:base.action.rule,trg_date_type:0
msgid "Deadline"
-msgstr "Termen-limită"
+msgstr "Termen limita"
#. module: base_action_rule
#: field:base.action.rule,trg_partner_id:0
@@ -179,12 +180,12 @@ msgstr "Regula actiunii"
#. module: base_action_rule
#: view:base.action.rule:0
msgid "Fields to Change"
-msgstr "Campuri care trebuie schimbate"
+msgstr "Campuri care vor fi schimbate"
#. module: base_action_rule
#: selection:base.action.rule,trg_date_type:0
msgid "Creation Date"
-msgstr "Data creării"
+msgstr "Data crearii"
#. module: base_action_rule
#: selection:base.action.rule,trg_date_type:0
@@ -214,7 +215,7 @@ msgstr "Memento cu Atasament"
#. module: base_action_rule
#: constraint:ir.cron:0
msgid "Invalid arguments"
-msgstr "Argumente invalide"
+msgstr "Argumente nevalide"
#. module: base_action_rule
#: field:base.action.rule,act_user_id:0
@@ -224,7 +225,7 @@ msgstr "Setare responsabil"
#. module: base_action_rule
#: selection:base.action.rule,trg_date_type:0
msgid "None"
-msgstr "Nimic"
+msgstr "Niciunul"
#. module: base_action_rule
#: help:base.action.rule,act_email_to:0
@@ -238,7 +239,7 @@ msgstr ""
#. module: base_action_rule
#: view:base.action.rule:0
msgid "%(object_user_phone)s = Responsible phone"
-msgstr "%(obiect_utilizator_telefon) = Responsabil telefon"
+msgstr "%(obiect_telefon_utilizator) = Responsabil telefon"
#. module: base_action_rule
#: view:base.action.rule:0
@@ -271,7 +272,7 @@ msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_method:0
msgid "Call Object Method"
-msgstr "Metoda obiectului de apel"
+msgstr "Metoda de apel a obiectului"
#. module: base_action_rule
#: field:base.action.rule,act_email_to:0
@@ -295,7 +296,7 @@ msgstr "%(partener)i = Numele partenerului"
#. module: base_action_rule
#: view:base.action.rule:0
msgid "Note"
-msgstr "Notă"
+msgstr "Nota"
#. module: base_action_rule
#: help:base.action.rule,act_email_from:0
@@ -314,7 +315,7 @@ msgstr "Intarziere dupa data declansarii"
#. module: base_action_rule
#: view:base.action.rule:0
msgid "Conditions"
-msgstr "Condiţii"
+msgstr "Conditii"
#. module: base_action_rule
#: help:base.action.rule,trg_date_range:0
@@ -323,21 +324,20 @@ msgid ""
"need a delay before the trigger date, like sending a reminder 15 minutes "
"before a meeting."
msgstr ""
-"Intarziere dupa data declansarii, specifica faptul ca puteti sa puneti un "
-"numar negativ. Daca doriti o intarziere inainte de data declansarii, precum "
-"trimiterea unui memento cu 15 minute inaintea unei intalniri."
+"Intarziere dupa data declansarii, specifica faptul ca puteti sa introduceti "
+"un numar negativ. Daca doriti o intarziere inainte de data declansarii, "
+"precum trimiterea unui memento cu 15 minute inaintea unei intalniri."
#. module: base_action_rule
#: field:base.action.rule,active:0
msgid "Active"
-msgstr "Activ"
+msgstr "Activ(a)"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
-"Nu a fost gasit nici un ID de email pentru adresa companiei dumneavoastra!"
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -352,7 +352,7 @@ msgstr "Da ordinea secventei atunci cand afiseaza o lista de reguli."
#. module: base_action_rule
#: selection:base.action.rule,trg_date_range_type:0
msgid "Months"
-msgstr "Luni"
+msgstr "Luni de zile"
#. module: base_action_rule
#: field:base.action.rule,filter_id:0
@@ -362,7 +362,7 @@ msgstr "Filtru"
#. module: base_action_rule
#: selection:base.action.rule,trg_date_type:0
msgid "Date"
-msgstr "Dată"
+msgstr "Data"
#. module: base_action_rule
#: help:base.action.rule,server_action_id:0
@@ -401,7 +401,7 @@ msgstr "Informatii Email"
#. module: base_action_rule
#: model:ir.model,name:base_action_rule.model_base_action_rule
msgid "Action Rules"
-msgstr "Reguli de acţiune"
+msgstr "Reguli de actiune"
#. module: base_action_rule
#: help:base.action.rule,act_mail_body:0
@@ -438,12 +438,12 @@ msgstr "Corp email"
msgid ""
"Check this if you want the rule to send a reminder by email to the user."
msgstr ""
-"Bifati daca doriti ca regula sa trimita un memento prin email utilizatorului."
+"Bifati daca doriti ca regula sa trimita utilizatorului un memento prin email."
#. module: base_action_rule
#: view:base.action.rule:0
msgid "Server Action to be Triggered"
-msgstr "Actiunea serverului de declansat"
+msgstr "Actiunea serverului care va fi declansat"
#. module: base_action_rule
#: field:base.action.rule,act_mail_to_user:0
@@ -464,7 +464,7 @@ msgstr "Conditii in Campurile model"
#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
msgid "Automated Actions"
-msgstr "Acţiuni automate"
+msgstr "Actiuni automate"
#. module: base_action_rule
#: field:base.action.rule,server_action_id:0
@@ -488,17 +488,17 @@ msgstr ""
#. module: base_action_rule
#: view:base.action.rule:0
msgid "Conditions on Timing"
-msgstr "Conditii referitoare la Sincronizare"
+msgstr "Conditii privind Sincronizarea"
#. module: base_action_rule
#: field:base.action.rule,sequence:0
msgid "Sequence"
-msgstr "Secvenţă"
+msgstr "Secventa"
#. module: base_action_rule
#: view:base.action.rule:0
msgid "Actions"
-msgstr "Acţiuni"
+msgstr "Actiuni"
#. module: base_action_rule
#: help:base.action.rule,active:0
@@ -517,21 +517,26 @@ msgstr "%(obiect_utilizator) = Nume responsabil"
#. module: base_action_rule
#: field:base.action.rule,create_date:0
msgid "Create Date"
-msgstr "Data creării"
+msgstr "Data Crearii"
#. module: base_action_rule
#: view:base.action.rule:0
msgid "Conditions on States"
-msgstr "Conditii referitoare la Stari"
+msgstr "Conditii privind Starile"
#. module: base_action_rule
#: field:base.action.rule,trg_date_type:0
msgid "Trigger Date"
-msgstr "Data Declansare"
-
-#~ msgid "Special Keywords to Be Used in The Body"
-#~ msgstr "Cuvinte-cheie speciale de utilizat în corpul mesajului"
+msgstr "Data declansarii"
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Acest modul permite implementarea regulilor actiunii pentru orice obiect."
+
+#~ msgid "Special Keywords to Be Used in The Body"
+#~ msgstr "Cuvinte cheie speciale pentru a fi utilizate in corpul mesajului"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr ""
+#~ "Nu a fost gasit nici un ID de email pentru Adresa companiei dumneavoastra!"
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po
index f4bcbd2dc54..1c1e396b826 100644
--- a/addons/base_action_rule/i18n/ru.po
+++ b/addons/base_action_rule/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -334,8 +334,8 @@ msgstr "Активен"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Нет ID эл. почты в адресе вашей компании!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -535,3 +535,7 @@ msgstr "Дата активации"
#~ msgid "Special Keywords to Be Used in The Body"
#~ msgstr "Специальные ключевые слова используемые в тексте"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Нет ID эл. почты в адресе вашей компании!"
diff --git a/addons/base_action_rule/i18n/sl.po b/addons/base_action_rule/i18n/sl.po
index 7062231f605..766e01ab842 100644
--- a/addons/base_action_rule/i18n/sl.po
+++ b/addons/base_action_rule/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -312,7 +312,7 @@ msgstr ""
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/sq.po b/addons/base_action_rule/i18n/sq.po
index 4944ad82d03..83e6df669b6 100644
--- a/addons/base_action_rule/i18n/sq.po
+++ b/addons/base_action_rule/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -309,7 +309,7 @@ msgstr ""
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/sr.po b/addons/base_action_rule/i18n/sr.po
index cc9f278aa20..059e39b35e1 100644
--- a/addons/base_action_rule/i18n/sr.po
+++ b/addons/base_action_rule/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -325,8 +325,8 @@ msgstr "Aktivan"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "NIje nadjena sifra Emaila adrese tvog Preduzeca"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -524,3 +524,7 @@ msgstr "Datum Okidanja"
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Ovaj modul omogucava implementiranje pravila akcija za svaki objekat."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "NIje nadjena sifra Emaila adrese tvog Preduzeca"
diff --git a/addons/base_action_rule/i18n/sr@latin.po b/addons/base_action_rule/i18n/sr@latin.po
index 7b8185e63df..74bf9728138 100644
--- a/addons/base_action_rule/i18n/sr@latin.po
+++ b/addons/base_action_rule/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -325,8 +325,8 @@ msgstr "Aktivan"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "NIje nadjena sifra Emaila adrese tvog Preduzeca"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -521,6 +521,10 @@ msgstr "Datum Okidanja"
#~ msgid "Special Keywords to Be Used in The Body"
#~ msgstr "Specijalne kljucne reci za koriscenje u sadrzaju poruke"
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "NIje nadjena sifra Emaila adrese tvog Preduzeca"
+
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Ovaj modul omogucava implementiranje pravila akcija za svaki objekat."
diff --git a/addons/base_action_rule/i18n/sv.po b/addons/base_action_rule/i18n/sv.po
index 4400e1fd492..42186fcbfdc 100644
--- a/addons/base_action_rule/i18n/sv.po
+++ b/addons/base_action_rule/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -36,7 +36,7 @@ msgstr "Partnerkategori"
#. module: base_action_rule
#: field:base.action.rule,act_mail_to_watchers:0
msgid "Mail to Watchers (CC)"
-msgstr ""
+msgstr "E-post till bevakare (CC)"
#. module: base_action_rule
#: field:base.action.rule,trg_state_to:0
@@ -61,7 +61,7 @@ msgstr "Sätt status till"
#. module: base_action_rule
#: field:base.action.rule,act_email_from:0
msgid "Email From"
-msgstr ""
+msgstr "E-post från"
#. module: base_action_rule
#: view:base.action.rule:0
@@ -76,7 +76,7 @@ msgstr "Dagar"
#. module: base_action_rule
#: field:base.action.rule,last_run:0
msgid "Last Run"
-msgstr ""
+msgstr "Senaste körning"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:328
@@ -104,7 +104,7 @@ msgstr "Minuter"
#. module: base_action_rule
#: field:base.action.rule,name:0
msgid "Rule Name"
-msgstr ""
+msgstr "Regelnamn"
#. module: base_action_rule
#: help:base.action.rule,act_remind_partner:0
@@ -120,12 +120,12 @@ msgstr ""
#. module: base_action_rule
#: selection:base.action.rule,trg_date_type:0
msgid "Deadline"
-msgstr ""
+msgstr "Tidsfrist"
#. module: base_action_rule
#: field:base.action.rule,trg_partner_id:0
msgid "Partner"
-msgstr ""
+msgstr "Företag"
#. module: base_action_rule
#: view:base.action.rule:0
@@ -145,7 +145,7 @@ msgstr ""
#. module: base_action_rule
#: field:base.action.rule,trg_state_from:0
msgid "State"
-msgstr ""
+msgstr "Status"
#. module: base_action_rule
#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
@@ -179,7 +179,7 @@ msgstr "Skapad datum"
#. module: base_action_rule
#: selection:base.action.rule,trg_date_type:0
msgid "Last Action Date"
-msgstr ""
+msgstr "Senaste uppdatering"
#. module: base_action_rule
#: selection:base.action.rule,trg_date_range_type:0
@@ -194,7 +194,7 @@ msgstr ""
#. module: base_action_rule
#: view:base.action.rule:0
msgid "Delay After Trigger Date"
-msgstr ""
+msgstr "Ledtid efter utlösningsdatum"
#. module: base_action_rule
#: field:base.action.rule,act_remind_attach:0
@@ -309,7 +309,7 @@ msgstr "Aktiv"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/tr.po b/addons/base_action_rule/i18n/tr.po
index 7d488479ea2..c5590533bc9 100644
--- a/addons/base_action_rule/i18n/tr.po
+++ b/addons/base_action_rule/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -333,8 +333,8 @@ msgstr "Etkin"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Firma adresinizde bir Eposta Kimliği yok!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -533,3 +533,7 @@ msgstr "Tetikleme Tarihi"
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr ""
#~ "Bu modül herhangi bir nesne için eylem kurallaru uygulamanızı sağlar."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Firma adresinizde bir Eposta Kimliği yok!"
diff --git a/addons/base_action_rule/i18n/zh_CN.po b/addons/base_action_rule/i18n/zh_CN.po
index fac6336fca7..75312afd054 100644
--- a/addons/base_action_rule/i18n/zh_CN.po
+++ b/addons/base_action_rule/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -314,8 +314,8 @@ msgstr "激活"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "您的公司地址找不到电子邮件标识"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0
@@ -505,5 +505,9 @@ msgstr "触发日期"
#~ msgid "Special Keywords to Be Used in The Body"
#~ msgstr "指定正文里的关键字"
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "您的公司地址找不到电子邮件标识"
+
#~ msgid "This module allows to implement action rules for any object."
#~ msgstr "这个模块允许任何对象实现的行动规则。"
diff --git a/addons/base_action_rule/i18n/zh_TW.po b/addons/base_action_rule/i18n/zh_TW.po
index 160b5d9ee82..ebf49a55f21 100644
--- a/addons/base_action_rule/i18n/zh_TW.po
+++ b/addons/base_action_rule/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -309,7 +309,7 @@ msgstr "活躍"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml
index a69a2f6cd9d..3c20bf5fad5 100644
--- a/addons/base_calendar/base_calendar_data.xml
+++ b/addons/base_calendar/base_calendar_data.xml
@@ -1,138 +1,138 @@
-
-
-
- Event
- calendar.event
-
+
+
+
+ Event
+ calendar.event
+
-
- 1 minute before
-
-
- minutes
- before
- start
-
+
+ 1 minute before
+
+
+ minutes
+ before
+ start
+
-
- 5 minutes before
-
-
- minutes
- before
- start
-
+
+ 5 minutes before
+
+
+ minutes
+ before
+ start
+
-
- 10 minutes before
-
-
- minutes
- before
- start
-
+
+ 10 minutes before
+
+
+ minutes
+ before
+ start
+
-
- 15 minutes before
-
-
- minutes
- before
- start
-
+
+ 15 minutes before
+
+
+ minutes
+ before
+ start
+
-
- 30 minutes before
-
-
- minutes
- before
- start
-
+
+ 30 minutes before
+
+
+ minutes
+ before
+ start
+
-
- 45 minutes before
-
-
- minutes
- before
- start
-
+
+ 45 minutes before
+
+
+ minutes
+ before
+ start
+
-
- 1 hour before
-
-
- hours
- before
- start
-
+
+ 1 hour before
+
+
+ hours
+ before
+ start
+
-
- 2 hours before
-
-
- hours
- before
- start
-
+
+ 2 hours before
+
+
+ hours
+ before
+ start
+
-
- 3 hours before
+
+ 3 hours before
-
-
- hours
- before
- start
-
+
+
+ hours
+ before
+ start
+
-
- 4 hours before
+
+ 4 hours before
-
-
- hours
- before
- start
-
+
+
+ hours
+ before
+ start
+
-
- 5 hours before
+
+ 5 hours before
-
-
- hours
- before
- start
-
+
+
+ hours
+ before
+ start
+
-
- 18 hours before
+
+ 18 hours before
-
-
- hours
- before
- start
-
+
+
+ hours
+ before
+ start
+
-
-
- Run Event Reminder
-
-
- 1
- minutes
- -1
-
-
-
-
-
-
+
+
+ Run Event Reminder
+
+
+ 1
+ minutes
+ -1
+
+
+
+
+
+
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index da58c54cd73..cb2e5391018 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -10,20 +10,10 @@