From ec7ae052fe86c5ced3da656efc339f8bfdebb401 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 20 Sep 2012 15:13:28 +0200 Subject: [PATCH] [IMP] sale, sale_stock: fixed __openerp__.py files bzr revid: qdp-launchpad@openerp.com-20120920131328-5nodw9twus3wetqz --- addons/sale/__openerp__.py | 19 +++++++++++++------ addons/sale_stock/__openerp__.py | 12 +----------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index 74bd1194ee4..13f0fb53696 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -29,18 +29,25 @@ Manage sales quotations and orders ================================== -This application allows you to make a sale order, validate it and encode payment without having to deal with anything related to warehouse management. +This application allows you to manage your sales goals in an effective and efficient manner by keeping track of all sales orders and history. -It handles the sales workflow : +It handles the full sales workflow: * **Quotation** -> **Sales order** -> **Invoice** -Preferences +Preferences (only with Warehouse Management installed) ----------- -* Invoicing: choose how invoices will be paid +If you also installed the Warehouse Management, you can deal with the following preferences: + +* Shipping: Choice of delivery at once or partial delivery +* Invoicing: choose how invoices will be paid +* Incoterms: International Commercial terms + +You can choose flexible invoicing methods: -There is one invoicing methods: * *On Demand*: Invoices are created manually from Sales Orders when needed +* *On Delivery Order*: Invoices are generated from picking (delivery) +* *Before Delivery*: A Draft invoice is created and must be paid before delivery The Dashboard for the Sales Manager will include @@ -53,8 +60,8 @@ The Dashboard for the Sales Manager will include 'images': ['images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'], 'depends': ['account_voucher'], 'data': [ - 'wizard/sale_line_invoice.xml', 'wizard/sale_make_invoice_advance.xml', + 'wizard/sale_line_invoice.xml', 'wizard/sale_make_invoice.xml', 'security/sale_security.xml', 'security/ir.model.access.csv', diff --git a/addons/sale_stock/__openerp__.py b/addons/sale_stock/__openerp__.py index bd63184f4c9..2a670000581 100644 --- a/addons/sale_stock/__openerp__.py +++ b/addons/sale_stock/__openerp__.py @@ -28,11 +28,7 @@ Manage sales quotations and orders ================================== -This application allows you to manage your sales goals in an effective and efficient manner by keeping track of all sales orders and history. - -It handles the full sales workflow: - -* **Quotation** -> **Sales order** -> **Invoice** +This module makes the link between the sales and warehouses management applications. Preferences ----------- @@ -45,12 +41,6 @@ You can choose flexible invoicing methods: * *On Demand*: Invoices are created manually from Sales Orders when needed * *On Delivery Order*: Invoices are generated from picking (delivery) * *Before Delivery*: A Draft invoice is created and must be paid before delivery - - -The Dashboard for the Sales Manager will include ------------------------------------------------- -* My Quotations -* Monthly Turnover (Graph) """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com',