-
-
-
-
+
-
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index f768f293434..547902b4635 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -167,7 +167,7 @@ class purchase_order(osv.osv):
help="Put an address if you want to deliver directly from the supplier to the customer. " \
"Otherwise, keep empty to deliver to your own company."
),
- 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
+ 'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]),
'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index b7116e08445..b5b708119cc 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -40,6 +40,7 @@ class stock_picking(osv.osv):
'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
ondelete='set null', select=True),
}
+
_defaults = {
'purchase_id': False,
}
@@ -133,5 +134,6 @@ class stock_picking_in(osv.osv):
_columns = {
'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
ondelete='set null', select=True),
+ 'warehouse_id': fields.related('purchase_id', 'warehouse_id', type='many2one', relation='stock.warehouse', string='Destination Warehouse'),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index f9d6239e0a5..94210926075 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -7,8 +7,8 @@
form
-
-
+
+
@@ -30,9 +30,12 @@
form
-
+
+
+
+
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index bb5695eac39..11ac318b7a7 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -1,7 +1,24 @@
-
+
+ Quotations and Sales
+ sale.order
+ form
+ tree,form,graph
+ {'search_default_partner_id': active_id}
+
+
+ This customer has no quotation or sale order.
+ Click here to create a new quotation.
+ <p>
+ The "Quotation" is the first step of the Sales flow. Manage your sales from quotation to invoice.
+ <p>
+ You will be able to sell products (manage deliveries) as well as services (create projects).
+
+
+
+
res.partner.kanban.saleorder.inherit
res.partner
@@ -18,6 +35,22 @@
+
+
+ res.partner.view.buttons
+ res.partner
+ form
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 4622577ac3d..9768f606793 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -27,4 +27,28 @@
+
+
+
+ Module sale installed!
+ comment
+ text
+ res.users
+
+ Welcome to OpenERP
+
+ You can click on the top menu Sales to manage your
+ customers, your quotations and sales orders.
+
+ If you need to manage your sales pipeline (leads,
+ opportunities, phonecalls), you can install the CRM module
+ from the Settings top menu.
+
+
+
+
+
+
+
+
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e7420edb910..aa30f023ae8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -171,7 +171,7 @@
-
+
@@ -569,14 +569,6 @@
-
-
form
-
-
+
+
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 5265afb9bff..b4b3772a91a 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -68,4 +68,4 @@ class sale_make_invoice(osv.osv_memory):
sale_make_invoice()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 41871480f45..23245e12a2d 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -274,7 +274,6 @@ class share_wizard(osv.TransientModel):
'name': new_login,
'groups_id': [(6,0,[group_id])],
'share': True,
- 'menu_tips' : False,
'company_id': current_user.company_id.id
}, context)
new_line = { 'user_id': user_id,
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 432b3ce365b..ceed0808ef4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -121,20 +121,16 @@
-
-
-
-
+
+
-
+ -
+
-
-
-
@@ -150,19 +146,27 @@
-
+
+
@@ -331,18 +335,25 @@
form
-
-
+
+
+
-
-
+
@@ -1216,14 +1226,15 @@