diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e59761c3414..e19eec955e4 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -122,16 +122,16 @@
-
+
-
-
+
+
-
+
@@ -338,7 +338,7 @@
-
+
@@ -382,7 +382,7 @@
-
+
@@ -599,14 +599,14 @@
-
+
-
+
@@ -701,23 +701,23 @@
-
-
+
+
-
-
+
+
-
+
-
-
+
+
@@ -728,11 +728,11 @@
-
+
-
+
@@ -754,14 +754,14 @@
-
+
-
+
-
+
-
-
+
+
@@ -780,7 +780,7 @@
-
+
@@ -861,13 +861,13 @@
-
+
@@ -1315,7 +1315,7 @@
-
+
@@ -1328,7 +1328,7 @@
-
+
@@ -1534,7 +1534,7 @@
-
+
@@ -1627,13 +1627,13 @@
-
-
+
+
-
+
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 8af1b79c7cf..494c0f71a48 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -84,23 +84,23 @@
-
-
+
+
-
+
-
+
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index ed5be32a2c1..56008013075 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -296,7 +296,7 @@
-
+
@@ -300,7 +301,7 @@
-
+
@@ -311,10 +312,10 @@
+ />
+ />
-
+
-
-
+
+
@@ -485,11 +486,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -554,9 +555,9 @@
-
-
-
+
+
+
@@ -574,7 +575,7 @@
-
+
@@ -589,7 +590,7 @@
-
+
@@ -639,6 +640,7 @@
diff --git a/addons/crm/report/crm_claim_report_view.xml b/addons/crm/report/crm_claim_report_view.xml
index 465fab740a6..4d544c97711 100644
--- a/addons/crm/report/crm_claim_report_view.xml
+++ b/addons/crm/report/crm_claim_report_view.xml
@@ -10,17 +10,17 @@
tree
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -34,7 +34,7 @@
form
-
+
@@ -67,10 +67,10 @@
search
-
+ expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
+ position='after'>
+
@@ -81,29 +81,30 @@
Claims
crm.claim.report
form
- tree,graph
+ tree,graph
{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}
-
-
- tree
-
-
-
+
+
+ tree
+
+
+
-
-
- graph
-
-
-
+
+
+ graph
+
+
+
-
+
diff --git a/addons/crm/report/crm_fundraising_report_view.xml b/addons/crm/report/crm_fundraising_report_view.xml
index fbc56e6202e..c051ab8dcb8 100644
--- a/addons/crm/report/crm_fundraising_report_view.xml
+++ b/addons/crm/report/crm_fundraising_report_view.xml
@@ -9,14 +9,14 @@
crm.fundraising.report
tree
-
-
-
-
+
+
+
+
-
+
-
+
@@ -36,7 +36,7 @@
form
-
+
@@ -85,23 +85,24 @@
-
-
- tree
-
-
-
+
+
+ tree
+
+
+
-
- graph
-
-
-
+
+ graph
+
+
+
+ action="action_report_crm_fundraising"
+ groups="base.group_extended"
+ id="menu_report_crm_fundraising_tree" parent="base.next_id_64" />
diff --git a/addons/crm/report/crm_helpdesk_report_view.xml b/addons/crm/report/crm_helpdesk_report_view.xml
index ba4e3be7ed2..0852d343c95 100644
--- a/addons/crm/report/crm_helpdesk_report_view.xml
+++ b/addons/crm/report/crm_helpdesk_report_view.xml
@@ -10,18 +10,18 @@
tree
-
-
-
+
+
+
-
-
+
+
-
+
@@ -34,7 +34,7 @@
form
-
+
@@ -59,46 +59,46 @@
-
+
crm.helpdesk.report.select
crm.helpdesk.report
search
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
+ string="Lowest"
+ domain="[('priority','=','5')]"/>
-
+
-
+
-
+
-
+
@@ -137,30 +137,30 @@
+ domain="[]" context="{'group_by':'user_id'}" />
+ domain="[]"
+ context="{'group_by':'company_id'}" />
+ domain="[]"
+ context="{'group_by':'section_id'}" />
+ domain="[]" context="{'group_by':'state'}" />
+ domain="[]"
+ context="{'group_by':'partner_id'}" />
+ domain="[]" context="{'group_by':'month'}" />
+ domain="[]" context="{'group_by':'name'}" />
@@ -179,22 +179,23 @@
-
-
- tree
-
-
-
+
+
+ tree
+
+
+
-
- graph
-
-
-
+
+ graph
+
+
+
+ groups="base.group_extended"
+ id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" />
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 6d96016b8ae..f4b97ad2f14 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -77,6 +77,7 @@ class crm_lead2opportunity(osv.osv_memory):
for this in self.browse(cr, uid, ids, context=context):
new_opportunity_id = opp_obj.create(cr, uid, {
'name': this.name,
+ 'referred': this.referred,
'planned_revenue': this.planned_revenue,
'probability': this.probability,
'partner_id': lead.partner_id and lead.partner_id.id or False ,
@@ -89,7 +90,6 @@ class crm_lead2opportunity(osv.osv_memory):
'phone': lead.phone,
'email_from': lead.email_from
})
-
new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
vals = {
'partner_id': this.partner_id and this.partner_id.id or False,
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index eefd438c368..229b54e09fe 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -1,61 +1,63 @@
-
+
-
+
-
- crm.lead2opportunity.create
- crm.lead2opportunity
- form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Create Opportunity
- ir.actions.act_window
- crm.lead2opportunity
- form
- form
- new
-
+
+ crm.lead2opportunity.create
+ crm.lead2opportunity
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Create Opportunity
+ ir.actions.act_window
+ crm.lead2opportunity
+ form
+ form
+ new
+
- crm.lead2opportunity.partner.form
- crm.lead2opportunity.partner
- form
-
-
+ crm.lead2opportunity.partner.form
+ crm.lead2opportunity.partner
+ form
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 9100aa1fd7f..da91dcd7107 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -161,9 +161,9 @@
-
+
-
+
-
+
@@ -179,7 +179,7 @@
-
+
@@ -190,7 +190,7 @@
-
+
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 11348ccd1f3..4e1e3033a92 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -175,9 +175,8 @@ hr_expense_expense()
class product_product(osv.osv):
_inherit = "product.product"
-
_columns = {
- 'hr_expense_ok': fields.boolean('Can constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
+ 'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
}
product_product()
@@ -234,4 +233,4 @@ class hr_expense_line(osv.osv):
hr_expense_line()
-# 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/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index cd07d8d4fe8..92e4acd7f63 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -282,10 +282,10 @@
-
-
+
+
-
+
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d8f318d148b..6c52c99d081 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -27,7 +27,7 @@
form
-
+
@@ -36,8 +36,8 @@
-
-
+
+
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index ac575a625e4..7e5edca5474 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -193,7 +193,7 @@ class invoice_create(wizard.interface):
_create_form = """
-
+
diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index 9e2d87c55c3..9db13474ee0 100755
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -144,7 +144,7 @@
-
+
@@ -185,4 +185,4 @@
-
\ No newline at end of file
+
diff --git a/addons/l10n_ch/account_invoice.xml b/addons/l10n_ch/account_invoice.xml
index ddce598627c..e6602e686f8 100755
--- a/addons/l10n_ch/account_invoice.xml
+++ b/addons/l10n_ch/account_invoice.xml
@@ -23,7 +23,7 @@
-
@@ -36,10 +36,10 @@
-
-
\ No newline at end of file
+
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9186e693272..3134110f074 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -323,14 +323,17 @@
id="menu_mrp_bom"
parent="menu_mrp_bom"
sequence="50" />-->
-
-
+
+
Bill of Materials Structure
@@ -1034,7 +1037,10 @@
-
+
+
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index 5de7c7be34b..cf66f93f0e4 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -50,8 +50,11 @@
form
graph,tree
-
-
+
+
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index bf903bbf5e1..fccc62edab7 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -70,7 +70,7 @@
-
+
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index e532341d922..9f629ad8a46 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -13,11 +13,11 @@
-
+
-
+
@@ -78,7 +78,7 @@
-
+
@@ -158,11 +158,11 @@
-
-
+
+
-
+
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 4dfa959caf9..c0fc20de128 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -50,7 +50,7 @@
-
+
-
-
+
+
@@ -306,9 +306,9 @@ invoiced
-
-
-
+
+
+
@@ -394,9 +394,9 @@ invoiced
-
-
-
+
+
+
@@ -409,9 +409,9 @@ invoiced
-
-
-
+
+
+
@@ -423,7 +423,7 @@ invoiced
-
+
@@ -460,9 +460,9 @@ invoiced
-
-
-
+
+
+
@@ -475,9 +475,9 @@ invoiced
-
-
-
+
+
+
@@ -489,7 +489,7 @@ invoiced
-
+
@@ -525,12 +525,12 @@ invoiced
form
-
-
+
+
-
-
-
+
+
+
@@ -542,12 +542,12 @@ invoiced
tree
-
-
+
+
-
-
-
+
+
+
@@ -559,7 +559,7 @@ invoiced
-
+
@@ -592,12 +592,12 @@ invoiced
form
-
-
+
+
-
-
-
+
+
+
@@ -609,12 +609,12 @@ invoiced
tree
-
-
+
+
-
-
-
+
+
+
@@ -626,7 +626,7 @@ invoiced
-
+
@@ -677,7 +677,7 @@ invoiced
-
+
@@ -741,12 +741,12 @@ invoiced
-
+
-
+
@@ -756,7 +756,7 @@ invoiced
-
+
@@ -764,7 +764,7 @@ invoiced
-
+
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 19e7bdc13e3..0dcba67b8b3 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -102,7 +102,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -294,7 +294,7 @@
-
+
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 45f3cac0c3d..5784a92ff20 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -16,7 +16,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
@@ -145,8 +145,8 @@
tree
-
-
+
+
@@ -162,11 +162,11 @@
-
+
-
+
-
+
@@ -199,7 +199,7 @@
-
+
@@ -234,7 +234,7 @@
-
+
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 1864c3e9166..0d4685593c3 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -14,7 +14,7 @@
-
+
@@ -127,7 +127,7 @@
-
+
diff --git a/addons/product/product.py b/addons/product/product.py
index 6c3d7ef17b5..b21ebe5ee3a 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -271,7 +271,7 @@ class product_template(osv.osv):
'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True,
help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
'warranty': fields.float('Warranty (months)'),
- 'sale_ok': fields.boolean('Can be sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
+ 'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."),
'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="Default Unit of Measure used for all stock operation."),
@@ -648,7 +648,7 @@ class product_supplierinfo(osv.osv):
'name' : fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade', help="Supplier of this product"),
'product_name': fields.char('Partner Product Name', size=128, help="This partner's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
'product_code': fields.char('Partner Product Code', size=64, help="This partner's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
- 'sequence' : fields.integer('Priority', help="Assigns the priority to the list of product supplier."),
+ 'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
'qty' : fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the default unit of measure."),
'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
'delay' : fields.integer('Delivery Lead Time', required=True, help="Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index d64d192b148..5b8d448ce56 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -42,7 +42,7 @@
-
+
@@ -66,18 +66,18 @@
-
+
-
+
-
-
-
+
+
+
@@ -85,7 +85,7 @@
-
+
@@ -100,8 +100,8 @@
-
-
+
+
@@ -133,9 +133,9 @@
-
-
-
+
+
+
@@ -163,7 +163,7 @@
-
+
@@ -215,7 +215,7 @@
-
+
@@ -383,7 +383,7 @@
tree
-
+
@@ -400,7 +400,7 @@
-
+
@@ -426,7 +426,7 @@
-
+
@@ -451,7 +451,7 @@
tree
-
+
@@ -519,15 +519,15 @@
-
-
-
+
+
+
-
+
@@ -542,8 +542,8 @@
-
-
+
+
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index cc1567afdcb..86f10e46b97 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -25,7 +25,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
@@ -234,7 +234,7 @@
-
+
@@ -246,7 +246,7 @@
widget="float_time"
attrs="{'readonly':[('state','!=','draft')]}"
on_change="onchange_planned(planned_hours, effective_hours)"/>
-
+
@@ -254,7 +254,7 @@
-
+
@@ -304,14 +304,14 @@
-
+
-
+
@@ -571,7 +571,7 @@
-
+
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 6e43f96b1ab..b4ee058433a 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -90,7 +90,7 @@
-
+
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3118c5d5fe1..9bef4427725 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -352,8 +352,7 @@
-
-
+
@@ -432,6 +431,7 @@
+
@@ -447,6 +447,7 @@
- Uninvoiced Lines
+ Lines to Invoice
ir.actions.act_window
sale.order.line
form
tree,form,graph
- {"search_default_uninvoiced":1}
+ {"search_default_uninvoiced":1,"search_default_unshipped":1}
@@ -492,7 +493,7 @@
-
+
diff --git a/addons/smtpclient/smtpclient_view.xml b/addons/smtpclient/smtpclient_view.xml
index eda6bf43ee1..88264eec850 100644
--- a/addons/smtpclient/smtpclient_view.xml
+++ b/addons/smtpclient/smtpclient_view.xml
@@ -84,16 +84,16 @@
-
-
-
+
+
+
-
+
@@ -102,9 +102,9 @@
-
-
-
+
+
+
@@ -131,12 +131,12 @@
-
+
-
+
-
+
@@ -270,7 +270,7 @@
-
+
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index 85a46601479..da1dd27ff14 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -142,6 +142,7 @@ class report_stock_lines_date(osv.osv):
_name = "report.stock.lines.date"
_description = "Dates of Inventories"
_auto = False
+ _order = "date"
_columns = {
'id': fields.integer('Inventory Line Id', readonly=True),
'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
@@ -152,16 +153,13 @@ class report_stock_lines_date(osv.osv):
cr.execute("""
create or replace view report_stock_lines_date as (
select
- min(l.id) as id,
+ p.id as id,
p.id as product_id,
max(s.date) as date
- from
+ from
product_product p
- left outer join
- stock_inventory_line l on (p.id=l.product_id)
- left join stock_inventory s
- on (l.inventory_id=s.id)
- where l.create_date is not null
+ left outer join stock_inventory_line l on (p.id=l.product_id)
+ left join stock_inventory s on (l.inventory_id=s.id)
and s.state = 'done'
group by p.id
)""")
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index ec15f123864..1bf4e675dcd 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -12,7 +12,6 @@
-
@@ -77,8 +76,6 @@
{'full':'1',"search_default_in_location":1}
-
-
stock.report.tracklots.view
stock.report.tracklots
@@ -103,11 +100,6 @@
-
-
+
+ report.stock.lines.date.search
+ report.stock.lines.date
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
report.stock.lines.date.form
report.stock.lines.date
form
-
-
+
+
- Latest Inventories Dates by Product
+ Dates of Latest Inventories by Product
report.stock.lines.date
form
tree,form
@@ -175,6 +189,19 @@
+
+ stock.location.graph
+ stock.location
+ graph
+
+
+
+
+
+
+
+
+
stock.location.tree
stock.location
@@ -193,12 +220,17 @@
Inventory Valuation
stock.location
form
- tree
+ tree,graph
-
+
+
+
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index db5a8695b86..03fb721959b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -176,7 +176,9 @@
-
+
stock.tracking.tree
@@ -338,12 +340,6 @@
-
-