From 62cda268febf432ad530899340beb14527e5332a Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 17 Sep 2012 16:06:30 +0200 Subject: [PATCH 1/4] [IMP] invert Save and new, Save and Close bzr revid: fp@tinyerp.com-20120917140630-sxk5cuiaadfc8wn4 --- addons/web/static/src/xml/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index e34f3827dcf..5c58c3a1d3c 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1237,8 +1237,8 @@ - + or From abf3d2bd53c3bdc8e0c8191ab3b1c78c0c36d34b Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 17 Sep 2012 16:47:40 +0200 Subject: [PATCH 2/4] [IMP] product explanation about the business flow bzr revid: fp@tinyerp.com-20120917144740-2hsb04t8dpzxzuue --- addons/mail/data/mail_group_data.xml | 2 +- addons/mrp/mrp_view.xml | 11 +++++++++-- addons/product/product_view.xml | 24 ++++++++++++++++++++++-- addons/project_mrp/project_mrp_view.xml | 11 +++++++++-- addons/purchase/purchase_view.xml | 14 ++++++++++++++ 5 files changed, 55 insertions(+), 7 deletions(-) diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index 53720926a5c..11d0ee7d04b 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -7,7 +7,7 @@ Discussion about best sales practices and deals. - All Employees + Whole Company Discussion about best sales practices and deals. diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index ec66b5692c0..d05893cf778 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -956,9 +956,16 @@ product.product - - + + False + +

+ When you sell this product, OpenERP will trigger a manufacturing + order using the bill of materials assigned to this product. + The delivery order will be ready once the production is done. +

+ diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 13474351744..d04e6f17fe8 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -106,11 +106,31 @@ + - - + +

+ When you sell this service, nothing special will be trigered + to deliver the customer. +

+

+ When you sell this product, OpenERP will use the available inventory + for the delivery order. +
+ If there are not enough quantities available, the delivery order + will wait for new products. You should create others rules + (orderpoints, manual purchase orders) to fulfill the inventory. +

+

+ When you sell this product, a delivery order will be created. + OpenERP will consider that the required quantities are always + available as it's a consumable (the stock on hand may become negative). +

+ + + diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml index ca1e1f893e7..51de9dd5cf3 100644 --- a/addons/project_mrp/project_mrp_view.xml +++ b/addons/project_mrp/project_mrp_view.xml @@ -36,9 +36,16 @@ product.product - - + + False + +

+ 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. +

+ diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 53f27245e7e..796fd1351a9 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -572,6 +572,20 @@ + +

+ When you sell this service to a customer, a draft purchase order + will be created in order to subcontract the job + to + . +

+

+ When you sell this product, OpenERP will trigger a draft + purchase order to buy the required quantities to the supplier. + The delivery order will be ready after having received the + products. +

+ From 091b2d4892444b291d48a3c48e014f05543961d2 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Mon, 17 Sep 2012 16:53:45 +0200 Subject: [PATCH 3/4] [FIX] typo bzr revid: abo@openerp.com-20120917145345-atyfzfq6juls0siu --- addons/event/event_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index e2ff2e67e87..0bf0e9e743b 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -166,7 +166,7 @@