Click to create a new supplier payment.
- OpenERP helps you easily track payments you do and remining - balance to pay to your supplier. + OpenERP helps you easily track payments you make and the remaining balances you need to pay your suppliers.
If you want to import sales order having several order lines; for each order line, you need to reserve diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml index 282622d2ad2..3726c744b2e 100644 --- a/addons/crm/crm_data.xml +++ b/addons/crm/crm_data.xml @@ -39,7 +39,7 @@
These methods allows to automaticaly compute the delivery price - according to your settings; on the sale order (based on the + according to your settings; on the sales order (based on the quotation) or the invoice (based on the delivery orders).
diff --git a/addons/event/event.py b/addons/event/event.py index 5d010bf0760..9e50128c592 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -292,7 +292,7 @@ class event_registration(osv.osv): _inherit = ['mail.thread', 'ir.needaction_mixin'] _columns = { 'id': fields.integer('ID'), - 'origin': fields.char('Source Document', size=124,readonly=True,help="Name of the sale order which create the registration"), + 'origin': fields.char('Source Document', size=124,readonly=True,help="Reference of the sales order which created the registration"), 'nb_register': fields.integer('Number of Participants', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}), diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py index 2f191bad062..c274669af98 100644 --- a/addons/event_sale/__openerp__.py +++ b/addons/event_sale/__openerp__.py @@ -28,7 +28,7 @@ Creating registration with sale orders. ======================================= -This module allows you to automatize and connect your registration creation with +This module allows you to automate and connect your registration creation with your main sale flow and therefore, to enable the invoicing feature of registrations. It defines a new kind of service products that offers you the possibility to diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py index 66dcbc78f13..4f32620e667 100644 --- a/addons/event_sale/event_sale.py +++ b/addons/event_sale/event_sale.py @@ -25,8 +25,8 @@ from openerp.tools.translate import _ class product(osv.osv): _inherit = 'product.product' _columns = { - 'event_ok': fields.boolean('Event Subscription', help='Determine if a product needs to create automatically an event registration at the confirmation of a sale order line.'), - 'event_type_id': fields.many2one('event.type', 'Type of Event', help='Select event types so when we use this product in Sale order line, it will filter events of this type only.'), + 'event_ok': fields.boolean('Event Subscription', help='Determine if a product needs to create automatically an event registration at the confirmation of a sales order line.'), + 'event_type_id': fields.many2one('event.type', 'Type of Event', help='Select event types so when we use this product in sales order lines, it will filter events of this type only.'), } def onchange_event_ok(self, cr, uid, ids, event_ok, context=None): @@ -69,7 +69,7 @@ class sale_order_line(osv.osv): def button_confirm(self, cr, uid, ids, context=None): ''' - create registration with sale order + create registration with sales order ''' registration_obj = self.pool.get('event.registration') sale_obj = self.pool.get('sale.order') @@ -85,6 +85,6 @@ class sale_order_line(osv.osv): 'event_id': order_line.event_id.id, } registration_id = registration_obj.create(cr, uid, dic, context=context) - message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name) + message = _("The registration %s has been created from the Sales Order %s.") % (registration_id, order_line.order_id.name) registration_obj.message_post(cr, uid, [registration_id], body=message, context=context) return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 7474455d6d8..83f96bd71b5 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -124,7 +124,7 @@ class fleet_vehicle_state(osv.Model): _order = 'sequence asc' _columns = { 'name': fields.char('Name', required=True), - 'sequence': fields.integer('Order', help="Used to order the note stages") + 'sequence': fields.integer('Sequence', help="Used to order the note stages") } _sql_constraints = [('fleet_state_name_unique','unique(name)', 'State name already exists')] diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 82ef2aa83f4..54baee5f538 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -379,7 +379,7 @@- Click to create a new interview request related to a personnal evaluation. + Click to create a new interview request related to a personal evaluation.
Interview requests are usually generated automatically by
OpenERP according to an employee's appraisal plan. Each user
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 2c206589ac2..0324388786f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -212,7 +212,7 @@
The top menu bar contains all applications you installed. You can use the Settings menu to install more applications, activate others features or give access to new users.
+The top menu bar contains all applications you installed. You can use the Settings menu to install more applications, activate other features or give access to new users.
To setup your preferences (name, email signature, avatar), click on the top right corner.
]]>For instance, in the property group "Warranty", you an have two properties: 1 year warranty, 3 years warranty. Depending - on the propoerties selected in the sale order, OpenERP will + on the propoerties selected in the sales order, OpenERP will schedule a production using the matching bill of materials.
@@ -121,7 +121,7 @@ materials for manufacturing a product when you have different ways of building the same product. You can assign several properties to each bill of materials. When a salesperson - creates a sale order, they can relate it to several properties + creates a sales order, they can relate it to several properties and OpenERP will automatically select the BoM to use according the needs. @@ -370,7 +370,7 @@- When processing a sale order for this product, the delivery order + When processing a sales order for this product, the delivery order will contain the raw materials, instead of the finished product.
When you sell this service to a customer, a task will be created to follow up the job to do. This task will appear - in the project related to the contract of the sale order. + in the project related to the contract of the sales order.
- Click to create a quotation or sale order for this customer. + Click to create a quotation or sales order for this customer.
OpenERP will help you efficiently handle the complete sale flow: - quotation, sale order, delivery, invoicing and + quotation, sales order, delivery, invoicing and payment.
- The social feature helps you organize discussions on each sale + The social feature helps you organize discussions on each sales order, and allow your customer to keep track of the evolution - of the sale order. + of the sales order.
Click to define a new sale shop.
- Each quotation or sale order must be linked to a shop. The + Each quotation or sales order must be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sales.
@@ -148,7 +148,7 @@- Click to create a quotation that can be converted into a sale + Click to create a quotation that can be converted into a sales order.
OpenERP will help you efficiently handle the complete sales flow: - quotation, sale order, delivery, invoicing and payment. + quotation, sales order, delivery, invoicing and payment.
OpenERP will help you handle efficiently the complete sale flow: - from the quotation to the sale order, the + from the quotation to the sales order, the delivery, the invoicing and the payment collection.
- The social feature helps you organize discussions on each sale + The social feature helps you organize discussions on each sales order, and allow your customers to keep track of the evolution - of the sale order. + of the sales order.