diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index e4c810fa6be..4af3b43d54c 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -23,7 +23,6 @@ import time
import decimal_precision as dp
import netsvc
-
from osv import fields, osv, orm
import pooler
from tools import config
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index 0d05d5f0d76..9a60b8a7bd0 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -58,7 +58,7 @@
-
+
-
+
Lead Stages
@@ -16,7 +16,7 @@
groups="base.group_extended"
parent="crm.menu_crm_case_stage" />
-
+
Lead Resource Type
@@ -31,7 +31,7 @@
groups="base.group_extended"
parent="crm.menu_crm_case_resource_type" />
-
+
CRM - Leads Form
@@ -190,7 +190,7 @@
-
+
CRM - Leads Tree
@@ -239,7 +239,7 @@
-
+
CRM - Leads Calendar
@@ -257,7 +257,7 @@
-
+
CRM - Leads Search
@@ -322,6 +322,5 @@
-
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 9136a15d9c0..e84bbb673ee 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -2,7 +2,7 @@
-
+
Meeting Categories
@@ -16,7 +16,7 @@
-
+
CRM - Meetings Form
@@ -204,7 +204,7 @@
-
+
CRM - Meetings Tree
@@ -222,7 +222,7 @@
-
+
CRM - Meetings Calendar
@@ -238,7 +238,7 @@
-
+
CRM - Meetings Gantt
@@ -254,7 +254,7 @@
-
+
CRM - Meetings Search
@@ -296,7 +296,7 @@
-
+
calendar.attendee.form.inherit
@@ -310,7 +310,7 @@
-
+
calendar.attendee.tree.inherit
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3dbba04567e..6f34e42324d 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -2,7 +2,7 @@
-
+
Opportunity Categories
@@ -17,7 +17,7 @@
id="menu_crm_case_opportunity-act"
parent="crm.menu_crm_case_categ" />
-
+
Opportunity Stages
@@ -32,7 +32,7 @@
id="menu_crm_opportunity_stage_act"
parent="crm.menu_crm_case_stage" />
-
+
Opportunity Resource Type
@@ -47,7 +47,7 @@
id="menu_crm_opportunity_resource_act"
parent="crm.menu_crm_case_resource_type" />
-
+
Opportunities
@@ -204,7 +204,7 @@
-
+
Opportunities Tree
@@ -246,7 +246,7 @@
-
+
CRM - Opportunity Graph
@@ -261,7 +261,7 @@
-
+
CRM - Opportunities Search
@@ -293,11 +293,10 @@
+ help="My Opportunities" default="1"/>
+ help="Unassigned Opportunities"/>
+ context="{'group_by':'stage_id'}"/>
+ context="{'group_by':'priority'}"/>
+ domain="[]" context="{'group_by':'categ_id'}"/>
-
+
-
+ domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}"/>
+
+ domain="[]" context="{'group_by':'create_date'}"/>
+ domain="[]" context="{'group_by':'date_deadline'}"/>
+
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 79e1fc3496b..52450419fd2 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -45,7 +45,7 @@
-
+
crm.case.section.tree
@@ -61,7 +61,7 @@
-
+
Sales Team
@@ -70,7 +70,7 @@
-
+
crm.case.stage.tree
@@ -87,7 +87,7 @@
-
+
crm.case.stage.form
@@ -108,7 +108,7 @@
-
+
Stages
@@ -119,7 +119,7 @@
-
+
crm.case.categ.form
@@ -134,7 +134,7 @@
-
+
crm.case.categ.tree
@@ -148,7 +148,7 @@
-
+
Categories
@@ -163,7 +163,7 @@
parent="base.menu_crm_configuration" />
-
+
crm.case.resource.type.tree
@@ -178,7 +178,7 @@
-
+
crm.case.resource.type.form
@@ -193,7 +193,7 @@
-
+
Resource Type
@@ -212,7 +212,7 @@
-
+
crm.case.log.tree
@@ -232,8 +232,7 @@
-
-
+
crm.segmentation.line.tree
@@ -250,7 +249,7 @@
-
+
crm.segmentation.line.form
@@ -270,7 +269,7 @@
-
+
crm.segmentation.form
@@ -315,7 +314,7 @@
-
+
crm.segmentation.tree
@@ -375,7 +374,7 @@
-
+
view.res.partner.form.crm.inherited1
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 684547e0a89..9cdc402ae56 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -24,7 +24,7 @@
'name': 'Carriers and deliveries',
'version': '1.0',
'category': 'Generic Modules/Sales & Purchases',
- 'description': """Allows you to add delivery methods in sales orders and picking.
+ 'description': """Allows you to add delivery methods in sale orders and picking.
You can define your own carrier and delivery grids for prices.
When creating invoices from picking, Open ERP is able to add and compute the shipping line.
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 7626bd3c51b..8a78ae46fdd 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -31,7 +31,7 @@
ATTENTION:
- When you install this module in a running company that have already PDF files stored into the database,
you will lose them all.
- - After installing this module PDF's are not longer stored into the database,
+ - After installing this module PDF's are no longer stored into the database,
but in the servers rootpad like /server/bin/filestore.
""",
'author': 'Tiny',
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 7fcdfd8d0d5..18042dabf93 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -26,7 +26,7 @@
'category': 'Generic Modules/Others',
'description': """This is a support FTP Interface with document management system.
With this module you would not only be able to access documents through open erp
- also you would be able to connect with them through the file system using the FTP protocol.
+ but you would also be able to connect with them through the file system using the FTP protocol.
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 7fd52a7fc8b..a1276c11643 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -26,7 +26,7 @@
"version" : "1.0",
"depends" : ["base"],
"author" : "Tiny",
- "description": """Fetchail:
+ "description": """Fetchmail:
* Fetch email from Pop / IMAP server
* Support SSL
* Integrated with all Modules
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index be1ce233718..36b54b63d0b 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -28,7 +28,7 @@
"depends" : ["hr",'hr_recruitment','survey'],
"description": """
Ability to create employees evaluation.
- An evaluation can be created by employee for subordinates
+ An evaluation can be created by employee for subordinates,
juniors as well as his manager.The evaluation is done under a plan
in which various surveys can be created and it can be defined which
level of employee hierarchy fills what and final review and evaluation
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index d8d6e23ac51..ae13b0ce67b 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -34,7 +34,7 @@
* Validation by the accountant and invoice creation
* Payment of the invoice to the employee
- This module also use the analytic accounting and is compatible with
+ This module also uses the analytic accounting and is compatible with
the invoice on timesheet module so that you will be able to automatically
re-invoice your customer's expenses if your work by project.
""",
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index dca6e6e20f6..3652762c715 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -60,8 +60,17 @@
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Leaves during last 7 days"/>
-
-
+
+
+
+
+
+
+
+
+
@@ -88,7 +97,6 @@
tree,graph{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
-
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 679eff95705..dce4c67afdf 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -1,6 +1,7 @@
-
+
+
hr.holidays.report.treehr.holidays.report
@@ -149,5 +150,6 @@
-
+
+
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 1e0af949825..758ad78eb8d 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -25,7 +25,7 @@
'category': 'Generic Modules/Human Resources',
'description': """
Manages job positions and the recruitement process. It's integrated with the
-survey module to allows you to define interview for different jobs.
+survey module to allow you to define interview for different jobs.
This module is integrated with the mail gateway to automatically tracks email
sent to jobs@YOURCOMPANY.com. It's also integrated with the document management
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 4bd6d3525fc..312f17b44b3 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -25,9 +25,9 @@
'version': '1.0',
'category': 'Generic Modules/Human Resources',
'description': """
-This module implement a timesheet system. Each employee can encode and
+This module implements a timesheet system. Each employee can encode and
track their time spent on the different projects. A project is an
-analytic account and the time spent on a project generate costs on
+analytic account and the time spent on a project generates costs on
the analytic account.
Lots of reporting on time and employee tracking are provided.
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 44058d048cb..997b9f74898 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -25,21 +25,21 @@
'version': '1.0',
'category': 'Generic Modules/Human Resources',
'description': """
-This module help you easily encode and validate timesheet and attendances
+This module helps you to easily encode and validate timesheet and attendances
within the same view. The upper part of the view is for attendances and
track (sign in/sign out) events. The lower part is for timesheet.
-Others tabs contains statistics views to help you analyse your
+Other tabs contains statistics views to help you analyse your
time or the time of your team:
* Time spent by day (with attendances)
* Time spent by project
-This module also implement a complete timesheet validation process:
+This module also implements a complete timesheet validation process:
* Draft sheet
* Confirmation at the end of the period by the employee
* Validation by the project manager
-The validation can be configured in te company:
+The validation can be configured in the company:
* Period size (day, week, month, year)
* Maximal difference between timesheet and attendances
""",
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 0db86965870..f10a00c75e2 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -27,8 +27,8 @@
'description': """
This module allows your user to easily and efficiently participate in the innovation of the enterprise.
It allows everybody to express ideas about different subjects.
- Then, others users can comment these ideas and vote for particular ideas.
- Each idea as a score based on the different votes.
+ Then, other users can comment on these ideas and vote for particular ideas.
+ Each idea has a score based on the different votes.
The managers can obtain an easy view on best ideas from all the users.
Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
'author': 'Tiny',
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index c8fdb530a45..e5d8e1255a6 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -26,7 +26,7 @@
After Installing this module,The Configuration wizard for accounting is launched.
* We have the account templates which can be helpful to generate Charts of Accounts.
- * On that particular wizard,You will be asked to pass the name of the company,the chart template to follow,the no. of digits to generate the code for your account and Bank account,currency to create Journals.
+ * On that particular wizard,You will be asked to pass the name of the company,the chart template to follow,the no. of digits to generate the code for your account and Bank account,currency to create Journals.
Thus,the pure copy of Chart Template is generated.
* This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index ba10ab52212..9d0b2852abd 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -34,7 +34,7 @@
"name" : "Switzerland localisation corrected by Camptocamp",
"description" : """
Swiss localisation :
- - DTA generation for a lot of paiment types
+ - DTA generation for a lot of payment types
- BVR management (number generation, report, etc..)
- Import account move from the bank file (like v11 etc..)
- Simplify the way you handle the bank statement for reconciliation
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index efde2f16e61..831bc45d122 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -23,7 +23,7 @@
"name": "Lunch Module",
"author": "Tiny",
"Description": """
- The lunch module is for keeping record of the order placing and payment of the orders.
+ The lunch module is for keeping record of the order placed and payment of the orders.
The products are defined under categories and the payment records are maintained user wise
Every user has a cashbox which keeps track of the amount paid for a particular order.
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 3363dd87144..9a10fdbaa3d 100755
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -37,10 +37,12 @@
'update_xml': [
'marketing_campaign_view.xml',
'marketing_campaign_data.xml',
- 'marketing_campaign_workflow.xml',
+ 'marketing_campaign_workflow.xml',
'report/campaign_analysis_view.xml',
],
- 'demo_xml': [],
+ 'demo_xml': [
+ 'marketing_campaign_demo.xml',
+ ],
'installable': True,
'active': False,
}
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 06a7dc53dab..398e0e805be 100755
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -40,9 +40,11 @@ class marketing_campaign(osv.osv): #{{{
_columns = {
'name': fields.char('Name', size=64, required=True),
- 'object_id': fields.many2one('ir.model', 'Objects', required=True),
+ 'object_id': fields.many2one('ir.model', 'Objects', required=True,
+ help="Choose the Object on which you want \
+ this campaign to be run"),
'mode':fields.selection([('test', 'Test'),
- ('test_realtime', 'Realtime Time'),
+ ('test_realtime', 'Realtime'),
('manual', 'Manual'),
('active', 'Active')],
'Mode', required=True),
@@ -53,7 +55,8 @@ class marketing_campaign(osv.osv): #{{{
'State',),
'activity_ids': fields.one2many('marketing.campaign.activity',
'campaign_id', 'Activities'),
- 'fixed_cost': fields.float('Fixed Cost'),
+ 'fixed_cost': fields.float('Fixed Cost', help="The fixed cost is cost\
+ you required for the campaign"),
}
@@ -102,7 +105,7 @@ class marketing_campaign_segment(osv.osv): #{{{
'object_id': fields.related('campaign_id','object_id',
type='many2one', relation='ir.model',
string='Object'),
- 'ir_filter_id': fields.many2one('ir.filters', 'Filter'),
+ 'ir_filter_id': fields.many2one('ir.filters', 'Filter', help=""),
'sync_last_date': fields.datetime('Date'),
'sync_mode': fields.selection([('create_date', 'Create'),
('write_date', 'Write')],
@@ -199,8 +202,11 @@ class marketing_campaign_activity(osv.osv): #{{{
'object_id': fields.related('campaign_id','object_id',
type='many2one', relation='ir.model',
string='Object'),
- 'start': fields.boolean('Start'),
- 'condition': fields.char('Condition', size=256, required=True, help="Condition that is to be tested before action is executed"),
+ 'start': fields.boolean('Start',help= "Its necessary to start activity \
+ before running campaign"),
+ 'condition': fields.char('Condition', size=256, required=True,
+ help="Condition that is to be tested before \
+ action is executed"),
'type': fields.selection([('email', 'E-mail'),
('paper', 'Paper'),
('action', 'Action'),
@@ -208,10 +214,11 @@ class marketing_campaign_activity(osv.osv): #{{{
'Type', required=True),
'email_template_id': fields.many2one('poweremail.templates','Email Template'),
'report_id': fields.many2one('ir.actions.report.xml', 'Reports', ),
- 'report_directory_id': fields.many2one('document.directory',
- 'Directory to Store Reports',
- help="Folder is used to store the genreated reports"),
- 'server_action_id': fields.many2one('ir.actions.server', string='Action'),
+ 'report_directory_id': fields.many2one('document.directory','Directory',
+ help="Folder is used to store the generated reports"),
+ 'server_action_id': fields.many2one('ir.actions.server', string='Action',
+ help= "Describes the action name.\n"
+ "eg:On which object which action to be taken on basis of which condition"),
'to_ids': fields.one2many('marketing.campaign.transition',
'activity_from_id',
'Next Activities'),
@@ -251,7 +258,7 @@ class marketing_campaign_activity(osv.osv): #{{{
workitem = workitem_obj.browse(cr, uid, wi_id)
if activity.type == 'paper' :
service = netsvc.LocalService('report.%s'%activity.report_id.report_name)
- (report_data, format) = service.create(cr, uid, [activity.report_id.id], {}, {})
+ (report_data, format) = service.create(cr, uid, [], {}, {})
attach_vals = {
'name': '%s_%s_%s'%(activity.report_id.report_name,
activity.name,workitem.partner_id.name),
@@ -367,7 +374,7 @@ class marketing_campaign_workitem(osv.osv): #{{{
def process(self, cr, uid, workitem_ids, context={}):
for wi in self.browse(cr, uid, workitem_ids):
- if wi.state == 'todo' :# we searched the wi which are in todo state
+ if wi.state == 'todo':# we searched the wi which are in todo state
#then y v keep this filter again
eval_context = {
'pool': self.pool,
@@ -375,23 +382,23 @@ class marketing_campaign_workitem(osv.osv): #{{{
'uid': uid,
'wi': wi,
'object': wi.activity_id,
- 'transition' : wi.activity_id.to_ids
+ 'transition': wi.activity_id.to_ids
}
- expr = eval(str(wi.activity_id.condition), cxt)
+ expr = eval(str(wi.activity_id.condition), eval_context)
if expr:
try :
res = self.pool.get('marketing.campaign.activity').process(
cr, uid, wi.activity_id.id, wi.id, context)
if res :
- self.write(cr, uid, wi.id, {'state':'done'})
+ self.write(cr, uid, wi.id, {'state': 'done'})
self.process_chain(cr, uid, wi.id, context)
else :
- self.write(cr, uid, wi.id, {'state':'exception',
- 'error_msg' : res['error_msg']})
+ self.write(cr, uid, wi.id, {'state': 'exception',
+ 'error_msg': res['error_msg']})
except Exception,e:
- self.write(cr, uid, wi.id, {'state':'exception'})
+ self.write(cr, uid, wi.id, {'state': 'exception'})
else :
- self.write(cr, uid, wi.id, {'state':'cancelled'})
+ self.write(cr, uid, wi.id, {'state': 'cancelled'})
return True
@@ -407,7 +414,7 @@ class poweremail_templates(osv.osv):
_inherit = "poweremail.templates"
_defaults = {
- 'object_name' : lambda obj, cr, uid, context : context.get('object_id',False),
+ 'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
}
poweremail_templates()
@@ -416,12 +423,12 @@ class report_xml(osv.osv):
_inherit = 'ir.actions.report.xml'
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
- if not context :
+ if not context:
context = {}
if context and 'object_id' in context and context['object_id']:
model = self.pool.get('ir.model').browse(cr, uid,
context['object_id']).model
- args.append(('model','=',model))
+ args.append(('model', '=', model))
return super(report_xml, self).search(cr, uid, args, offset, limit, order, context, count)
report_xml()
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
new file mode 100644
index 00000000000..9c2211903c5
--- /dev/null
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Thanks for showing interest in OpenERP
+ info@tinyerp.com
+
+
+
+
+
+
+
+ Hello,
+Thanks for generous interest you have shown in the open ERP.
+Regards,
+OpenERP Team,
+ mako
+
+ For OpenERP OnDemand Free Trial 2010
+ crm.lead
+
+
+
+
+ Marketing campaign demo report
+ ir.actions.report.xml
+ crm.lead
+ crm.lead.demo
+ marketing_campaign/report/crm_lead_mc_demo_report.rml
+ pdf
+
+
+
+ OpenERP OnDemand Free Trial 2010
+
+
+
+
+ Propose a 1 month free trial for an OnDemand offer
+
+
+
+ paper
+
+
+
+
+ Thanks for showing interest
+
+
+
+
+
+
+
+
+
+
+
+ BossList US Associations List-0/90
+ create_date
+
+ draft
+
+
+
+
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index a1f48922806..9c9d4e96c14 100755
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -139,18 +139,18 @@
search
-
-
+
+
-
-
+
+
-
-
+
+
@@ -231,11 +231,11 @@
search
-
-
+
+
-
-
+
+
@@ -243,9 +243,9 @@
-
-
-
+
+
+
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index b66ec89ca6b..caedbc01cd9 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -30,14 +30,14 @@
-
-
-
@@ -49,12 +49,12 @@
-
-
-
+
+
+
-
-
+
+
diff --git a/addons/marketing_campaign/report/crm_lead_mc_demo_report.rml b/addons/marketing_campaign/report/crm_lead_mc_demo_report.rml
new file mode 100644
index 00000000000..34bc00da438
--- /dev/null
+++ b/addons/marketing_campaign/report/crm_lead_mc_demo_report.rml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [[ repeatIn(objects,'lead') ]]
+
+
+
+ Partner : [[ lead.company_id.partner_id.name ]]
+ Company : [[ lead.company_id.parent_id.name ]]
+
+
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index d8c039ef276..57b28e76311 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -26,7 +26,7 @@
'category': 'Generic Modules/Base',
'description': """
This module shows the basic processes involved
- in the selected modules and in the sequence these
+ in the selected modules and in the sequence they
occur
Note: This applies to the modules containing modulename_process_xml
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index 9272287371a..7607c499add 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -26,7 +26,7 @@
'category': 'Custom',
'description': """
Adds a reporting menu in products that computes sales, purchases, margins
-and others interesting indicators based on invoices. The wizard to launch
+and other interesting indicators based on invoices. The wizard to launch
the report has several options to help you get the data you need.
""",
'author': 'Tiny',
diff --git a/addons/profile_accounting/i18n/pl.po b/addons/profile_accounting/i18n/pl.po
index e1bcf6839fc..be89ead2d63 100644
--- a/addons/profile_accounting/i18n/pl.po
+++ b/addons/profile_accounting/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_accounting
diff --git a/addons/profile_manufacturing/i18n/pl.po b/addons/profile_manufacturing/i18n/pl.po
index 6707d6598b1..9b653d520b3 100644
--- a/addons/profile_manufacturing/i18n/pl.po
+++ b/addons/profile_manufacturing/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_manufacturing
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 3c7e80d4c11..a98b5cb28fd 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -28,7 +28,7 @@
"category" : "Generic Modules/Projects & Services",
"depends" : ["product", "analytic", "process", "mail_gateway"],
"description": """Project management module that track multi-level projects, tasks,
-works done on tasks, eso. It is able to render planning, order tasks, eso.
+work done on tasks, eso. It is able to render planning, order tasks, eso.
""",
"init_xml" : [],
"update_xml": [
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index a10b7348ccb..386eb18b18e 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 919bfc2865e..a978587e232 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -216,7 +216,7 @@
-
+ task.by.days.vs.planned.hours.treetask.by.days.vs.planned.hourstree
@@ -248,5 +248,6 @@
graph,tree
+
diff --git a/addons/project_gtd/i18n/pl.po b/addons/project_gtd/i18n/pl.po
index 39c8b03565e..d5271fc913e 100644
--- a/addons/project_gtd/i18n/pl.po
+++ b/addons/project_gtd/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_gtd
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 99bce80caca..70ce9020cf5 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -29,7 +29,7 @@
Long Term Project management module that track planning, scheduling, resources allocation.
Mainly used with Big project management.
- - Project Phases will be maintain by Manager of the project
+ - Project Phases will be maintained by Manager of the project
- Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given.
If no project given then all the draft,open and pending states phases will be taken
- Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as arguement and computes all the open,draft and pending tasks
diff --git a/addons/project_mrp/i18n/pl.po b/addons/project_mrp/i18n/pl.po
index 4a9dba81362..7fd2d0f39f7 100644
--- a/addons/project_mrp/i18n/pl.po
+++ b/addons/project_mrp/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_mrp
diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
index cbc30a912e7..87a68a2e410 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -32,7 +32,7 @@ This module is based on the analytic accounting and is totally integrated with
* the holidays management
* the project management
-So that, each department manager can know if someone in his team has still unaloccated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks.
+So that, each department manager can know if someone in his team has still unallocated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks.
At the end of the month, the planning manager can also check if the encoded timesheets are respecting the planned time on each analytic account.
""",
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index 4d89af6bb28..80601db9e81 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -25,7 +25,7 @@
'version': '0.1',
'category': 'Generic Modules/Projects & Services',
'description': """
- - If deadline date of project is changed will
+ - If deadline date of project is changed
then the deadline date for all the tasks will change to the same """,
'author': 'Tiny',
'depends': ['base', 'project'],
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index 79ee7725dc6..fcc33100d02 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_timesheet
diff --git a/addons/report_analytic/i18n/pl.po b/addons/report_analytic/i18n/pl.po
index f3004d61990..24bd7fd6d0b 100644
--- a/addons/report_analytic/i18n/pl.po
+++ b/addons/report_analytic/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_analytic
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index 5fb8f7e564c..de9d3af1e44 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -26,7 +26,7 @@
'category': 'Generic Modules/Inventory Control',
'description': """
A module that adds intrastat reports.
- This module gives the details of the goods traded between the countries of Europan Union """,
+ This module gives the details of the goods traded between the countries of European Union """,
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['base', 'product', 'stock', 'sale', 'purchase'],
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index b7c5f4fd512..d204d4a3ee5 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -28,7 +28,7 @@
The sale journal modules allows you to categorise your
sales and deliveries (picking lists) between different journals.
This module is very helpful for bigger companies that
- works by departments.
+ work by departments.
You can use journal for different purposes, some examples:
* isolate sales of different departments
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index dc903684be6..089e36cb5cd 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:39+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-05-26 07:02+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_journal
@@ -25,35 +25,35 @@ msgstr "Sprzedaż miesięczna"
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned
msgid "Assigned packing"
-msgstr ""
+msgstr "Przypisane przesunięcie"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "assigned"
-msgstr "Przypisany"
+msgstr ""
#. module: sale_journal
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Waiting Schedule"
-msgstr ""
+msgstr "Czeka na planowanie"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,invoice_state:0
msgid "to be invoiced"
-msgstr "do zaksięgowania"
+msgstr ""
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_sale_journal
#: view:sale_journal.sale.journal:0
#: field:stock.picking,sale_journal_id:0
msgid "Sale Journal"
-msgstr ""
+msgstr "Dziennik sprzedaży"
#. module: sale_journal
#: field:sale_journal.sale.journal,sale_stats_ids:0
@@ -64,19 +64,19 @@ msgstr "Statystyki sprzedaży"
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "waiting"
-msgstr "oczekuje"
+msgstr ""
#. module: sale_journal
#: view:sale_journal.picking.journal:0
#: view:sale_journal.sale.journal:0
msgid "Set to Draft"
-msgstr "Ustaw na wer.roboczą"
+msgstr "Ustaw na projekt"
#. module: sale_journal
#: field:sale_journal.picking.journal,date:0
#: field:sale_journal.sale.journal,date:0
msgid "Journal date"
-msgstr ""
+msgstr "Data dziennika"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method
@@ -88,7 +88,7 @@ msgstr "Metoda pakowania wg faktur"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking
msgid "Packing Journals"
-msgstr "Dzienniki pakowania"
+msgstr "Dzienniki przesunięć"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
@@ -123,7 +123,7 @@ msgstr "Zarządzanie sprzedażą i dostawami przez dziennik"
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "done"
-msgstr "gotowe"
+msgstr ""
#. module: sale_journal
#: field:sale_journal.invoice.type.stats,price_average:0
@@ -165,7 +165,7 @@ msgstr "Cena całkowita"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal
msgid "Packing journals"
-msgstr "Dzienniki pakowania"
+msgstr "Dzienniki przesunięć"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales
@@ -190,27 +190,27 @@ msgstr "Otwarte dzienniki"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
msgid "Packing"
-msgstr ""
+msgstr "Lista przesunięć"
#. module: sale_journal
#: help:res.partner,property_invoice_type:0
msgid "The type of journal used for sales and packing."
-msgstr ""
+msgstr "Typ dziennika stosowany do sprzedaży i list przesunięć"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,invoice_state:0
msgid "None"
-msgstr ""
+msgstr "Brak"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month
msgid "Sales by journal (this month)"
-msgstr ""
+msgstr "Sprzedaż wg dziennika (bieżący miesiąc)"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Manual in progress"
-msgstr ""
+msgstr "Ręczne w trakcie przetwarzania"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree
@@ -218,28 +218,28 @@ msgstr ""
#: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all
#: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month
msgid "Packing by journal"
-msgstr ""
+msgstr "Listy przesunięć wg dziennika"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
msgid "Cancel Packing"
-msgstr ""
+msgstr "Anuluj listę przesunięć"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed
msgid "Confirmed packing"
-msgstr ""
+msgstr "Potwierdzone listy przesunięć"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "In progress"
-msgstr ""
+msgstr "W toku"
#. module: sale_journal
#: view:sale_journal.picking.stats:0
msgid "Packing by journals"
-msgstr ""
+msgstr "Listy przesunięć wg dzienników"
#. module: sale_journal
#: field:sale_journal.invoice.type.stats,name:0
@@ -258,7 +258,7 @@ msgstr "Stan faktury"
#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month
#: view:sale_journal.invoice.type.stats:0
msgid "Packing by invoice method"
-msgstr ""
+msgstr "Listy przesunięć wg metod faktury"
#. module: sale_journal
#: field:sale_journal.sale.stats,state:0
@@ -268,7 +268,7 @@ msgstr "Stan zamówienia"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Shipping Exception"
-msgstr ""
+msgstr "Wyjątek wysyłki"
#. module: sale_journal
#: field:sale_journal.invoice.type,note:0
@@ -281,7 +281,7 @@ msgstr "Uwaga"
#: selection:sale_journal.picking.journal,state:0
#: selection:sale_journal.sale.journal,state:0
msgid "Draft"
-msgstr "Roboczy"
+msgstr "Projekt"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
@@ -292,7 +292,7 @@ msgstr ""
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Invoice Exception"
-msgstr ""
+msgstr "Wyjątek faktury"
#. module: sale_journal
#: field:sale_journal.picking.journal,date_validation:0
@@ -309,17 +309,17 @@ msgstr ""
#. module: sale_journal
#: field:sale_journal.invoice.type,active:0
msgid "Active"
-msgstr ""
+msgstr "Aktywne"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
msgid "Draft sales"
-msgstr "wer.robocza sprzedaży"
+msgstr "Projekt sprzedaży"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Quotation"
-msgstr ""
+msgstr "Oferta"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal
@@ -370,7 +370,7 @@ msgstr "Sprzedaż"
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting
#: view:sale_journal.picking.journal:0
msgid "Packing Journal"
-msgstr ""
+msgstr "Dziennik list przesunięcia"
#. module: sale_journal
#: selection:sale_journal.picking.journal,state:0
@@ -382,7 +382,7 @@ msgstr "Gotowe"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Cancel"
-msgstr ""
+msgstr "Anulowano"
#. module: sale_journal
#: field:sale_journal.picking.journal,picking_stats_ids:0
@@ -393,7 +393,7 @@ msgstr "Statystyka dziennika"
#: selection:sale_journal.picking.journal,state:0
#: selection:sale_journal.sale.journal,state:0
msgid "Open"
-msgstr ""
+msgstr "Otwarte"
#. module: sale_journal
#: constraint:ir.model:0
@@ -423,7 +423,7 @@ msgstr "Moje otwarte dzienniki"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open
msgid "Statistics on packing to invoice"
-msgstr ""
+msgstr "Statystyka list przesunięć wg faktur"
#. module: sale_journal
#: view:sale_journal.sale.journal:0
@@ -436,23 +436,23 @@ msgstr "Anuluj sprzedaż"
#: field:sale_journal.invoice.type,name:0
#: field:stock.picking,invoice_type_id:0
msgid "Invoice Type"
-msgstr ""
+msgstr "Typ faktury"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,invoice_state:0
msgid "invoiced"
-msgstr "zafakturowano"
+msgstr ""
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "confirmed"
-msgstr "Potwierdzono"
+msgstr ""
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_picking_stats
msgid "Packing lists by Journal"
-msgstr ""
+msgstr "Listy przesunięć wg dziennika"
#. module: sale_journal
#: field:sale_journal.invoice.type.stats,quantity:0
@@ -483,7 +483,7 @@ msgstr "Metoda fakturowania"
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_this
#: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales_this_month
msgid "This Month"
-msgstr ""
+msgstr "W tym miesiącu"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales
@@ -506,7 +506,7 @@ msgstr "Nie pogrupowane"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_open
msgid "Packing to invoice"
-msgstr ""
+msgstr "Listy przesunięć do zafakturowania"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
@@ -517,7 +517,7 @@ msgstr "Informacja dziennika"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type_stats
msgid "Stats on packing by invoice method"
-msgstr ""
+msgstr "Statystyka list przesunięć wg metody fakturowania"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
@@ -535,7 +535,7 @@ msgstr "Stany"
#: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_all
#: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_menu
msgid "Packing by Journal"
-msgstr ""
+msgstr "Listy przesunięć wg dziennika"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
@@ -546,7 +546,7 @@ msgstr "Zamknij dziennik"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice
msgid "Packing to Invoice"
-msgstr ""
+msgstr "Lista przesunięć do zafakturowania"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_approved
diff --git a/addons/scrum/__openerp__.py b/addons/scrum/__openerp__.py
index 3170baca2a1..2f4007793ac 100644
--- a/addons/scrum/__openerp__.py
+++ b/addons/scrum/__openerp__.py
@@ -25,7 +25,7 @@
'version': '1.0',
'category': 'Enterprise Specific Modules/Information Technology',
'description': """
- This modules implements all concepts defined by the scrum project
+ This module implements all concepts defined by the scrum project
management methodology for IT companies:
* Project with sprints, product owner, scrum master
* Sprints with reviews, daily meetings, feedbacks
@@ -36,10 +36,10 @@
* Mid-term, long-term road-map
* Customers/functional requests VS technical ones
- It also create a new reporting:
+ It also creates a new reporting:
* Burn-down chart
- The scrum projects and tasks inherits from the real projects and
+ The scrum projects and tasks inherit from the real projects and
tasks, so you can continue working on normal tasks that will also
include tasks from scrum projects.
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index 3e7fe147c73..81e2bb125fd 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -95,7 +95,7 @@ class stock_report_tracklots(osv.osv):
}
def init(self, cr):
- drop_view_if_exists(cr, 'stock_report_prodlots')
+ drop_view_if_exists(cr, 'stock_report_tracklots')
cr.execute("""
create or replace view stock_report_tracklots as (
@@ -150,7 +150,7 @@ class report_stock_lines_date(osv.osv):
'date': fields.datetime('Latest Inventory Date'),
}
def init(self, cr):
- drop_view_if_exists(cr, 'stock_report_prodlots')
+ drop_view_if_exists(cr, 'report_stock_lines_date')
cr.execute("""
create or replace view report_stock_lines_date as (
select
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 6770bca3020..4eaf97be6d6 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1215,7 +1215,7 @@ class stock_move(osv.osv):
'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
'date': fields.datetime('Created Date'),
- 'date_planned': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
+ 'date_planned': fields.datetime('Date Planned', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 70cf4df167f..eb68117e698 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -341,7 +341,7 @@
-
+
@@ -652,7 +652,7 @@
-
+
-
+
@@ -778,7 +778,7 @@
-
+
-
+
-
+
-
+
-
+
@@ -1227,7 +1227,7 @@
-
+
@@ -1288,7 +1288,7 @@
-
+
@@ -1314,18 +1314,16 @@
tree
-
-
+
+
-
-
-
+
-
+
@@ -1364,7 +1362,7 @@
-
+
@@ -1397,31 +1395,39 @@
stock.move.searchstock.movesearch
-
+
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
- All Moves
+ Stock Movesstock.moveir.actions.act_windowform
@@ -1613,10 +1619,10 @@
src_model="stock.location"/>
@@ -1628,7 +1634,7 @@
src_model="stock.move"/>