odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merge mdi branch to get effect of all the typos 

bzr revid: psi@tinyerp.com-20120423124120-j4j8fp3ajcyy371q
This commit is contained in:
Purnendu Singh (OpenERP) 2012-04-23 18:11:20 +05:30
parent 869d9375d9 7c5f34601f
commit cfeb2b9ebf
21 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/base_calendar/base_calendar_view.xml
View File

@ -11,7 +11,7 @@
<form string="Invitation details">
<group col="6" colspan="4">
<field name="email" string="Invitation To"/>
<field name="cutype" string="Invitation type" />
<field name="cutype" string="Invitation Type" />
<field name="rsvp" />
<field name="role" string="Role" />
<field name="sent_by_uid" string="Invitation From" />
@ -248,7 +248,7 @@
<group col="6" colspan="4">
<separator colspan="6" string="Visibility"/>
<field name="user_id" string="Responsible User" />
<field name="show_as" string="Show time as"/>
<field name="show_as" string="Show Time as"/>
<field name="class" string="Privacy"/>
<field name="recurrent_id" invisible="1" />
<field name="recurrent_uid" invisible="1" />

4
addons/base_setup/base_setup.py
View File

@ -212,14 +212,14 @@ class sale_config_settings(osv.osv_memory):
_inherit = 'res.config.settings'
_columns = {
'module_crm': fields.boolean('CRM'),
'module_plugin_thunderbird': fields.boolean('Thunderbird plugin',
'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
help="""The plugin allows you archive email and its attachments to the selected
OpenERP objects. You can select a partner, a task, a project, an analytical
account, or any other object and attach the selected mail as a .eml file in
the attachment of a selected record. You can create documents for CRM Lead,
HR Applicant and Project Issue from the selected emails.
This installs the module plugin_thunderbird."""),
'module_plugin_outlook': fields.boolean('Outlook plugin',
'module_plugin_outlook': fields.boolean('Outlook Plugin',
help="""The Outlook plugin allows you to select an object that you would like to add
to your email and its attachments from MS Outlook. You can select a partner, a task,
a project, an analytical account, or any other object and archive a selected

2
addons/crm/crm_lead.py
View File

@ -169,7 +169,7 @@ class crm_lead(crm_case, osv.osv):
'date_closed': fields.datetime('Closed', readonly=True),
'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"),
'user_id': fields.many2one('res.users', 'Salesman'),
'referred': fields.char('Referred By', size=64),
'referred': fields.char('Referred by', size=64),
'date_open': fields.datetime('Opened', readonly=True),
'day_open': fields.function(_compute_day, string='Days to Open', \
multi='day_open', type="float", store=True),

2
addons/crm/crm_meeting_view.xml
View File

@ -64,7 +64,7 @@
</group><group col="2" colspan="2">
<separator colspan="2" string="Visibility"/>
<field name="class" string="Privacy" groups="base.group_extended"/>
<field name="show_as" string="Show time as" groups="base.group_extended"/>
<field name="show_as" string="Show Time as" groups="base.group_extended"/>
<field name="rrule" invisible="1" readonly="1"/>
<field name="recurrent_id" invisible="1"/>
<field name="recurrent_uid" invisible="1"/>

2
addons/crm/crm_segmentation.py
View File

@ -45,7 +45,7 @@ added to partners that match the segmentation criterions after computation.'),
'partner_id': fields.integer('Max Partner ID processed'),
'segmentation_line': fields.one2many('crm.segmentation.line', \
'segmentation_id', 'Criteria', required=True),
'som_interval': fields.integer('Days per Periode', help="A period is the average number of days between two cycle of sale or purchase for this segmentation.\
'som_interval': fields.integer('Days per Period', help="A period is the average number of days between two cycle of sale or purchase for this segmentation.\
\nIt's mainly used to detect if a partner has not purchased or buy for a too long time, \
\nso we suppose that his state of mind has decreased because he probably bought goods to another supplier. \
\nUse this functionality for recurring businesses."),

6
addons/crm/res_config.py
View File

@ -29,7 +29,7 @@ class crm_configuration(osv.osv_memory):
'module_crm_caldav': fields.boolean("Caldav Synchronization",
help="""Use protocol caldav to synchronize meetings with other calendar applications (like Sunbird).
This installs the module crm_caldav."""),
'fetchmail_lead': fields.boolean("Create leads from an email account",
'fetchmail_lead': fields.boolean("Create Leads from an E-mail Account",
fetchmail_model='crm.lead', fetchmail_name='Incoming leads',
help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
'lead_server': fields.char('Server', size=256),
@ -49,10 +49,10 @@ class crm_configuration(osv.osv_memory):
'module_import_google': fields.boolean("Google Import",
help="""Import google contact in partner address and add google calendar events details in Meeting.
This installs the module import_google."""),
'module_wiki_sale_faq': fields.boolean("Install a sales FAQ",
'module_wiki_sale_faq': fields.boolean("Install a Sales FAQ",
help="""This provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki Sale FAQ.
This installs the module wiki_sale_faq."""),
'module_google_map': fields.boolean("Google maps on customer",
'module_google_map': fields.boolean("Google Maps on Customer",
help="""Locate customers on Google Map.
This installs the module google_map."""),
}

2
addons/crm/res_config_view.xml
View File

@ -22,7 +22,7 @@
</group>
<group name="config_crm" position="after">
<separator string="Import and Synchronize data from an other application" colspan="4"/>
<separator string="Import and Synchronize Data from an Other Application" colspan="4"/>
<field name="module_import_sugarcrm"/>
<field name="module_crm_caldav"/>
<field name="module_import_google"/>

5
addons/event/res_partner.py
View File

@ -29,7 +29,10 @@ class res_partner(osv.osv):
'event_ids': fields.one2many('event.event','main_speaker_id', readonly=True),
'event_registration_ids': fields.one2many('event.registration','partner_id', readonly=True),
}
_defaults = {
'speaker' : True,
}
res_partner()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/event_moodle/event_moodle.py
View File

@ -177,7 +177,7 @@ class event_event(osv.osv):
'shortname': '',
'startdate': date,
'summary': event.note,
'categoryid':1, #the category hardcoded is 'Miscelleanous'
'categoryid':1, #the category hardcoded is 'Miscellaneous'
}]
#create a course in moodle and keep the id
response_courses = moodle_pool.create_moodle_courses(cr, uid, moodle_config_wiz_id, dic_courses, context=context)

6
addons/hr/hr_view.xml
View File

@ -242,7 +242,7 @@
</record>
<record id="action2" model="ir.actions.act_window">
<field name="name">Subordonate Hierarchy</field>
<field name="name">Subordinate Hierarchy</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.employee</field>
<field name="domain">[('id','in',active_ids)]</field>
@ -254,7 +254,7 @@
<field eval="'action'" name="key"/>
<field eval="'client_action_multi'" name="key2"/>
<field eval="['hr.employee']" name="models"/>
<field name="name">Subordonate Hierarchy</field>
<field name="name">Subordinate Hierarchy</field>
<field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
<field eval="True" name="isobject"/>
<field eval="True" name="replace"/>
@ -315,7 +315,7 @@
parent="hr.menu_hr_configuration" sequence="1"/>
<record id="open_view_categ_tree" model="ir.actions.act_window">
<field name="name">Categories structure</field>
<field name="name">Categories Structure</field>
<field name="res_model">hr.employee.category</field>
<field name="view_type">tree</field>
<field name="view_id" ref="view_employee_category_tree"/>

18
addons/mail/mail_message.py
View File

@ -101,9 +101,9 @@ class mail_message_common(osv.osv_memory):
_rec_name = 'subject'
_columns = {
'subject': fields.char('Subject', size=512, required=True),
'model': fields.char('Related Document model', size=128, select=1),
'model': fields.char('Related Document Model', size=128, select=1),
'res_id': fields.integer('Related Document ID', select=1),
'record_name': fields.function(get_record_name, type='string', string='Message record name',
'record_name': fields.function(get_record_name, type='string', string='Message Record Name',
help="Name of the record, matching the result of the name_get."),
'date': fields.datetime('Date'),
'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
@ -111,19 +111,19 @@ class mail_message_common(osv.osv_memory):
'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),
'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
'headers': fields.text('Message headers', readonly=1,
'headers': fields.text('Message Headers', readonly=1,
help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"),
'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
'subtype': fields.char('Message type', size=32, help="Type of message, usually 'html' or 'plain', used to "
'subtype': fields.char('Message Type', size=32, help="Type of message, usually 'html' or 'plain', used to "
"select plaintext or rich text contents accordingly", readonly=1),
'body_text': fields.text('Text contents', help="Plain-text version of the message"),
'body_html': fields.text('Rich-text contents', help="Rich-text/HTML version of the message"),
'body': fields.function(get_body, fnct_search = search_body, string='Message content', type='text',
'body_text': fields.text('Text Contents', help="Plain-text version of the message"),
'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML version of the message"),
'body': fields.function(get_body, fnct_search = search_body, string='Message Content', type='text',
help="Content of the message. This content equals the body_text field for plain-test messages, and body_html for rich-text/HTML messages. This allows having one field if we want to access the content matching the message subtype."),
'parent_id': fields.many2one('mail.message', 'Parent message', help="Parent message, used for displaying as threads with hierarchy",
'parent_id': fields.many2one('mail.message', 'Parent Message', help="Parent message, used for displaying as threads with hierarchy",
select=True, ondelete='set null',),
'child_ids': fields.one2many('mail.message', 'parent_id', 'Child messages'),
'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
}
_defaults = {

2
addons/mail/res_users.py
View File

@ -36,7 +36,7 @@ class res_users(osv.osv):
('comments', 'Only comments'),
('to_me', 'Only when sent directly to me'),
('none', 'Never')
], 'Receive feeds by email', required=True,
], 'Receive Feeds by E-mail', required=True,
help="Choose in which case you want to receive an email when you receive new feeds."),
}

2
addons/plugin_outlook/plugin_outlook.xml
View File

@ -58,7 +58,7 @@
<field name="module_plugin_outlook" position="after">
<group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
<button name="%(action_outlook_installer)d" type="action"
string="Configure Outlook plugin" icon="gtk-execute"/>
string="Configure Outlook Plugin" icon="gtk-execute"/>
</group>
</field>
</field>

2
addons/plugin_thunderbird/plugin_thunderbird.xml
View File

@ -65,7 +65,7 @@
<field name="module_plugin_thunderbird" position="after">
<group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
<button name="%(action_thunderbird_installer)d" type="action"
string="Configure Thunderbird plugin" icon="gtk-execute"/>
string="Configure Thunderbird Plugin" icon="gtk-execute"/>
</group>
</field>
</field>

2
addons/point_of_sale/point_of_sale_view.xml
View File

@ -747,7 +747,7 @@
<field name="view_id" ref="view_pos_order_tree_all_sales_lines" />
</record>
<!-- Miscelleanous Operations/Reporting -->
<!-- Miscellaneous Operations/Reporting -->
<menuitem name="Point of Sale" parent="base.menu_reporting" id="menu_point_rep" sequence="50" groups="group_pos_manager"/>
<!-- Invoice -->

10
addons/product/product.py
View File

@ -291,7 +291,7 @@ class product_template(osv.osv):
'description_purchase': fields.text('Purchase Description',translate=True),
'description_sale': fields.text('Sale Description',translate=True),
'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
@ -300,8 +300,8 @@ class product_template(osv.osv):
'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Sale Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Purchase Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price."),
'volume': fields.float('Volume', help="The volume in m3."),
'weight': fields.float('Gross weight', digits_compute=dp.get_precision('Stock Weight'), help="The gross weight in Kg."),
'weight_net': fields.float('Net weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
'weight': fields.float('Gross Weight', digits_compute=dp.get_precision('Stock Weight'), help="The gross weight in Kg."),
'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True,
help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
'warranty': fields.float('Warranty (months)'),
@ -312,7 +312,7 @@ class product_template(osv.osv):
('sellable','Normal'),
('end','End of Lifecycle'),
('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."),
'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
'uom_id': fields.many2one('product.uom', 'Default Unit of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."),
'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
help='Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM.'),
@ -328,7 +328,7 @@ class product_template(osv.osv):
'loc_rack': fields.char('Rack', size=16),
'loc_row': fields.char('Row', size=16),
'loc_case': fields.char('Case', size=16),
'company_id': fields.many2one('res.company', 'Company',select=1),
'company_id': fields.many2one('res.company', 'Company', select=1),
}
def _get_uom_id(self, cr, uid, *args):

4
addons/project/project_view.xml
View File

@ -50,7 +50,7 @@
<field name="resource_calendar_id"/>
</group>
<group col="2" colspan="2" name="misc">
<separator colspan="4" string="Miscelleanous"/>
<separator colspan="4" string="Miscellaneous"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
<field name="warn_manager"/>
<field name="priority"/>
@ -296,7 +296,7 @@
<field name="sequence"/>
</group>
<separator string="Miscelleanous" colspan="4"/>
<separator string="Miscellaneous" colspan="4"/>
<field name="partner_id" />
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
<group col="4" colspan="2">

2
addons/project/res_config.py
View File

@ -46,7 +46,7 @@ class project_configuration(osv.osv_memory):
'module_project_issue': fields.boolean("Issues and Bug Tracking",
help="""Provides management of issues/bugs in projects.
This installs the module project_issue."""),
'module_project_issue_sheet': fields.boolean("Track and invoice issues working time",
'module_project_issue_sheet': fields.boolean("Track and Invoice Issues Working Time",
help="""Provides timesheet support for the issues/bugs management in project.
This installs the module project_issue_sheet."""),
}

2
addons/project/res_config_view.xml
View File

@ -21,7 +21,7 @@
<separator string="Planning" colspan="4"/>
<field name="module_project_long_term"/>
<separator string="Helpdesk and support" colspan="4"/>
<separator string="Helpdesk and Support" colspan="4"/>
<field name="module_project_issue"/>
<field name="module_project_issue_sheet"/>
<group name="support" colspan="4"/>

2
addons/project_planning/project_planning_view.xml
View File

@ -117,7 +117,7 @@
<field name="priority"/>
<field name="sequence"/>
</group>
<separator string="Miscelleanous" colspan="4"/>
<separator string="Miscellaneous" colspan="4"/>
<field name="type_id"/>
<field name="active"/>
<field name="partner_id"/>

2
addons/wiki_faq/wiki_faq.xml
View File

@ -83,7 +83,7 @@ Integration Benefits:
* Stores automatically ERP reports
* Automatic classification of ressources
* Shared access rights for DMS and ERP
* Store emails with outlook Plugin
* Store emails with Outlook Plugin
== External Links ==