@@ -162,13 +153,13 @@
|
- [[ formatLang(data['form']['date1'],date = True) ]]
+ [[ formatLang(data['form']['date1'],date = True) ]]
|
- [[ formatLang(data['form']['date2'],date = True) ]]
+ [[ formatLang(data['form']['date2'],date = True) ]]
|
- [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]
+ [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]
|
@@ -306,4 +297,4 @@
-
+
\ No newline at end of file
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index 73fdb629f2c..e064ddc148b 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -169,7 +169,7 @@ class crossovered_analytic(report_sxw.rml_parse):
final.append(item)
return final
-report_sxw.report_sxw('report.account.analytic.account.crossovered.analytic', 'account.analytic.account', 'addons/account_analytic_plans/report/crossovered_analytic.rml',parser = crossovered_analytic, header = False)
+report_sxw.report_sxw('report.account.analytic.account.crossovered.analytic', 'account.analytic.account', 'addons/account_analytic_plans/report/crossovered_analytic.rml',parser = crossovered_analytic, header='internal')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml
index df4334d03dd..62e85dd2dad 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.rml
+++ b/addons/account_analytic_plans/report/crossovered_analytic.rml
@@ -10,35 +10,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -57,13 +29,8 @@
-
-
-
-
-
-
+
@@ -83,55 +50,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -142,7 +111,7 @@
-
+
@@ -154,8 +123,8 @@
-
-
+
+
@@ -163,51 +132,65 @@
+
-
- Crossovered Analytic - [[ company.currency_id.name ]]
- [[ company.name ]]
-
+
-
+ Crossovered Analytic
+
+
+
+
|
- From Date
+ From Date
|
- To Date
+ To Date
|
- Printing date
+ Company
+ |
+
+ Currency
+ |
+
+ Printing date
|
-
+
|
- [[ data['form']['date1'] ]]
+ [[ formatLang(data['form']['date1'],date=True) ]]
|
- [[ data['form']['date2'] ]]
+ [[ formatLang(data['form']['date2'],date=True) ]]
|
- [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
+ [[ company.name ]]
+ |
+
+ [[ company.currency_id.name ]]
+ |
+
+ [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] at [[ time.strftime('%H:%M:%S') ]]
|
-
+
- Analytic Account Reference:
-
+ Analytic Account Reference:
+
-
+
|
- Account Name
+ Account Name
|
Code
@@ -223,45 +206,39 @@
|
-
-
-
- [[ repeatIn(ref_lines(data['form']),'a') ]]
-
+ [[ repeatIn(ref_lines(data['form']),'a') ]]
+
|
-
- [[ a['ref_name'] ]]
-
+ [[ a['ref_name'] ]]
|
- [[ a['ref_code'] ]]
+ [[ a['ref_code'] ]]
|
- [[ '%.2f' % a['ref_qty'] ]]
+ [[ formatLang(a['ref_qty']) ]]
|
- [[ '%.2f' % a['ref_amt'] ]]
+ [[ formatLang(a['ref_amt']) ]]
|
100.00%
|
-
-
+
- Analytic Account :
-
+ Analytic Account :
+
-
+
|
- Account Name
+ Account Name
|
Code
@@ -277,27 +254,24 @@
|
-
-
-
- [[ repeatIn(lines(data['form']),'a') ]]
-
+ [[ repeatIn(lines(data['form']),'a') ]]
+
|
[[ a['acc_name'] ]]
|
- [[ a['code'] ]]
+ [[ a['code'] ]]
|
- [[ '%.2f' % a['qty'] ]]
+ [[formatLang(a['qty']) ]]
|
- [[ '%.2f' % a['amt'] ]]
+ [[ formatLang(a['amt']) ]]
|
- [[ '%.2f' % a['perc'] ]]%
+ [[ formatLang(a['perc']) ]]%
|
@@ -305,8 +279,5 @@
-
-
-
-
+
\ No newline at end of file
diff --git a/addons/product/product_report.xml b/addons/product/product_report.xml
index ca4c3f4f356..6135fe64bca 100644
--- a/addons/product/product_report.xml
+++ b/addons/product/product_report.xml
@@ -4,7 +4,7 @@
).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -44,7 +44,8 @@ class product_pricelist(report_sxw.rml_parse):
qtys = 1
for i in range(1,6):
- vals['qty'+str(qtys)] = form['qty'+str(i)]
+ if form['qty'+str(i)]!=0:
+ vals['qty'+str(qtys)] = str(form['qty'+str(i)]) + ' units'
qtys += 1
lst.append(vals)
return lst
diff --git a/addons/product/report/product_pricelist.rml b/addons/product/report/product_pricelist.rml
index 2deef94a319..65d0c671fa8 100644
--- a/addons/product/report/product_pricelist.rml
+++ b/addons/product/report/product_pricelist.rml
@@ -1,6 +1,6 @@
-
+
@@ -62,11 +62,16 @@
+
+
+
+
+
+
-
@@ -125,7 +130,7 @@
- Products Price List
+ Price List
@@ -161,26 +166,26 @@
-
+
|
Description
[[repeatIn(get_titles(data['form']), 'k')]]
|
- [[ k['qty1'] or removeParentNode('para') ]] units
+ [[ (k.has_key('qty1') and k['qty1']) or '' ]]
|
- [[ k['qty2'] or removeParentNode('para') ]] units
+ [[ (k.has_key('qty2') and k['qty2']) or '' ]]
|
- [[ k['qty3'] or removeParentNode('para') ]] units
+ [[ (k.has_key('qty3') and k['qty3']) or '' ]]
|
- [[ k['qty4'] or removeParentNode('para') ]] units
+ [[ (k.has_key('qty4') and k['qty4']) or '' ]]
|
- [[ k['qty5'] or removeParentNode('para') ]] units
+ [[ (k.has_key('qty5') and k['qty5']) or '' ]]
|
@@ -202,26 +207,26 @@
- [[repeatIn(c['products'], 'p')]]
-
+ [[repeatIn(c['products'], 'p')]]
+
|
[[ p['code'] and '[' + p['code'] + '] ' or '' ]] [[ p['name'] ]]
|
- [[ p['qty1'] or removeParentNode('para') ]]
+ [[ (p.has_key('qty1') and p['qty1']) or '' ]]
|
- [[ p['qty2'] or removeParentNode('para') ]]
+ [[ (p.has_key('qty2') and p['qty2']) or '' ]]
|
- [[ p['qty3'] or removeParentNode('para') ]]
+ [[ (p.has_key('qty3') and p['qty3']) or '' ]]
|
- [[ p['qty4'] or removeParentNode('para') ]]
+ [[ (p.has_key('qty4') and p['qty4']) or '' ]]
|
- [[ p['qty5'] or removeParentNode('para') ]]
+ [[ (p.has_key('qty5') and p['qty5']) or '' ]]
|
@@ -229,9 +234,6 @@
-
-
-
\ No newline at end of file
diff --git a/addons/product/wizard/product_price.py b/addons/product/wizard/product_price.py
index efca2fb6cc1..5863f0000b9 100644
--- a/addons/product/wizard/product_price.py
+++ b/addons/product/wizard/product_price.py
@@ -21,11 +21,11 @@
from osv import osv, fields
from tools.translate import _
-
+
class product_price_list(osv.osv_memory):
_name = 'product.price_list'
- _description = 'Product Price List'
+ _description = 'Price List'
_columns = {
'price_list': fields.many2one('product.pricelist', 'PriceList', required=True),
@@ -36,9 +36,9 @@ class product_price_list(osv.osv_memory):
'qty5': fields.integer('Quantity-5'),
}
_defaults = {
- 'qty1': lambda *a: 0,
- 'qty2': lambda *a: 0,
- 'qty3': lambda *a: 0,
+ 'qty1': lambda *a: 1,
+ 'qty2': lambda *a: 5,
+ 'qty3': lambda *a: 10,
'qty4': lambda *a: 0,
'qty5': lambda *a: 0,
}
@@ -58,6 +58,6 @@ class product_price_list(osv.osv_memory):
'report_name': 'product.pricelist',
'datas': datas,
}
-product_price_list()
+product_price_list()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index bd5b06e30a1..91fb931b6fa 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -9,7 +9,7 @@
product.price_list
form
-
@@ -76,14 +75,12 @@
-
-
@@ -218,7 +215,7 @@
-
+
|
Description
@@ -236,13 +233,13 @@
Disc.(%)
|
- Price
+ Price
|
[[repeatIn(o.order_line,'line')]]
-
+
|
[[ line.name ]]
@@ -263,10 +260,7 @@
[[ formatLang(line.discount) ]]
|
- [[ formatLang(line.price_subtotal ) ]]
- |
-
- [[ o.pricelist_id.currency_id.name ]]
+ [[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.code ]]
|
@@ -303,15 +297,10 @@
- |
-
-
-
- |
-
+
|
@@ -322,10 +311,7 @@
Net Total :
|
- [[ formatLang(o.amount_untaxed ) ]]
- |
-
- [[ o.pricelist_id.currency_id.name ]]
+ [[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.code ]]
|
@@ -338,10 +324,7 @@
Taxes :
|
- [[ formatLang(o.amount_tax ) ]]
- |
-
- [[ o.pricelist_id.currency_id.name ]]
+ [[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id.code ]]
|
@@ -354,10 +337,7 @@
Total :
|
- [[ formatLang(o.amount_total ) ]]
- |
-
- [[ o.pricelist_id.currency_id.name ]]
+ [[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.code ]]
|
@@ -380,4 +360,4 @@
-
+
\ No newline at end of file
|