- Send follow-ups
+ Send Follow-Upsir.actions.act_windowaccount.followup.print.allform
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 80d7a5419e7..22b7fc5f6f2 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -87,9 +87,9 @@ class payment_order(osv.osv):
return res
_columns = {
- 'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
+ 'date_scheduled': fields.date('Scheduled Date', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
'reference': fields.char('Reference', size=128, required=1, states={'done': [('readonly', True)]}),
- 'mode': fields.many2one('payment.mode', 'Payment mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'),
+ 'mode': fields.many2one('payment.mode', 'Payment Mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'),
'state': fields.selection([
('draft', 'Draft'),
('cancel', 'Cancelled'),
@@ -98,14 +98,14 @@ class payment_order(osv.osv):
help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
'total': fields.function(_total, string="Total", type='float'),
- 'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}),
+ 'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'done': [('readonly', True)]}),
'date_prefered': fields.selection([
('now', 'Directly'),
('due', 'Due date'),
('fixed', 'Fixed date')
- ], "Preferred date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
- 'date_created': fields.date('Creation date', readonly=True),
- 'date_done': fields.date('Execution date', readonly=True),
+ ], "Preferred Date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
+ 'date_created': fields.date('Creation Date', readonly=True),
+ 'date_done': fields.date('Execution Date', readonly=True),
'company_id': fields.related('mode', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
}
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index cf91dcc80a2..1577d1b86bd 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -112,16 +112,25 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
- Point of Sale
-
-
+ Point of Sale
+
+
+ 150
-
-
-
pos.config.form.viewpos.config
@@ -842,12 +846,12 @@
-
+ domain="[('config_id', '=', active_id)]" />
Point of Sales
@@ -864,8 +868,8 @@
id="menu_pos_config_pos"
groups="group_pos_manager"/>
- pos.session
form
-
-
@@ -650,9 +645,9 @@
-
-
-
+
+
@@ -675,7 +670,7 @@
-
+
account.analytic.account.form.inheritaccount.analytic.account
@@ -687,7 +682,7 @@
-
+
@@ -827,5 +822,6 @@
+
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 3b019e51af6..09170c43434 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -3,35 +3,29 @@
-
- res.partner.crm.history.inherit1
- res.partner
- form
-
-
-
- False
-
-
- res.partner.task.info.inheritres.partnerform
-
-
-
-
-
-
-
-
-
-
-
-
+
+ False
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 4d3d288b981..7208885748c 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -70,7 +70,7 @@
-
+
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 100c60e3f53..ebc7df729b5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,11 +1,13 @@
-
-
+
+
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 94210926075..27318adc0f5 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -11,7 +11,7 @@
-
+
Picking liststock.picking
@@ -38,7 +38,7 @@
-
+
stock.picking.in.search
@@ -89,7 +89,7 @@
{'search_default_purchase_id': active_id,'default_type': 'in'}
-
+
Purchase Picking Inheritedpurchase.order
@@ -105,7 +105,7 @@
-
+
Based on Incoming Shipmentsstock.picking
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.inheritres.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..03a2f35cbbe 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,13 @@
+
-
+
+
+
+
@@ -146,10 +153,10 @@
-
+
-
-
+
+
@@ -171,10 +178,9 @@
-
+
-
@@ -197,7 +203,7 @@
@@ -263,6 +269,8 @@
+
+
@@ -297,7 +305,7 @@
-
+
@@ -569,14 +577,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/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 4696eec6eb2..30c2a0dea14 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,8 +8,13 @@
sale.order
-
-
+
+
+
+
+
+
+
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index 840c33770a7..7397edbec2b 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -70,8 +70,8 @@ class mrp_production(osv.osv):
return res
_columns = {
- 'sale_name': fields.function(_ref_calc, multi='sale_name', type='char', string='Sales Name', help='Indicate the name of sales order.'),
- 'sale_ref': fields.function(_ref_calc, multi='sale_name', type='char', string='Sales Reference', help='Indicate the Customer Reference from sales order.'),
+ 'sale_name': fields.function(_ref_calc, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sales order.'),
+ 'sale_ref': fields.function(_ref_calc, multi='sale_name', type='char', string='Sale Reference', help='Indicate the Customer Reference from sales order.'),
}
mrp_production()
diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml
index fbf2e7a9327..882663680c5 100644
--- a/addons/sale_mrp/sale_mrp_view.xml
+++ b/addons/sale_mrp/sale_mrp_view.xml
@@ -8,10 +8,12 @@
form
-
-
+
+
+
+
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ceed0808ef4..e90a2bb8162 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -2,15 +2,17 @@
-
+
+
+
+ parent="stock.menu_stock_product" sequence="0"/>
@@ -20,19 +22,19 @@
parent="stock.menu_stock_configuration" sequence="45" groups="base.group_no_one"/>
+ parent="stock.menu_product_in_config_stock" sequence="0"/>
-
-
-
+
+ stock.inventory.line.tree
@@ -116,8 +118,8 @@
-
-
+
+
@@ -204,7 +206,7 @@
stock.inventoryform
-
+ Periodical Inventories are used to count the number of products available per location. You can use it once a year when you do the general inventory or whenever you need it, to correct the current stock level of a product.
@@ -275,9 +277,9 @@
child_ids
-
-
-
+
+
+
@@ -291,7 +293,7 @@
-
+
@@ -387,7 +389,7 @@
tree
-
+
@@ -408,7 +410,7 @@
-
+
@@ -426,7 +428,7 @@
stock.production.lotform
-
+ {}This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers.
@@ -444,8 +446,8 @@
move_history_ids
-
-
+
+
@@ -468,8 +470,8 @@
move_history_ids2
-
-
+
+
@@ -569,11 +571,11 @@
+ string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations"/>
+ string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations"/>
+ string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations"/>
@@ -737,7 +739,7 @@
-
+
@@ -782,7 +784,7 @@
string="Split in Serial Number"
groups="stock.group_production_lot"
type="action" icon="terp-stock_effects-object-colorize"
- states="draft,waiting,confirmed,assigned" />
+ states="draft,waiting,confirmed,assigned"/>
-
+
@@ -860,7 +862,7 @@
-
+
@@ -892,7 +894,7 @@
-
+
@@ -907,7 +909,7 @@
-
+
@@ -971,7 +973,7 @@
-
+
@@ -1015,13 +1017,13 @@
-
+
-
+
-
-
+
+
@@ -1088,7 +1090,7 @@
-
+
@@ -1116,23 +1118,23 @@
-
+
-
+
-
+
-
+
-
-
+
+
@@ -1190,7 +1192,7 @@
string="Scrap Products" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned"
- />
+ />