@@ -108,9 +105,9 @@
- Tel. : [[ o.address_invoice_id.phone or '' ]]
+ Tél. : [[ o.address_invoice_id.phone or '' ]]
Fax : [[ o.address_invoice_id.fax or '' ]]
- VAT : [[ o.partner_id.vat or '' ]]
+ TVA : [[ o.partner_id.vat or '' ]]
@@ -155,10 +152,10 @@
Unit Price
- Disc. (%)
+ Disc.
|
- Price
+ Net Price
|
@@ -179,7 +176,7 @@
[[ '%.2f' % l.price_unit ]]
- [[ '%.2f' % (l.discount or 0.0) ]]
+ [[ '%.3f' % (l.discount or 0.0) ]]
|
[[ '%.2f' %l.price_subtotal ]] [[o.currency_id.code ]]
@@ -232,7 +229,7 @@
- Total (excl. taxes):
+ Subtotal :
|
[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]
@@ -240,7 +237,7 @@
|
- Taxes:
+ Taxes :
|
[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]
@@ -248,7 +245,7 @@
|
- Total (incl. taxes):
+ Total :
|
[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index a73f46de677..7804c871086 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -26,7 +26,7 @@
My open tasks
project.task
form
- tree,graph
+ tree,form
[('user_id','=',uid),('state','=','open')]
@@ -34,7 +34,7 @@
My task's deadlines
project.task
form
- tree,graph
+ tree,form
[('user_id','=',uid),('state','=','open'),('date_deadline','<>',False)]
diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml
index b2b78346224..511568e6c55 100644
--- a/addons/board_sale/board_sale_view.xml
+++ b/addons/board_sale/board_sale_view.xml
@@ -65,20 +65,5 @@
sequence="1"
id="menu_board_sales_manager"/>
- //
- // Administrator shortcut
- // Demo user startup menu
- //
-
- Sales dashboard
-
- ir.ui.menu
- 1
-
-
-
-
-
-
diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__terp__.py
index 4ae117b8b42..65c2ed59726 100755
--- a/addons/l10n_ch/__terp__.py
+++ b/addons/l10n_ch/__terp__.py
@@ -15,6 +15,7 @@
"dta/dta_view.xml","dta/dta_wizard.xml",
"v11/v11_wizard.xml","v11/v11_view.xml",
"account_vat.xml","base_config.xml","account_config.xml",
+ "bvr/bvr_report.xml",
"company_view.xml"
],
"active": False,
diff --git a/addons/l10n_ch/bvr/bvr.rml b/addons/l10n_ch/bvr/bvr.rml
index 0dd6d27bacf..ee597155ece 100644
--- a/addons/l10n_ch/bvr/bvr.rml
+++ b/addons/l10n_ch/bvr/bvr.rml
@@ -2,8 +2,8 @@
-
+
diff --git a/addons/report_timesheet/report_timesheet.py b/addons/report_timesheet/report_timesheet.py
index 1216726dbe3..7def167af6c 100644
--- a/addons/report_timesheet/report_timesheet.py
+++ b/addons/report_timesheet/report_timesheet.py
@@ -65,10 +65,10 @@ class report_timesheet_account(osv.osv):
_columns = {
'name': fields.date('Month', readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True, relate=True),
- 'account_id':fields.many2one('account.analytic.account', 'User', readonly=True, relate=True),
+ 'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, relate=True),
'quantity': fields.float('Quantity', readonly=True),
}
- _order = 'name desc,user_id desc'
+ _order = 'name desc,account_id desc,user_id desc'
def init(self, cr):
cr.execute("""
create or replace view report_timesheet_account as (
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index e4dbb578eb6..e0f433d7264 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -62,7 +62,7 @@
report_timesheet.user.tree.all
report_timesheet.user
form
- tree,graph
+ graph,tree
| |