openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00110
[Merge] lp:~openerp-dev/openobject-addons/report_dev into lp:openobject-addons
apa (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/report_dev into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Improved rml reports.
Ref:http://pad.openerp.com/openerp-report
--
https://code.launchpad.net/~openerp-dev/openobject-addons/report_dev/+merge/35375
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/report_dev.
=== modified file 'account/project/report/__init__.py'
--- account/project/report/__init__.py 2010-01-12 09:18:39 +0000
+++ account/project/report/__init__.py 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -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 <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -24,7 +24,6 @@
import inverted_analytic_balance
import cost_ledger
import quantity_cost_ledger
-import analytic_check
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/project/report/analytic_balance.py'
--- account/project/report/analytic_balance.py 2010-08-24 12:37:11 +0000
+++ account/project/report/analytic_balance.py 2010-09-14 08:41:49 +0000
@@ -75,7 +75,7 @@
sum(aal.amount) AS balance, sum(aal.unit_amount) AS quantity \
FROM account_analytic_line AS aal, account_account AS aa \
WHERE (aal.general_account_id=aa.id) \
- AND (aal.account_id IN aal.account_id IN %s)\
+ AND (aal.account_id IN %s)\
AND (date>=%s) AND (date<=%s) AND aa.active \
GROUP BY aal.general_account_id, aa.name, aa.code, aal.code \
ORDER BY aal.code", (tuple(ids), date1, date2))
@@ -101,7 +101,7 @@
self.acc_data_dict[account_id] = ids
else:
ids = self.acc_data_dict[account_id]
-
+
query_params = (tuple(ids), date1, date2)
if option == "credit" :
self.cr.execute("SELECT -sum(amount) FROM account_analytic_line \
=== modified file 'account/project/report/analytic_balance.rml'
--- account/project/report/analytic_balance.rml 2010-08-27 10:49:21 +0000
+++ account/project/report/analytic_balance.rml 2010-09-14 08:41:49 +0000
@@ -3,37 +3,6 @@
<template pageSize="(595.0,842.0)" title="Analytic Balance" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
- <header>
- <pageGraphics>
- <!--logo-->
- <!--<fill color="darkblue"/>-->
- <!--<stroke color="darkblue"/>-->
-
- <!--TITLE COMPANY-->
- <!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
-
- <setFont name="Helvetica-Bold" size="9"/>
-
-
- <!--COL 1-->
- <drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
- <drawRightString x="20cm" y="28.1cm">Analytic Balance - [[ company.currency_id.name ]]</drawRightString>
-
- <!-- Header -->
-
-
- <setFont name="Helvetica" size="9"/>
- <drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
- <drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
- <!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-
-
- <lineMode width="0.7"/>
- <lines>1cm 27.7cm 20cm 27.7cm</lines>
- <setFont name="Helvetica" size="8"/>
-
- </pageGraphics>
- </header>
</pageTemplate>
</template>
<stylesheet>
@@ -41,156 +10,216 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
+ <blockTableStyle id="Table_Header_analytic">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table_Header_Tile">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+ </blockTableStyle>
<blockTableStyle id="Table1">
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,2" stop="1,2"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,3" stop="-1,-1"/>
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table3">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
-
- </blockTableStyle>
- <blockTableStyle id="tbl_content">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
-
- </blockTableStyle>
- <blockTableStyle id="tbl_data">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
- <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="Standard" fontName="Helvetica"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
+ <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_Details" fontName="Helvetica" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_8_right_bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_8_bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
</stylesheet>
- <images/>
<story>
-
- <blockTable colWidths="57.0,280.0,50.0,50.0,50.0,50.0" style="Table1">
- <tr>
- <td>
- <para style="terp_tblheader_Details">Code</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Account Name</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Debit </para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Credit</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Balance</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Quantity</para>
- </td>
- </tr>
-
- <tr>
- <td>
- <para style="terp_tblheader_General">Total</para>
- </td>
- <td></td>
- <td>
- <para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]]</u></para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]]</u></para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]]</u></para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</u></para>
- </td>
- </tr>
+ <blockTable colWidths="482.0" style="Table_Header_analytic">
+ <tr>
+ <td>
+ <para style="terp_header_Centre">Analytic Balance - [[ company.currency_id.name ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_space">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="55.0,221.0,55.0,52.0,60.0,39.0" style="Table_Header_Tile">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Code</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Account Name</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Debit<font face="Helvetica" size="8.0">([[ company.currency_id.name]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Credit(<font face="Helvetica" size="8.0">[[ company.currency_id.name]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Balance<font face="Helvetica" size="8.0">([[ company.currency_id.name]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Quantity</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_2">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="54.0,222.0,56.0,51.0,62.0,38.0" style="Table1">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Total</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_2">
+ <font color="white"> </font>
+ </para>
+ <section>
+ <para style="terp_default_8">[[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]]</para>
+ <blockTable colWidths="55.0,221.0,56.0,50.0,62.0,38.0" style="Table3">
+ <tr>
+ <td>
+ <para style="terp_default_Bold_9">[[ o['code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9">[[ o['complete_name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'debit')) ]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_2">
+ <font color="white"> </font>
+ </para>
+ <section>
+ <para style="terp_default_8">[[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
+ <blockTable colWidths="55.0,222.0,56.0,49.0,63.0,37.0" style="Table2">
+ <tr>
+ <td>
+ <para style="terp_default_9">[[ move_g['code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9">[[ move_g['name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(move_g['debit'])]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(move_g['quantity']) ]]</para>
+ </td>
+ </tr>
</blockTable>
- <section>
- <para style="terp_default_8">[[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]]</para>
- <blockTable colWidths="57.0,280.0,50.0,50.0,50.0,50.0" style="tbl_data">
- <tr>
- <td>
- <para style="terp_default_8_bold">[[ o['code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_8_bold">[[ o['complete_name'] ]]</para>
- </td>
- <td>
- <para style="terp_default_8_right_bold"><u>[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'], 'debit')) ]]</u></para>
- </td>
- <td>
- <para style="terp_default_8_right_bold"><u>[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'], 'credit')) ]]</u></para>
- </td>
- <td>
- <para style="terp_default_8_right_bold"><u>[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]]</u></para>
- </td>
- <td>
- <para style="terp_default_8_right_bold"><u>[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'], 'quantity')) ]]</u></para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="terp_default_8">[[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
- <para style="terp_default_8">[[ move_g['code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_8">[[ move_g['name'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_8">[[ formatLang(move_g['debit'])]]</para>
- </td>
- <td>
- <para style="terp_default_Right_8">[[ formatLang(move_g['credit']) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_8">[[ formatLang(move_g['balance'])]]</para>
- </td>
- <td>
- <para style="terp_default_Right_8">[[ formatLang(move_g['quantity']) ]]</para>
- </td>
- </tr>
- </blockTable>
+ <para style="terp_default_2">
+ <font color="white"> </font>
+ </para>
</section>
- <para style="terp_default_8">
+ <para style="terp_default_2">
<font color="white"> </font>
</para>
+ </section>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ <para style="Standard">
+ <font color="white"> </font>
+ </para>
</story>
</document>
\ No newline at end of file
=== modified file 'account/project/report/analytic_balance.sxw'
Binary files account/project/report/analytic_balance.sxw 2009-11-26 13:54:00 +0000 and account/project/report/analytic_balance.sxw 2010-09-14 08:41:49 +0000 differ
=== removed file 'account/project/report/analytic_check.py'
--- account/project/report/analytic_check.py 2010-08-24 12:37:11 +0000
+++ account/project/report/analytic_check.py 1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# 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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import time
-
-import pooler
-from report import report_sxw
-
-class account_analytic_analytic_check(report_sxw.rml_parse):
- def __init__(self, cr, uid, name, context):
- super(account_analytic_analytic_check, self).__init__(cr, uid, name, context=context)
- self.sum_gen_deb = 0.0
- self.sum_gen_cred = 0.0
- self.sum_ana_deb = 0.0
- self.sum_ana_cred = 0.0
- self.localcontext.update( {
- 'time': time,
- 'lines_p': self._lines_p,
- 'general_debit': self._gen_deb,
- 'general_credit': self._gen_cred,
- 'analytic_debit': self._ana_deb,
- 'analytic_credit': self._ana_cred,
- 'delta_debit': self._delta_deb,
- 'delta_credit': self._delta_cred,
- })
- def _lines_p(self, date1, date2):
- res = []
- acc_obj = self.pool.get('account.account')
-
- for a in acc_obj.read(self.cr, self.uid, self.ids, ['name', 'code']):
- self.cr.execute("SELECT sum(debit), sum(credit) \
- FROM account_move_line \
- WHERE date>=%s AND date<=%s AND state<>'draft' AND account_id = %s", (date1, date2, a['id']))
- (gd, gc) = self.cr.fetchone()
- gd = gd or 0.0
- gc = gc or 0.0
-
- self.cr.execute("SELECT abs(sum(amount)) AS balance \
- FROM account_analytic_line \
- WHERE date>=%s AND date<=%s AND amount<0 AND general_account_id = %s", (date1, date2, a['id']))
- (ad,) = self.cr.fetchone()
- ad = ad or 0.0
- self.cr.execute("SELECT abs(sum(amount)) AS balance \
- FROM account_analytic_line \
- WHERE date>=%s AND date<=%s AND amount>0 AND general_account_id = %s", (date1, date2, a['id']))
- (ac,) = self.cr.fetchone()
- ac = ac or 0.0
-
- res.append({'code': a['code'], 'name': a['name'],
- 'gen_debit': gd,
- 'gen_credit': gc,
- 'ana_debit': ad,
- 'ana_credit': ac,
- 'delta_debit': gd - ad,
- 'delta_credit': gc - ac,})
- self.sum_gen_deb += gd
- self.sum_gen_cred += gc
- self.sum_ana_deb += ad
- self.sum_ana_cred += ac
-
- return res
-
- def _gen_deb(self, date1, date2):
- return self.sum_gen_deb
-
- def _gen_cred(self, date1, date2):
- return self.sum_gen_cred
-
- def _ana_deb(self, date1, date2):
- return self.sum_ana_deb
-
- def _ana_cred(self, date1, date2):
- return self.sum_ana_cred
-
- def _delta_deb(self, date1, date2):
- return (self._gen_deb(date1,date2)-self._ana_deb(date1,date2))
-
- def _delta_cred(self, date1, date2):
- return (self._gen_cred(date1,date2)-self._ana_cred(date1,date2))
-
-report_sxw.report_sxw('report.account.analytic.account.analytic.check', 'account.analytic.account', 'addons/account/project/report/analytic_check.rml',parser=account_analytic_analytic_check, header="internal")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== removed file 'account/project/report/analytic_check.sxw'
Binary files account/project/report/analytic_check.sxw 2009-06-03 13:02:51 +0000 and account/project/report/analytic_check.sxw 1970-01-01 00:00:00 +0000 differ
=== modified file 'account/project/report/cost_ledger.rml'
--- account/project/report/cost_ledger.rml 2010-09-01 10:36:32 +0000
+++ account/project/report/cost_ledger.rml 2010-09-14 08:41:49 +0000
@@ -169,19 +169,19 @@
<blockTable colWidths="63.0,249.0,57.0,57.0,57.0" style="Table_Header_Title">
<tr>
<td>
- <para style="terp_tblheader_Details">Date or Code</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">J.C. or Move name</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Debit </para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Credit</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Balance</para>
+ <para style="terp_tblheader_Details">Date/Code</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">J.C. /Move name</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Debit([[ company.currency_id.code]])</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Credit([[ company.currency_id.code]])</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Balance([[ company.currency_id.code]])</para>
</td>
</tr>
</blockTable>
@@ -199,13 +199,13 @@
</para>
</td>
<td>
- <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
- </td>
- <td>
- <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
- </td>
- <td>
- <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
+ <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -223,13 +223,13 @@
<para style="terp_default_Bold_9">[[ o.complete_name ]]</para>
</td>
<td>
- <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
- </td>
- <td>
- <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
- </td>
- <td>
- <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']))]]</para>
+ <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -247,13 +247,13 @@
<para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
</td>
<td>
- <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]]</para>
- </td>
- <td>
- <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]]</para>
- </td>
- <td>
- <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]]</para>
+ <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -274,13 +274,13 @@
<para style="terp_default_9_Italic">[[ move_a['name'] ]]</para>
</td>
<td>
- <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]]</para>
- </td>
- <td>
- <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]]</para>
- </td>
- <td>
- <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]]</para>
+ <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
=== modified file 'account/project/report/cost_ledger.sxw'
Binary files account/project/report/cost_ledger.sxw 2010-09-01 10:36:32 +0000 and account/project/report/cost_ledger.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'account/project/report/inverted_analytic_balance.rml'
--- account/project/report/inverted_analytic_balance.rml 2010-08-27 10:49:21 +0000
+++ account/project/report/inverted_analytic_balance.rml 2010-09-14 08:41:49 +0000
@@ -84,8 +84,8 @@
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
</stylesheet>
- <images/>
<story>
<blockTable colWidths="539.0" style="Table_Title">
<tr>
@@ -94,10 +94,7 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_space">
- <font color="white"> </font>
- </para>
- <para style="terp_default_space">
+ <para style="Text body">
<font color="white"> </font>
</para>
<blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table_Header_table">
@@ -109,13 +106,13 @@
<para style="terp_tblheader_Details">Name</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Debit</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Credit</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Balance </para>
+ <para style="terp_tblheader_Details_Right">Debit<font face="Helvetica" size="8.0">([[ company.currency_id.code]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Credit<font face="Helvetica" size="8.0">([[ company.currency_id.code]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Balance<font face="Helvetica" size="8.0">([[ company.currency_id.code]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Quantity</para>
@@ -136,22 +133,19 @@
</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_g(objects,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table3">
@@ -163,22 +157,19 @@
<para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(move_g['debit'])]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'])]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(move_g['debit'])]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['quantity']) ]]</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_a(objects,move_g['id'],data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table4">
@@ -190,16 +181,16 @@
<para style="terp_default_9">[[ move_a['complete_name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(move_a['debit']) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(move_a['credit']) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(move_a['balance']) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(move_a['quantity'] or 0.00) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(move_a['debit']) ]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(move_a['credit']) ]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(move_a['quantity']) ]]</para>
</td>
</tr>
</blockTable>
@@ -207,12 +198,6 @@
<font color="white"> </font>
</para>
</section>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
</section>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
</story>
-</document>
+</document>
\ No newline at end of file
=== modified file 'account/project/report/inverted_analytic_balance.sxw'
Binary files account/project/report/inverted_analytic_balance.sxw 2009-06-18 13:15:48 +0000 and account/project/report/inverted_analytic_balance.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'account/project/report/quantity_cost_ledger.rml'
--- account/project/report/quantity_cost_ledger.rml 2010-08-27 10:49:21 +0000
+++ account/project/report/quantity_cost_ledger.rml 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Quantity Cost Ledger" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
</pageTemplate>
@@ -79,16 +79,16 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
+ <paraStyle name="Standard" fontName="Helvetica"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -110,12 +110,12 @@
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_9_Italic" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_9_Italic_Right" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_9_Italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_9_Italic_Right" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Rignt_9_U" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9_Right_U" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
</stylesheet>
- <images/>
<story>
<blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table_Header_Detail">
<tr>
@@ -134,15 +134,6 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
<blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Detail">
<tr>
<td>
@@ -159,13 +150,13 @@
<blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Content">
<tr>
<td>
- <para style="terp_tblheader_General_Centre">[[ formatLang(data['form']['date1'],date = True) ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Centre">[[ formatLang(data['form']['date2'],date = True) ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Centre">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
+ <para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date = True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ formatLang(data['form']['date2'],date = True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
</td>
</tr>
</blockTable>
@@ -175,7 +166,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="82.0,247.0,92.0,60.0" style="Table_Header_Move_Line">
+ <blockTable colWidths="57.0,288.0,77.0,60.0" style="Table_Header_Move_Line">
<tr>
<td>
<para style="terp_tblheader_Details">Code/Date</para>
@@ -191,10 +182,7 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="81.0,249.0,92.0,60.0" style="Table_Final_Total">
+ <blockTable colWidths="57.0,288.0,77.0,60.0" style="Table_Final_Total">
<tr>
<td>
<para style="terp_default_Bold_9">Total:</para>
@@ -214,21 +202,15 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
<section>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="81.0,249.0,92.0,59.0" style="Table_Account_Detail">
+ <blockTable colWidths="58.0,287.0,78.0,59.0" style="Table_Account_Detail">
<tr>
<td>
- <para style="terp_default_Bold_9">[[ o.code ]]<font face="Times-Roman" size="10.0"/></para>
+ <para style="terp_default_Bold_9">[[ o.code ]]<font face="Helvetica" size="10.0"/></para>
</td>
<td>
- <para style="terp_default_Bold_9">[[ o.complete_name ]]<font face="Times-Roman" size="10.0"/></para>
+ <para style="terp_default_Bold_9">[[ o.complete_name ]]<font face="Helvetica" size="10.0"/></para>
</td>
<td>
<para style="terp_default_Bold_9">Max Qty: [[ formatLang (o.quantity_max )]]</para>
@@ -238,15 +220,9 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]</para>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="81.0,342.0,59.0" style="Table_Analytical_Detail">
+ <blockTable colWidths="58.0,365.0,59.0" style="Table_Analytical_Detail">
<tr>
<td>
<para style="terp_default_Bold_9">[[ move_g['code'] ]] </para>
@@ -259,7 +235,7 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="81.0,51.0,290.0,59.0" style="Table_Move_Line_Content">
+ <blockTable colWidths="59.0,32.0,332.0,59.0" style="Table_Move_Line_Content">
<tr>
<td>
<para style="terp_default_9_Italic">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]</para>
@@ -280,15 +256,6 @@
<font color="white"> </font>
</para>
</section>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
</section>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
</story>
-</document>
+</document>
\ No newline at end of file
=== modified file 'account/project/report/quantity_cost_ledger.sxw'
Binary files account/project/report/quantity_cost_ledger.sxw 2009-01-27 09:38:30 +0000 and account/project/report/quantity_cost_ledger.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'account/report/account_balance_sheet.py'
--- account/report/account_balance_sheet.py 2010-08-24 12:37:11 +0000
+++ account/report/account_balance_sheet.py 2010-09-14 08:41:49 +0000
@@ -63,15 +63,15 @@
def sum_dr(self):
if self.res_bl['type'] == 'Net Profit':
self.result_sum_dr += self.res_bl['balance']
- return self.result_sum_dr or 0.0
+ return self.result_sum_dr
def sum_cr(self):
if self.res_bl['type'] == 'Net Loss':
self.result_sum_cr += self.res_bl['balance']
- return self.result_sum_cr or 0.0
+ return self.result_sum_cr
def get_pl_balance(self):
- return self.res_bl or 0.0
+ return self.res_bl
def get_data(self,data):
cr, uid = self.cr, self.uid
=== modified file 'account/report/account_balance_sheet.rml'
--- account/report/account_balance_sheet.rml 2010-09-06 05:58:32 +0000
+++ account/report/account_balance_sheet.rml 2010-09-14 08:41:49 +0000
@@ -65,7 +65,7 @@
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,0" stop="1,-1"/>
@@ -117,7 +117,10 @@
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="-1,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#cccccc" start="0,0" stop="-1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="-1,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
@@ -161,13 +164,6 @@
<para style="Standard">
<font color="white"> </font>
</para>
- <blockTable colWidths="539.0" style="Table_Heading">
- <tr>
- <td>
- <para style="terp_header_Centre">[[ get_company(data) ]]</para>
- </td>
- </tr>
- </blockTable>
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
@@ -245,7 +241,7 @@
<para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@@ -255,7 +251,7 @@
<para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
@@ -280,10 +276,10 @@
<para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('asset'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font></para>
</td>
<td>
- <para style="terp_default_9">[[ a['code'] ]]<font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
+ <para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@@ -293,7 +289,7 @@
<para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
=== modified file 'account/report/account_balance_sheet_horizontal.rml'
--- account/report/account_balance_sheet_horizontal.rml 2010-09-06 05:58:32 +0000
+++ account/report/account_balance_sheet_horizontal.rml 2010-09-14 08:41:49 +0000
@@ -272,7 +272,7 @@
<para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9"><font>[[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
<td>
<para style="terp_default_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code1'] ]]</font></para>
@@ -281,7 +281,7 @@
<para style="terp_default_9"><font color="white">[[ '. '*(a['level1']-1) ]]</font><font>[[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font></para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9"><font>[[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@@ -291,13 +291,13 @@
<para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]]) </para>
</td>
<td>
- <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
<td>
<para style="terp_default_Bold_9">Balance:([[ get_currency(data) ]])</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
=== modified file 'account/report/account_central_journal.rml'
--- account/report/account_central_journal.rml 2010-09-06 05:58:32 +0000
+++ account/report/account_central_journal.rml 2010-09-14 08:41:49 +0000
@@ -3,9 +3,6 @@
<template pageSize="(595.0,842.0)" title="Centralized Journal" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="42.0" width="539" height="758"/>
- <pageGraphics>
-
- </pageGraphics>
</pageTemplate>
</template>
<stylesheet>
@@ -227,9 +224,6 @@
</stylesheet>
<images/>
<story>
- <para style="P9">
- <font color="white"> </font>
- </para>
<para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
<blockTable colWidths="180.0,180.0,180.0" style="Table_header_Content">
<tr>
@@ -239,9 +233,6 @@
<td><para style="terp_header"><font color="white"> </font></para></td>
</tr>
</blockTable>
- <para style="P9">
- <font color="white"> </font>
- </para>
<blockTable colWidths="90.0,80.0,100.0,130.0,100.0" style="Table2">
<tr>
<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
@@ -283,35 +274,35 @@
<para style="P9">
<font color="white"> </font>
</para>
- <blockTable colWidths="50.0,200.0,95.0,92.0,69.0" style="Table_Account_detail_Title">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Account_detail_Title">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details">A/C No.</para></td>
<td><para style="terp_tblheader_Details">Account Name</para></td>
- <td><para style="terp_tblheader_Details_Right">Debit([[ company.currency_id.code]])</para></td>
- <td><para style="terp_tblheader_Details_Right">Credit([[ company.currency_id.code]])</para></td>
- <td><para style="terp_tblheader_Details_Right">Balance([[ company.currency_id.code]])</para></td>
+ <td><para style="terp_tblheader_Details_Right">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="terp_tblheader_Details_Right">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="terp_tblheader_Details_Right">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
</tr>
</blockTable>
- <blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details">A/C No.</para></td>
<td><para style="terp_tblheader_Details">Account Name</para></td>
- <td><para style="terp_tblheader_Details_Right">Debit</para></td>
- <td><para style="terp_tblheader_Details_Right">Credit</para></td>
- <td><para style="terp_tblheader_Details_Right">Balance</para></td>
+ <td><para style="terp_tblheader_Details_Right">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="terp_tblheader_Details_Right">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="terp_tblheader_Details_Right">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="terp_tblheader_Details_Right">Currency</para></td>
</tr>
</blockTable>
- <blockTable colWidths="50.0,200.0,94.0,92.0,69.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
- <td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
+ <td><para style="terp_default_Bold_9">Total<font size="8.0">([[ company.currency_id.code]])</font>:</para></td>
<td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]] [[ company.currency_id.symbol ]]</para></td>
</tr>
</blockTable>
- <blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
<td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@@ -323,7 +314,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
- <blockTable colWidths="50.0,200.0,94.0,92.0,69.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_9">[[ line['code'] ]]</para></td>
<td><para style="terp_default_9">[[ line['name'] ]]</para></td>
@@ -332,7 +323,7 @@
<td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
</tr>
</blockTable>
- <blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_9">[[ line['code'] ]]</para></td>
<td><para style="terp_default_9">[[ line['name'] ]]</para></td>
@@ -342,9 +333,6 @@
<td><para style="terp_default_Right_9">[[ line['currency_id'] and formatLang(line['amount_currency'] or '') ]] [[ line['currency_id'] and line['currency_code'] or '']]</para></td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
</section>
<para style="P9">
<font color="white"> </font>
=== modified file 'account/report/account_central_journal.sxw'
Binary files account/report/account_central_journal.sxw 2010-08-26 09:54:45 +0000 and account/report/account_central_journal.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'account/report/account_general_journal.rml'
--- account/report/account_general_journal.rml 2010-09-06 05:58:32 +0000
+++ account/report/account_general_journal.rml 2010-09-14 08:41:49 +0000
@@ -3,9 +3,6 @@
<template pageSize="(596.0,842.0)" title="General Journal" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="42.0" width="540" height="758"/>
- <pageGraphics>
-
- </pageGraphics>
</pageTemplate>
</template>
<stylesheet>
@@ -268,9 +265,9 @@
<tr>
<td><para style="terp_tblheader_Details">Code</para></td>
<td><para style="terp_tblheader_Details">Journal Name</para></td>
- <td><para style="terp_tblheader_Details_Right">Debit([[ company.currency_id.code]])</para></td>
- <td><para style="terp_tblheader_Details_Right">Credit([[ company.currency_id.code]])</para></td>
- <td><para style="terp_tblheader_Details_Right">Balance([[ company.currency_id.code]])</para></td>
+ <td><para style="terp_tblheader_Details_Right">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="terp_tblheader_Details_Right">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="terp_tblheader_Details_Right">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
</tr>
<tr>
<td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
@@ -284,9 +281,9 @@
<tr>
<td><para style="terp_tblheader_Details">Code</para></td>
<td><para style="terp_tblheader_Details">Journal Name</para></td>
- <td><para style="terp_tblheader_Details_Right">Debit</para></td>
- <td><para style="terp_tblheader_Details_Right">Credit</para></td>
- <td><para style="terp_tblheader_Details_Right">Balance</para></td>
+ <td><para style="terp_tblheader_Details_Right">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="terp_tblheader_Details_Right">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="terp_tblheader_Details_Right">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="terp_tblheader_Details_Right">Currency</para></td>
</tr>
<tr>
=== modified file 'account/report/account_general_ledger.rml'
--- account/report/account_general_ledger.rml 2010-09-03 12:33:25 +0000
+++ account/report/account_general_ledger.rml 2010-09-14 08:41:49 +0000
@@ -141,9 +141,10 @@
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="8.3" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="date" fontName="Helvetica" fontSize="8.3" leading="10" spaceBefore="0.0" spaceAfter="6.0" alignment="CENTER"/>
+ <paraStyle name="date" fontName="Helvetica-Bold" fontSize="8.3" leading="10" spaceBefore="0.0" spaceAfter="6.0" alignment="LEFT"/>
<paraStyle name="P2_content" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="P3b" fontName="Helvetica-Bold" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3_centre" fontName="Helvetica" fontSize="8.3" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Helvetica" fontSize="8.3" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -176,9 +177,6 @@
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
</stylesheet>
<story>
- <para style="P9">
- <font color="white"> </font>
- </para>
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
@@ -186,7 +184,7 @@
</td>
</tr>
</blockTable>
- <para style="P9">
+ <para>
<font color="white"> </font>
</para>
<para>[[ repeatIn(objects, 'a') ]]</para>
@@ -242,13 +240,13 @@
<blockTable colWidths="66.0,124.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
<tr>
<td><para style="date">Date</para></td>
- <td><para style="P3">Partner</para></td>
- <td><para style="P3">Ref</para></td>
- <td><para style="P3">Move</para></td>
- <td><para style="P3">Entry Label</para></td>
- <td><para style="P4">Debit([[ company.currency_id.code]])</para></td>
- <td><para style="P4">Crebit([[ company.currency_id.code]])</para></td>
- <td><para style="P9">Balance([[ company.currency_id.code]])</para></td>
+ <td><para style="P3b">Partner</para></td>
+ <td><para style="P3b">Ref</para></td>
+ <td><para style="P3b">Move</para></td>
+ <td><para style="P3b">Entry Label</para></td>
+ <td><para style="P9b">Debit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P9b">Crebit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P9b">Balance<font size="7.0">([[ company.currency_id.code]])</font></para></td>
</tr>
</blockTable>
<section>
@@ -289,17 +287,17 @@
- <blockTable colWidths="72.0,93.0,65.0,40.0,89.0,49.0,49.0,49.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ <blockTable colWidths="72.0,93.0,65.0,38.0,85.0,49.0,49.0,49.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<tr>
<td><para style="date">Date</para></td>
- <td><para style="P3">Partner</para></td>
- <td><para style="P3">Ref</para></td>
- <td><para style="P3">Move</para></td>
- <td><para style="P3">Entry Label</para></td>
- <td><para style="P4">Debit([[ company.currency_id.code]])</para></td>
- <td><para style="P4">Credit([[ company.currency_id.code]])</para></td>
- <td><para style="P4">Balance([[ company.currency_id.code]])</para></td>
- <td><para style="P4">Currency</para></td>
+ <td><para style="P3b">Partner</para></td>
+ <td><para style="P3b">Ref</para></td>
+ <td><para style="P3b">Move</para></td>
+ <td><para style="P3b">Entry Label</para></td>
+ <td><para style="P9b">Debit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P9b">Credit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P9b">Balance<font size="7.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P9b">Currency</para></td>
</tr>
</blockTable>
<section>
=== modified file 'account/report/account_general_ledger_landscape.rml'
--- account/report/account_general_ledger_landscape.rml 2010-09-03 12:33:25 +0000
+++ account/report/account_general_ledger_landscape.rml 2010-09-14 08:41:49 +0000
@@ -3,9 +3,6 @@
<template pageSize="(1120.5,767.8)" title="General Ledger" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20" >
<pageTemplate id="first">
<frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
- <pageGraphics>
-
- </pageGraphics>
</pageTemplate>
</template>
<stylesheet>
@@ -146,7 +143,9 @@
<paraStyle name="date" fontName="Helvetica-Bold" fontSize="9.0" leading="10" spaceBefore="0.0" spaceAfter="6.0" alignment="CENTER"/>
<paraStyle name="P2_content" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="P3_center" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="P3_content_center" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -179,9 +178,6 @@
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
</stylesheet>
<story>
- <para style="P9">
- <font color="white"> </font>
- </para>
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
@@ -189,9 +185,6 @@
</td>
</tr>
</blockTable>
- <para style="P9">
- <font color="white"> </font>
- </para>
<para>[[ repeatIn(objects, 'a') ]]</para>
<para style="terp_default_8">
@@ -247,7 +240,7 @@
<font color="white"> </font>
</para>
- <blockTable colWidths="66.0,35.0,150.0, 90.0,60.0,330.0,50.0,69.0,72.0,64.0,58.0" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+ <blockTable colWidths="66.0,35.0,150.0, 90.0,60.0,300.0,80.0,69.0,72.0,64.0,58.0" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
<tr>
<td><para style="date">Date</para></td>
<td><para style="P2">JNRL</para></td>
@@ -255,7 +248,7 @@
<td><para style="P2">Ref</para></td>
<td><para style="P2">Move</para></td>
<td><para style="P3">Entry Label</para></td>
- <td><para style="P3">Counterpart</para></td>
+ <td><para style="P3_center">Counterpart</para></td>
<td><para style="P4">Debit([[ company.currency_id.code]])</para></td>
<td><para style="P4">Credit([[ company.currency_id.code]])</para></td>
<td><para style="P4">Balance([[ company.currency_id.code]])</para></td>
@@ -266,10 +259,10 @@
<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
- <blockTable rowHeights="0.65cm" colWidths="66.0,35.0,150.0, 90.0,60.0,330.0,50.0,69.0,72.0,64.0,62.0" style="tbl_content">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+ <blockTable colWidths="66.0,35.0,150.0, 90.0,60.0,300.0,80.0,69.0,72.0,64.0,62.0" style="tbl_content">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
<tr>
<td>
- <blockTable colWidths="404.0,375.0,69.0,72.0,64.0,59.00" style="Table5">
+ <blockTable colWidths="404.0,372.0,69.0,72.0,64.0,59.00" style="Table5">
<tr>
<td><para style="Standard">[[ o.code ]] [[ o.name ]]</para></td>
<td><para style="Standard"></para></td>
@@ -298,7 +291,7 @@
<td><para style="P2_content">[[ line['lref'] ]]</para></td>
<td><para style="P2_content">[[ line['move'] ]]</para></td>
<td><para style="P3_content">[[ line['lname'] ]]</para></td>
- <td><para style="P3_content">[[ strip_name(line['line_corresp'],15) ]]</para></td>
+ <td><para style="P3_content_center">[[ strip_name(line['line_corresp'],15) ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
@@ -308,7 +301,7 @@
</section>
- <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,378.0,50.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,348.0,80.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="P2">Date</para></td>
<td><para style="date">JNRL</para></td>
@@ -316,7 +309,7 @@
<td><para style="P2">Ref</para></td>
<td><para style="P2">Move</para></td>
<td><para style="P3">Entry Label</para></td>
- <td><para style="P3">Counterpart</para></td>
+ <td><para style="P3_center">Counterpart</para></td>
<td><para style="P4">Debit([[ company.currency_id.code]])</para></td>
<td><para style="P4">Credit([[ company.currency_id.code]])</para></td>
<td><para style="P4">Balance([[ company.currency_id.code]])</para></td>
@@ -327,7 +320,7 @@
<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
- <blockTable rowHeights="0.65cm" colWidths="66.0,35.0,166.0,90.0,60.0,378.0,50.0,69.0,72.0,64.0" style="tbl_content">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
+ <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,348.0,80.0,69.0,72.0,64.0" style="tbl_content">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
<tr>
<td>
<blockTable colWidths="405.0,435.0,69.0,72.0,64.0" style="Table5">
@@ -358,7 +351,7 @@
<td><para style="P2_content">[[ line['lref'] ]]</para></td>
<td><para style="P2_content">[[ line['move'] ]]</para></td>
<td><para style="P3_content">[[ line['lname'] ]]</para></td>
- <td><para style="P3_content">[[ strip_name(line['line_corresp'],15) ]]</para></td>
+ <td><para style="P3_content_center">[[ strip_name(line['line_corresp'],15) ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
=== modified file 'account/report/account_journal.rml'
--- account/report/account_journal.rml 2010-09-06 05:58:32 +0000
+++ account/report/account_journal.rml 2010-09-14 08:41:49 +0000
@@ -246,16 +246,16 @@
<para style="P9">
<font color="white"> </font>
</para>
- <blockTable colWidths="40.0,65.0,50.0,62.0,154.0,58.0,60.0,60.0" style="Table1" repeatRows="1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="40.0,65.0,50.0,62.0,152.0,60.0,60.0,60.0" style="Table1" repeatRows="1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="P10a">Date</para></td>
<td><para style="P10">Entry No</para></td>
<td><para style="P10">A/c No.</para></td>
<td><para style="P10a">Partner</para></td>
<td><para style="P10a">Entry label</para></td>
- <td><para style="P10b">Debit([[ company.currency_id.code]])</para></td>
- <td><para style="P10b">Credit([[ company.currency_id.code]])</para></td>
- <td><para style="P10b">Balance([[ company.currency_id.code]])</para></td>
+ <td><para style="P10b">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P10b">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P10b">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
</tr>
<tr>
<td><para style="P11">[[o.period_id.name ]]</para></td>
@@ -281,16 +281,16 @@
</blockTable>
- <blockTable colWidths="50.0,65.0,50.0,60.0,89.0,40.0,60.0,50.0,60.0" style="Table1" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,65.0,50.0,60.0,69.0,60.0,60.0,60.0,50.0" style="Table1" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="P10a">Date</para></td>
<td><para style="P10">Entry No</para></td>
<td><para style="P10">A/c No.</para></td>
<td><para style="P10a">Partner</para></td>
<td><para style="P10a">Entry label</para></td>
- <td><para style="P10b">Debit([[ company.currency_id.code]])</para></td>
- <td><para style="P10b">Credit([[ company.currency_id.code]])</para></td>
- <td><para style="P10b">Balance([[ company.currency_id.code]])</para></td>
+ <td><para style="P10b">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P10b">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P10b">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
<td><para style="P10b">Currency</para></td>
</tr>
<tr>
=== modified file 'account/report/account_partner_balance.rml'
--- account/report/account_partner_balance.rml 2010-09-06 05:58:32 +0000
+++ account/report/account_partner_balance.rml 2010-09-14 08:41:49 +0000
@@ -151,7 +151,7 @@
<paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10"/>
<paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P12b" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -172,12 +172,6 @@
<story>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
@@ -233,17 +227,17 @@
<font color="white"> </font>
</para>
<para style="P12a"></para>
- <blockTable colWidths="61.0,206.0,69.0,68.0,69.0,68.0" repeatRows="1" style="Table2">
+ <blockTable colWidths="80.0,170.0,70.0,70.0,70.0,80.0" repeatRows="1" style="Table2">
<tr>
<td><para style="P12a">Code</para></td>
<td><para style="P12a">(Account/Partner) Name</para></td>
- <td><para style="P12b">Debit([[ company.currency_id.code]])</para></td>
- <td><para style="P12b">Credi([[ company.currency_id.code]])</para></td>
- <td><para style="P12b">Balance([[ company.currency_id.code]])</para></td>
- <td><para style="P12b">In dispute([[ company.currency_id.code]])</para></td>
+ <td><para style="P12b">Debit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P12b">Credit<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P12b">Balance<font size="8.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P12a">In dispute<font size="8.0">([[ company.currency_id.code]])</font></para></td>
</tr>
<tr>
- <td><para style="P7">Grand total([[ company.currency_id.code]])</para></td>
+ <td><para style="P7">Total<font size="8.0">([[ company.currency_id.code]]) :</font></para></td>
<td><para style="P8"></para></td>
<td><para style="P8"><u>[[ formatLang(sum_debit()) ]] [[ company.currency_id.symbol ]]</u></para></td>
<td><para style="P8"><u>[[ formatLang(sum_credit()) ]] [[ company.currency_id.symbol ]]</u></para></td>
@@ -251,7 +245,7 @@
<td><para style="P8"><u>[[ formatLang(sum_litige()) ]] [[ company.currency_id.symbol ]]</u></para></td>
</tr>
<tr>
- <td><para style="P7">Balance([[ company.currency_id.code]])</para></td>
+ <td><para style="P7">Balance<font size="8.0">([[ company.currency_id.code]]) :</font></para></td>
<td><para style="P8"></para></td>
<td><para style="P8">[[ formatLang(solde_debit()) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P8">[[ formatLang(solde_credit()) ]] [[ company.currency_id.symbol ]]</para></td>
@@ -261,10 +255,10 @@
<tr>
<td><para style="P3">[[ repeatIn(lines(), 'a') ]]<font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para></td>
<td><para style="P3"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para></td>
- <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['debit']) ]]</para></td>
- <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['credit']) ]]</para></td>
- <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['balance']) ]]</para></td>
- <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['enlitige'] or 0.00) ]]</para></td>
+ <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+ <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['credit']) ]] [[ company.currency_id.symbol ]]</para></td>
+ <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</para></td>
+ <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['enlitige'] or 0.0) ]] [[ company.currency_id.symbol ]]</para></td>
</tr>
</blockTable>
</story>
=== modified file 'account/report/account_partner_ledger.rml'
--- account/report/account_partner_ledger.rml 2010-09-06 05:58:32 +0000
+++ account/report/account_partner_ledger.rml 2010-09-14 08:41:49 +0000
@@ -304,13 +304,13 @@
<para style="terp_default_Bold_9">Balance Brought Forward</para>
</td>
<td>
- <para style="P5"><u>[[ formatLang((sum_debit())) ]]</u></para>
- </td>
- <td>
- <para style="P5"><u>[[ formatLang((sum_credit())) ]]</u></para>
- </td>
- <td>
- <para style="P5"><u>[[ formatLang((sum_debit() - sum_credit())) ]]</u></para>
+ <para style="P5"><u>[[ formatLang((sum_debit())) ]] [[ company.currency_id.symbol ]]</u></para>
+ </td>
+ <td>
+ <para style="P5"><u>[[ formatLang((sum_credit())) ]] [[ company.currency_id.symbol ]]</u></para>
+ </td>
+ <td>
+ <para style="P5"><u>[[ formatLang((sum_debit() - sum_credit())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
@@ -324,13 +324,13 @@
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
</td>
<td>
- <para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
- </td>
- <td>
- <para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
- </td>
- <td>
- <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]]</para>
+ <para style="P5">[[ formatLang((sum_debit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ formatLang((sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@@ -338,13 +338,13 @@
<para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ get_intial_balance(p)[0][0] or 0.0 ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ get_intial_balance(p)[0][1] or 0.0 ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ get_intial_balance(p)[0][2] or 0.0 ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -368,13 +368,13 @@
<para style="P3">[[ line['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -382,10 +382,10 @@
<font color="white"> </font>
</para>
</section>
- <blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+ <blockTable colWidths="57.0,25.0,40.0,154.0,66.0,68.0,68.0,60.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
- <para style="terp_tblheader_Details">Date</para>
+ <para style="terp_tblheader_Details">Datefff</para>
</td>
<td>
<para style="terp_tblheader_Details">JNRL</para>
@@ -403,10 +403,10 @@
<para style="terp_tblheader_Details_Right">Credit([[ get_currency(data) ]])</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Balance ([[ get_currency(data) ]])</para>
+ <para style="terp_tblheader_Details_Right">Balance([[ get_currency(data) ]])</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Currency ([[ get_currency(data) ]])</para>
+ <para style="terp_tblheader_Details_Right">Currency</para>
</td>
</tr>
</blockTable>
@@ -419,13 +419,13 @@
<para style="terp_default_Bold_9">Balance Brought Forward</para>
</td>
<td>
- <para style="P5"><u>[[ formatLang((sum_debit())) ]]</u></para>
- </td>
- <td>
- <para style="P5"><u>[[ formatLang((sum_credit())) ]]</u></para>
- </td>
- <td>
- <para style="P5"><u>[[ formatLang((sum_debit() - sum_credit())) ]]</u></para>
+ <para style="P5"><u>[[ formatLang((sum_debit())) ]] [[ company.currency_id.symbol ]]</u></para>
+ </td>
+ <td>
+ <para style="P5"><u>[[ formatLang((sum_credit())) ]] [[ company.currency_id.symbol ]]</u></para>
+ </td>
+ <td>
+ <para style="P5"><u>[[ formatLang((sum_debit() - sum_credit())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
<td>
</td>
@@ -441,13 +441,13 @@
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
</td>
<td>
- <para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
- </td>
- <td>
- <para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
- </td>
- <td>
- <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]]</para>
+ <para style="P5">[[ formatLang((sum_debit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ formatLang((sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">
@@ -460,13 +460,13 @@
<para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ get_intial_balance(p)[0][0] or 0.0 ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ get_intial_balance(p)[0][1] or 0.0 ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ get_intial_balance(p)[0][2] or 0.0 ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0]) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5"></para>
@@ -493,13 +493,13 @@
<para style="P3">[[ line['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]</para>
=== modified file 'account/report/account_partner_ledger_other.rml'
--- account/report/account_partner_ledger_other.rml 2010-08-26 08:39:22 +0000
+++ account/report/account_partner_ledger_other.rml 2010-09-14 08:41:49 +0000
@@ -324,12 +324,6 @@
<images/>
</stylesheet>
<story>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
<blockTable colWidths="539.0" style="Table_header">
<tr>
<td>
@@ -462,13 +456,13 @@
<para style="terp_default_Bold_9">Balance Brought Forward</para>
</td>
<td>
- <para style="P5">[[ formatLang((sum_debit())) ]]</para>
- </td>
- <td>
- <para style="P5">[[ formatLang((sum_credit())) ]]</para>
- </td>
- <td>
- <para style="P5">[[ formatLang((sum_debit() - sum_credit())) ]]</para>
+ <para style="P5">[[ formatLang((sum_debit())) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ formatLang((sum_credit())) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ formatLang((sum_debit() - sum_credit())) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -482,13 +476,13 @@
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
</td>
<td>
- <para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
- </td>
- <td>
- <para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
- </td>
- <td>
- <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]]</para>
+ <para style="P5">[[ formatLang((sum_debit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ formatLang((sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@@ -496,13 +490,13 @@
<para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ get_intial_balance(p)[0][0] or 0.0 ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ get_intial_balance(p)[0][1] or 0.0 ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ get_intial_balance(p)[0][2] or 0.0 ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -523,13 +517,13 @@
<para style="P3">[[ line['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -559,7 +553,7 @@
<para style="terp_tblheader_Details_Right">Balance([[ get_currency(data) ]])</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Currency ([[ get_currency(data) ]])</para>
+ <para style="terp_tblheader_Details_Right">Currency</para>
</td>
</tr>
</blockTable>
@@ -570,13 +564,13 @@
<para style="terp_default_Bold_9">Balance Brought Forward</para>
</td>
<td>
- <para style="P5">[[ formatLang((sum_debit())) ]]</para>
- </td>
- <td>
- <para style="P5">[[ formatLang((sum_credit())) ]]</para>
- </td>
- <td>
- <para style="P5">[[ formatLang((sum_debit() - sum_credit())) ]]</para>
+ <para style="P5">[[ formatLang((sum_debit())) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ formatLang((sum_credit())) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ formatLang((sum_debit() - sum_credit())) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">
@@ -594,13 +588,13 @@
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
</td>
<td>
- <para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
- </td>
- <td>
- <para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
- </td>
- <td>
- <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]]</para>
+ <para style="P5">[[ formatLang((sum_debit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ formatLang((sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="P5">
@@ -613,13 +607,13 @@
<para style="terp_default_Centre_9" leftIndent="35.0">Initial Balance</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ get_intial_balance(p)[0][0] or 0.0 ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ get_intial_balance(p)[0][1] or 0.0 ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ get_intial_balance(p)[0][2] or 0.0 ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0]) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9"></para>
@@ -643,13 +637,13 @@
<para style="P3">[[ line['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]</para>
=== modified file 'account/report/account_profit_horizontal.rml'
--- account/report/account_profit_horizontal.rml 2010-09-13 16:26:41 +0000
+++ account/report/account_profit_horizontal.rml 2010-09-14 08:41:49 +0000
@@ -274,7 +274,7 @@
</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
<td>
<para style="terp_default_9">
@@ -287,7 +287,7 @@
</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@@ -300,7 +300,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Bold_9"></para>
@@ -309,7 +309,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -320,13 +320,13 @@
<para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]] [[ company.currency_id.code]] )</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
<td>
<para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]] [[ company.currency_id.code]])</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
=== modified file 'account/report/account_profit_loss.py'
--- account/report/account_profit_loss.py 2010-08-24 12:37:11 +0000
+++ account/report/account_profit_loss.py 2010-09-14 08:41:49 +0000
@@ -63,12 +63,12 @@
def sum_dr(self):
if self.res_pl['type'] == 'Net Profit C.F.B.L.':
self.result_sum_dr += self.res_pl['balance']
- return self.result_sum_dr or 0.0
+ return self.result_sum_dr
def sum_cr(self):
if self.res_pl['type'] == 'Net Loss C.F.B.L.':
self.result_sum_cr += self.res_pl['balance']
- return self.result_sum_cr or 0.0
+ return self.result_sum_cr
def get_data(self, data):
cr, uid = self.cr, self.uid
=== modified file 'account/report/account_profit_loss.rml'
--- account/report/account_profit_loss.rml 2010-09-13 16:26:41 +0000
+++ account/report/account_profit_loss.rml 2010-09-14 08:41:49 +0000
@@ -185,9 +185,6 @@
</stylesheet>
<images/>
<story>
- <para style="terp_header_Centre">
- <font color="white"> </font>
- </para>
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
@@ -267,7 +264,7 @@
</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9"><font>[[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@@ -280,7 +277,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -290,7 +287,7 @@
<para style="terp_default_Bold_9">Total:([[ get_currency(data) ]])</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
@@ -322,7 +319,7 @@
</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9"><font>[[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@@ -335,7 +332,7 @@
<para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -345,7 +342,7 @@
<para style="terp_default_Bold_9">Total:([[ get_currency(data) ]])</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] [[ company.currency_id.symbol ]]</u></para>
+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
=== modified file 'account/report/compare_account_balance.rml'
--- account/report/compare_account_balance.rml 2010-08-27 10:49:21 +0000
+++ account/report/compare_account_balance.rml 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Account Balance" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
</pageTemplate>
@@ -23,12 +23,12 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
- <blockBackground colorName="#b3b3b3" start="0,0" stop="0,-1"/>
- <blockBackground colorName="#b3b3b3" start="1,0" stop="1,-1"/>
- <blockBackground colorName="#b3b3b3" start="2,0" stop="2,-1"/>
- <blockBackground colorName="#b3b3b3" start="3,0" stop="3,-1"/>
- <blockBackground colorName="#b3b3b3" start="4,0" stop="4,-1"/>
- <blockBackground colorName="#b3b3b3" start="5,0" stop="5,-1"/>
+ <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+ <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+ <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+ <blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
+ <blockBackground colorName="#ffffff" start="4,0" stop="4,-1"/>
+ <blockBackground colorName="#ffffff" start="5,0" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
@@ -37,10 +37,10 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
- <blockBackground colorName="#b3b3b3" start="0,0" stop="0,-1"/>
- <blockBackground colorName="#b3b3b3" start="1,0" stop="1,-1"/>
- <blockBackground colorName="#b3b3b3" start="2,0" stop="2,-1"/>
- <blockBackground colorName="#b3b3b3" start="3,0" stop="3,-1"/>
+ <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+ <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+ <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+ <blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
@@ -93,48 +93,35 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
- <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
- <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
- <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
- <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
- <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
+ <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+ <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+ <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+ <blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
+ <blockBackground colorName="#ffffff" start="4,0" stop="4,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Standard" fontName="Helvetica"/>
+ <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Table Contents" fontName="Times-Roman"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
+ <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
</stylesheet>
- <images/>
<story>
<para style="terp_default_8">[[ repeatIn(get_years(data['form']), 'y') ]]</para>
<blockTable colWidths="482.0" style="Table_Tiltle">
@@ -144,11 +131,8 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_space">
- <font color="white"> </font>
- </para>
<para style="terp_header">Year : [[ y['year'] ]]</para>
- <blockTable colWidths="57.0,134.0,51.0,62.0,67.0,111.0" style="Table_header_account">
+ <blockTable colWidths="57.0,214.0,54.0,46.0,57.0,52.0" style="Table_header_account">
<tr>
<td>
<para style="terp_tblheader_Details">[[ data['form']['show_columns'] and 'Code' or removeParentNode('blockTable') ]]</para>
@@ -157,7 +141,7 @@
<para style="terp_tblheader_Details">Account Name </para>
</td>
<td>
- <para style="terp_tblheader_Details"><font>[[ data['form']['compare_pattern']!='none' and "C.S.Y.T.(C./P)" or removeParentNode('font') ]]</font></para>
+ <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('para') ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit</para>
@@ -166,123 +150,107 @@
<para style="terp_tblheader_Details_Right">Credit</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Balance</para>
+ <para style="terp_tblheader_Details_Right">Balance</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="56.0,134.0,50.0,240.0" style="Table1">
+ <blockTable colWidths="56.0,315.0,56.0,53.0" style="Table1">
<tr>
<td>
- <para style="terp_tblheader_Details">[[ data['form']['show_columns'] and removeParentNode('blockTable') or 'Code' ]]</para>
+ <para style="terp_tblheader_Details">[[ (data['form']['show_columns'] and removeParentNode('blockTable')) or 'Code' ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">Account Name </para>
</td>
<td>
- <para style="terp_tblheader_Details"><font>[[ data['form']['compare_pattern']!='none' and "C.S.Y.T.(C./P)" or removeParentNode('font') ]]</font></para>
+ <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('para') ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Balance</para>
+ <para style="terp_tblheader_Details_Right">Balance</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
<section>
<para style="terp_default_8">[[ repeatIn(get_lines(y,data['form']), 'a') ]]</para>
- <blockTable colWidths="56.0,134.0,51.0,61.0,69.0,110.0" style="Table4">
- <tr>
- <td>
- <para style="terp_default_9">[[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
- </td>
- <td>
- <para style="terp_default_9">[[ a['pattern'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['debit'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['credit'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="56.0,134.0,52.0,61.0,69.0,74.0,36.0" style="Table2">
- <tr>
- <td>
- <para style="terp_default_9">[[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
- </td>
- <td>
- <para style="terp_default_9">[[ a['pattern'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['debit'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['credit'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['balance_perc'] ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2"/>
- <blockTable colWidths="55.0,135.0,113.0,178.0" style="Table6">
- <tr>
- <td>
- <para style="terp_default_9">[[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
- </td>
- <td>
- <para style="terp_default_9">[[ a['pattern'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
+ <blockTable colWidths="56.0,208.0,58.0,49.0,55.0,54.0" style="Table4">
+ <tr>
+ <td>
+ <para style="terp_default_9">[[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] <font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font face="Helvetica" color="white">[['...'*(a['level']-1) ]]</font> <font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['pattern'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['debit'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['credit'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="56.0,153.0,55.0,54.0,54.0,56.0,54.0" style="Table2">
+ <tr>
+ <td>
+ <para style="terp_default_9">[[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] <font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font face="Helvetica" color="white">[['...'*(a['level']-1) ]]</font> <font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['pattern'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['debit'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['credit'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance_perc'] ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="55.0,154.0,218.0,54.0" style="Table6">
+ <tr>
+ <td>
+ <para style="terp_default_9">[[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] <font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font face="Helvetica" color="white">[['...'*(a['level']-1) ]]</font> <font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['pattern'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]]</para>
+ </td>
+ </tr>
+ </blockTable>
<blockTable colWidths="54.0,135.0,113.0,130.0,49.0" style="Table5">
<tr>
<td>
- <para style="terp_default_9">[[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
- </td>
- <td>
- <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
- </td>
- <td>
- <para style="terp_default_9">[[ a['pattern'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['balance_perc'] ]]</para>
+ <para style="terp_default_9">[[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]]<font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font> [[ a['code'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font face="Helvetica" color="white">[['...'*(a['level']-1) ]]</font> <font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['pattern'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance_perc'] ]]</para>
</td>
</tr>
</blockTable>
@@ -290,10 +258,7 @@
<font color="white"> </font>
</para>
</section>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="52.0,189.0,61.0,69.0,110.0" style="Table3">
+ <blockTable colWidths="54.0,135.0,113.0,130.0,49.0" style="Table3">
<tr>
<td>
<para style="terp_default_9">[[ not data['form']['show_columns'] and removeParentNode('blockTable') ]] </para>
@@ -319,4 +284,4 @@
</para>
<para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and "C.S.Y.T.(C./P) : Compare Selected Years In Terms of Cash/Perc" or removeParentNode('font') ]]</para>
</story>
-</document>
+</document>
\ No newline at end of file
=== modified file 'account/report/compare_account_balance.sxw'
Binary files account/report/compare_account_balance.sxw 2010-06-25 08:46:21 +0000 and account/report/compare_account_balance.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'account/report/invoice.rml'
--- account/report/invoice.rml 2010-09-03 05:28:48 +0000
+++ account/report/invoice.rml 2010-09-14 08:41:49 +0000
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
+<document filename="Invoice.pdf">
<template pageSize="(595.0,842.0)" title="Invoice" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
@@ -42,7 +42,7 @@
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table_Header_Invoice_Line">
+ <blockTableStyle id="Table7">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -52,7 +52,7 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table_Invoice_Line_Content">
+ <blockTableStyle id="Table8">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -62,93 +62,28 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table_Format_2">
+ <blockTableStyle id="Table10">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#ffffff" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#ffffff" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="0,1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#ffffff" start="1,1" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,1" stop="1,1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="0,2"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,4" stop="0,4"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,4" stop="1,4"/>
- </blockTableStyle>
- <blockTableStyle id="Table_format_Table_Line_total">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#ffffff" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table_eclu_Taxes_Total">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Taxes_Total">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Total_Include_Taxes">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
- </blockTableStyle>
- <blockTableStyle id="Table4">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table6">
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table9">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table5">
+ <blockTableStyle id="Table11">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table3">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table2">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table1">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
@@ -240,7 +175,7 @@
<blockTable colWidths="177.0,177.0,177.0" style="Table_General_Detail_Content">
<tr>
<td>
- <para style="terp_default_Centre_9">[[ o.name or ' ' ]]</para>
+ <para style="terp_default_Centre_9">[[ o.name or ' ' ]]<font color="white"> </font></para>
</td>
<td>
<para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
@@ -253,13 +188,13 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="211.0,74.0,62.0,59.0,51.0,68.0" style="Table_Header_Invoice_Line">
+ <blockTable colWidths="219.0,87.0,56.0,56.0,51.0,62.0" style="Table7">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
</td>
<td>
- <para style="terp_tblheader_Details">Taxes</para>
+ <para style="terp_tblheader_Details_Centre">Taxes</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Quantity</para>
@@ -271,19 +206,19 @@
<para style="terp_tblheader_Details_Right">Disc.(%)</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Price</para>
+ <para style="terp_tblheader_Details_Centre">Price([[ o.currency_id.code ]])</para>
</td>
</tr>
</blockTable>
<section>
- <para style="terp_default_8">[[ repeatIn(o.invoice_line,'l') ]]</para>
- <blockTable colWidths="211.0,70.0,60.0,58.0,49.0,74.0" style="Table_Invoice_Line_Content">
+ <para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para>
+ <blockTable colWidths="218.0,88.0,56.0,56.0,51.0,62.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">[[ l.name ]]</para>
</td>
<td>
- <para style="terp_default_9">[[ ', '.join([ lt.name or '' for lt in l.invoice_line_tax_id ]) ]]</para>
+ <para style="terp_default_Centre_9">[[ ', '.join([ lt.name or '' for lt in l.invoice_line_tax_id ]) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(l.quantity)]] [[ (l.uos_id and l.uos_id.name) or '' ]]</para>
@@ -301,157 +236,130 @@
<tr>
<td>
<para style="terp_default_Note">[[ format(l.note or '') or removeParentNode('tr') ]]</para>
- <para style="terp_default_Note">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Note">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Note">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Note">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Note">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Note">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- </section>
- <blockTable colWidths="370.0,153.0" style="Table_Format_2">
- <tr>
- <td>
- <blockTable colWidths="176.0,258.0" style="Table_format_Table_Line_total">
- <tr>
- <td>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- </td>
- <td>
- <blockTable colWidths="62.0,84.0" style="Table_eclu_Taxes_Total">
- <tr>
- <td>
- <para style="terp_default_9">Net Total:</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="63.0,84.0" style="Table_Taxes_Total">
- <tr>
- <td>
- <para style="terp_default_9">Taxes:</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="63.0,84.0" style="Table_Total_Include_Taxes">
- <tr>
- <td>
- <para style="terp_default_Bold_9">Total:</para>
- </td>
- <td>
- <para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
- </td>
- </tr>
- </blockTable>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="530.0" style="Table4">
- <tr>
- <td>
- <blockTable colWidths="149.0,55.0,52.0" style="Table6">
- <tr>
- <td>
- <para style="terp_tblheader_Details">Tax</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Base</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Amount</para>
- </td>
- </tr>
- </blockTable>
- </td>
- </tr>
- <tr>
- <td>
- <para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para>
- <blockTable colWidths="149.0,55.0,52.0" style="Table5">
- <tr>
- <td>
- <para style="terp_default_8">[[ t.name ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]</para>
- </td>
- </tr>
- </blockTable>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="530.0" style="Table3">
- <tr>
- <td>
- <para style="terp_default_9">[[ format(o.comment or '') or removeParentNode('blockTable') ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="530.0" style="Table2">
- <tr>
- <td>
- <para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note) or '') or removeParentNode('blockTable') ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="128.0,402.0" style="Table1">
- <tr>
- <td>
- <para style="terp_default_Bold_9">Fiscal Position Remark :</para>
- </td>
- <td>
- <para style="terp_default_9">[[ format((o.fiscal_position and o.fiscal_position.note) or '') or removeParentNode('blockTable') ]]</para>
- </td>
- </tr>
- </blockTable>
-
+ </td>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ <blockTable colWidths="407.0,54.0,69.0" style="Table10">
+ <tr>
+ <td>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">Net Total:</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">Taxes:</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9">Total:</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="Text body"/>
+ <para style="Text body">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="167.0,59.0,56.0,247.0" style="Table9">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Tax</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Base</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Amount</para>
+ </td>
+ <td>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para>
+ <blockTable colWidths="167.0,60.0,55.0,248.0" style="Table11">
+ <tr>
+ <td>
+ <para style="terp_default_8">[[ t.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9">[[ (o.comment and format(o.comment )) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9">[[ (o.payment_term.note and format(o.payment_term and o.payment_term.note)) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9"><font face="Helvetica-Bold">Fiscal Position Remark :</font> [[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('para') ]]</para>
+ </section>
</story>
</document>
\ No newline at end of file
=== modified file 'account/report/invoice.sxw'
Binary files account/report/invoice.sxw 2010-09-03 05:28:48 +0000 and account/report/invoice.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'account/report/overdue.py'
--- account/report/overdue.py 2010-06-16 11:51:39 +0000
+++ account/report/overdue.py 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -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 <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -46,15 +46,18 @@
result = {
'name': False,
'street': False,
+ 'street2': False,
'city' : False,
'zip' : False,
+ 'state_id':False,
'country_id' : False,
}
if adr_id:
result = res_partner_address.read(self.cr, self.uid, [adr_id], context=self.context.copy())
result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False
- return result
-
+ result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False
+ return result
+
res.append(result)
return res
@@ -80,12 +83,12 @@
('state', '<>', 'draft'), ('reconcile_id', '=', False)])
movelines = moveline_obj.browse(self.cr, self.uid, movelines)
return movelines
-
+
def _message(self, obj, company):
company_pool = pooler.get_pool(self.cr.dbname).get('res.company')
- message = company_pool.browse(self.cr, self.uid, company.id, {'lang':obj.lang}).overdue_msg
+ message = company_pool.browse(self.cr, self.uid, company.id, {'lang':obj.lang}).overdue_msg
return message
-
+
report_sxw.report_sxw('report.account.overdue', 'res.partner',
'addons/account/report/overdue.rml', parser=Overdue)
=== modified file 'account/report/overdue.rml'
--- account/report/overdue.rml 2010-09-03 12:45:51 +0000
+++ account/report/overdue.rml 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Overdue" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(595.0,842.0)" title="Overdue Payment" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="42.0" y1="28.0" width="511" height="786"/>
</pageTemplate>
@@ -55,16 +55,16 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
+ <paraStyle name="Standard" fontName="Helvetica"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -96,9 +96,10 @@
</td>
<td>
<para style="terp_default_9">[[ o.name ]]</para>
- <para style="terp_default_9">[[ addr['name'] ]]</para>
<para style="terp_default_9">[[ addr['street'] ]]</para>
+ <para style="terp_default_9">[[ addr['street2'] or removeParentNode('para') ]]</para>
<para style="terp_default_9">[[ addr['zip'] ]] [[ addr['city'] ]]</para>
+ <para style="terp_default_9">[[ addr['state_id'] or removeParentNode('para')]]</para>
<para style="terp_default_9">[[ addr['country_id'] ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
@@ -135,7 +136,7 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
- <blockTable colWidths="56.0,137.0,52.0,72.0,60.0,57.0,56.0,18.0" style="Table1">
+ <blockTable colWidths="56.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -147,16 +148,16 @@
<para style="terp_tblheader_Details_Centre">Ref</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Due date</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Due</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Paid</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Maturity</para>
+ <para style="terp_tblheader_Details_Centre">Maturity date</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Due<font face="Helvetica" size="8.0">([[ company.currency_id.name ]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Paid<font face="Helvetica" size="8.0">([[ company.currency_id.name ]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Maturity<font face="Helvetica" size="8.0">([[ company.currency_id.name ]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Li.</para>
@@ -165,7 +166,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[repeatIn(getLines(o), 'line') ]]</para>
- <blockTable colWidths="56.0,138.0,52.0,73.0,60.0,57.0,56.0,17.0" style="Table3">
+ <blockTable colWidths="56.0,136.0,52.0,71.0,55.0,56.0,66.0,17.0" style="Table3">
<tr>
<td>
<para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
@@ -194,7 +195,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="247.0,72.0,60.0,57.0,56.0,17.0" style="Table2">
+ <blockTable colWidths="247.0,65.0,59.0,56.0,66.0,17.0" style="Table2">
<tr>
<td>
<para style="terp_default_8">
@@ -205,13 +206,13 @@
<para style="terp_default_Bold_9">Sub-Total : </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] </para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] [[ company.currency_id.symbol ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_9">
@@ -229,7 +230,7 @@
<para style="terp_default_Bold_9">Balance : </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_9">
@@ -248,7 +249,7 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_9">Total amount due: [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.name ]].</para>
+ <para style="terp_default_9">Total amount due: [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]].</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
=== modified file 'account/report/overdue.sxw'
Binary files account/report/overdue.sxw 2010-05-10 12:35:10 +0000 and account/report/overdue.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'account/report/tax_report.rml'
--- account/report/tax_report.rml 2010-09-06 05:58:32 +0000
+++ account/report/tax_report.rml 2010-09-14 08:41:49 +0000
@@ -61,7 +61,6 @@
<blockValign value="TOP"/>
- <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Tableau1">
<blockAlignment value="LEFT"/>
@@ -75,7 +74,7 @@
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/>
- <paraStyle name="P2" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="P2" fontName="Helvetica-bold" fontSize="15.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -88,8 +87,8 @@
<paraStyle name="P9b" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="14"/>
- <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.6" spaceAfter="6.0"/>
- <paraStyle name="P12a" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="P12" fontName="Helvetica-bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.6" spaceAfter="6.0"/>
+ <paraStyle name="P12a" fontName="Helvetica-bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P15" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -103,32 +102,21 @@
<paraStyle name="Index" fontName="Helvetica"/>
-
- <blockTableStyle id="TrLevel">
- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
- </blockTableStyle>
-
-
- <paraStyle name="Level"
- fontSize="8.0"
- fontName="Helvetica-Bold"
- />
-
</stylesheet>
<story>
- <para style="P2"><font color="white"> </font></para>
- <blockTable colWidths="347.0,64.0,59.0,71.0" style="Table2" repeatRows="1">
+ <para style="P2">Taxes</para>
+ <blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1">
<tr>
<td><para style="P12">Tax Name</para></td>
- <td><para style="P12a">Debit([[ company.currency_id.code]])</para></td>
- <td><para style="P12a">Credit([[ company.currency_id.code]])</para></td>
- <td><para style="P12a">Tax Amount([[ company.currency_id.code]])</para></td>
+ <td><para style="P12a">Debit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P12a">Credit<font size="7.0">([[ company.currency_id.code]])</font></para></td>
+ <td><para style="P12a">Tax Amount<font size="7.0">([[ company.currency_id.code]])</font></para></td>
</tr>
<tr>
- <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))]]</font><font>[[ o['code'] ]] [[ o['name'] ]]</font></para></td>
- <td><para style="P6"><font>[[ (o['level'])>2 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font><font>[[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font></para></td>
- <td><para style="P6"><font>[[ (o['level'])>2 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]]</font><font>[[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]]</font></para></td>
- <td><para style="P6"><font>[[ (o['level'])>2 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]]</font><font>[[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]]</font></para></td>
+ <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))]]</font><font>[[ o['code'] ]] [[ o['name'] ]] </font></para></td>
+ <td><para style="P6"><font>[[ (o['level'])>2 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]] [[ company.currency_id.symbol ]]</font></para></td>
+ <td><para style="P6"><font>[[ (o['level'])>2 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]] [[ company.currency_id.symbol ]]</font></para></td>
+ <td><para style="P6"><font>[[ (o['level'])>2 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font> </para></td>
</tr>
</blockTable>
</story>
=== modified file 'account_analytic_plans/report/crossovered_analytic.rml'
--- account_analytic_plans/report/crossovered_analytic.rml 2010-09-01 10:36:32 +0000
+++ account_analytic_plans/report/crossovered_analytic.rml 2010-09-14 08:41:49 +0000
@@ -99,8 +99,6 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" rightIndent="0.0" leftIndent="-8.0" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P2" rightIndent="0.0" leftIndent="-7.0" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -183,11 +181,11 @@
<para style="terp_header">
<font color="white"> </font>
</para>
- <para style="P1">Analytic Account Reference:</para>
+ <para style="terp_header">Analytic Account Reference:</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="227.0,103.0,75.0,73.0,61.0" style="Table5">
+ <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" style="Table5">
<tr>
<td>
<para style="terp_tblheader_Details">Account Name</para>
@@ -199,7 +197,7 @@
<para style="terp_tblheader_Details_Right">Quantity</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Amount</para>
+ <para style="terp_tblheader_Details_Right">Amount([[ company.currency_id.code]]) </para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Percentage</para>
@@ -208,7 +206,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(ref_lines(data['form']),'a') ]]</para>
- <blockTable colWidths="226.0,103.0,75.0,73.0,61.0" style="Table6">
+ <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">[[ a['ref_name'] ]]</para>
@@ -220,7 +218,7 @@
<para style="terp_default_Right_9">[[ formatLang(a['ref_qty']) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(a['ref_amt']) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(a['ref_amt']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">100.00%</para>
@@ -231,11 +229,11 @@
<para style="terp_header">
<font color="white"> </font>
</para>
- <para style="P2">Analytic Account :</para>
+ <para style="terp_header">Analytic Account :</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="226.0,103.0,77.0,72.0,61.0" repeatRows="1" style="Table3">
+ <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" repeatRows="1" style="Table3">
<tr>
<td>
<para style="terp_tblheader_Details">Account Name</para>
@@ -247,7 +245,7 @@
<para style="terp_tblheader_Details_Right">Quantity</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Amount</para>
+ <para style="terp_tblheader_Details_Right">Amount([[ company.currency_id.code]])</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Percentage</para>
@@ -256,7 +254,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(lines(data['form']),'a') ]]</para>
- <blockTable colWidths="227.0,103.0,77.0,72.0,60.0" style="Table4">
+ <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" style="Table4">
<tr>
<td>
<para style="terp_default_9">[[ a['acc_name'] ]]</para>
@@ -268,7 +266,7 @@
<para style="terp_default_Right_9">[[formatLang(a['qty']) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(a['amt']) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(a['amt']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(a['perc']) ]]%</para>
=== modified file 'account_analytic_plans/report/crossovered_analytic.sxw'
Binary files account_analytic_plans/report/crossovered_analytic.sxw 2010-09-01 10:36:32 +0000 and account_analytic_plans/report/crossovered_analytic.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'account_budget/report/analytic_account_budget_report.py'
--- account_budget/report/analytic_account_budget_report.py 2010-08-19 11:51:57 +0000
+++ account_budget/report/analytic_account_budget_report.py 2010-09-14 08:41:49 +0000
@@ -180,6 +180,6 @@
return result
-report_sxw.report_sxw('report.account.analytic.account.budget', 'account.analytic.account', 'addons/account_budget/report/analytic_account_budget_report.rml',parser=analytic_account_budget_report,header=False)
+report_sxw.report_sxw('report.account.analytic.account.budget', 'account.analytic.account', 'addons/account_budget/report/analytic_account_budget_report.rml',parser=analytic_account_budget_report,header='internal')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account_budget/report/analytic_account_budget_report.rml'
--- account_budget/report/analytic_account_budget_report.rml 2010-08-27 11:04:43 +0000
+++ account_budget/report/analytic_account_budget_report.rml 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Analytic Account Budget" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+<document filename="Analytic Budget.pdf">
+ <template pageSize="(595.0,842.0)" title="Analytic Budget" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
</pageTemplate>
@@ -17,8 +17,11 @@
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,1" stop="1,1"/>
<blockValign value="TOP"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
@@ -35,51 +38,36 @@
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
<blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="4,0" stop="4,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P5" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT"/>
- <paraStyle name="P6" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P7" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Standard" fontName="Helvetica"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -94,114 +82,107 @@
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
</stylesheet>
- <images/>
<story>
- <para style="P5">[[ repeatIn(objects,'o') ]]</para>
- <blockTable colWidths="499.0" style="Table2">
- <tr>
- <td>
- <para style="terp_header_Centre">[[ company.name ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="249.0,249.0" style="Table1">
- <tr>
- <td>
- <para style="P6">Currency: [[ company.currency_id.name ]]</para>
- </td>
- <td>
- <para style="P7">Printed at: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S')]]</para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="terp_default_address">
- Analysis from [[ data['form']['date_from'] ]] to [[ data['form']['date_to'] ]]
- </para>
- </td>
- <td>
- <para style="P8">Analytic Account : <font color="blue">[[ o.name ]]</font></para>
- </td>
- </tr>
- </blockTable>
- <para style="P5">
- <font color="white"> </font>
- </para>
- <para style="P5">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="191.0,82.0,81.0,83.0,62.0" style="Table3">
- <tr>
- <td>
- <para style="P4">Description</para>
- </td>
- <td>
- <para style="P4">Theoretical Amount</para>
- </td>
- <td>
- <para style="P4">Planned Amount</para>
- </td>
- <td>
- <para style="P4">Practical Amount</para>
- </td>
- <td>
- <para style="P4">Perc(%)</para>
- </td>
- </tr>
- </blockTable>
- <para style="P5">
- <font color="white"> </font>
- </para>
+ <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
+ <blockTable colWidths="482.0" style="Table2">
+ <tr>
+ <td>
+ <para style="terp_header_Centre">Analytic Budget</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="241.0,241.0" style="Table1">
+ <tr>
+ <td>
+ <para style="terp_default_8"><font face="Helvetica-Bold">Currency:</font> [[ company.currency_id.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8"><font face="Helvetica">Printed at: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</font> at [[ time.strftime('%H:%M:%S')]]</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_8"><font face="Helvetica-Bold">Analysis from</font> [[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_right_9">Analytic Account : <font color="blue">[[ o.name ]]</font></para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="209.0,77.0,78.0,80.0,54.0" style="Table3">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Theoretical Amount ([[ company.currency_id.code ]])</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Planned Amount([[ company.currency_id.code ]])</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Practical Amount([[ company.currency_id.code ]])</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Perc(%)</para>
+ </td>
+ </tr>
+ </blockTable>
<section>
- <para style="P5">[[ repeatIn(funct(o,data['form']),'a') ]]</para>
- <blockTable colWidths="191.0,82.0,80.0,84.0,61.0" style="Table4">
+ <para style="terp_default_8">[[ repeatIn(funct(o,data['form']),'a') ]]</para>
+ <blockTable colWidths="201.0,75.0,76.0,77.0,52.0" style="Table4">
<tr>
<td>
- <para style="P1"><font>[['.....' *(a['status']-1) ]] [[ setTag('font','font',{'color':'white'}) ]]</font><font>[[ a['status']==1 and (setTag('font','font',{'name':'Helvetica-bold'})) ]][[ a['name'] ]]</font></para>
- </td>
- <td>
- <para style="terp_default_9">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['theo'] ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['pln'] ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['prac'] ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['perc'] ]]%</para>
+ <para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica"> [[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo']) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['pln']) ]]</font> [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['prac']) ]]</font> [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['perc']) ]]</font>%</para>
</td>
</tr>
</blockTable>
</section>
- <para style="P5">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="191.0,83.0,80.0,84.0,61.0" style="Table5">
+ <blockTable colWidths="202.0,75.0,75.0,78.0,52.0" style="Table5">
<tr>
<td>
- <para style="P3"><font face="Times-Roman">[[ repeatIn(funct_total(data['form']),'b') ]]</font> <b>Total :</b></para>
- </td>
- <td>
- <para style="P3">[[ '%.2f' % b['tot_theo'] ]]</para>
- </td>
- <td>
- <para style="P2">[[ '%.2f' % b['tot_pln'] ]]</para>
- </td>
- <td>
- <para style="P2">[[ '%.2f' % b['tot_prac'] ]]</para>
- </td>
- <td>
- <para style="P2">[[ '%.2f' % b['tot_perc'] ]]%</para>
+ <para style="terp_default_Bold_9">[[ repeatIn(funct_total(data['form']),'b') ]] Total([[ company.currency_id.code ]]) :</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo']) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln']) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac']) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_perc']) ]]%</para>
</td>
</tr>
</blockTable>
- <para style="P5">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
</story>
=== modified file 'account_budget/report/analytic_account_budget_report.sxw'
Binary files account_budget/report/analytic_account_budget_report.sxw 2008-10-06 12:01:54 +0000 and account_budget/report/analytic_account_budget_report.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'account_budget/report/crossovered_budget_report.rml'
--- account_budget/report/crossovered_budget_report.rml 2010-09-13 16:26:41 +0000
+++ account_budget/report/crossovered_budget_report.rml 2010-09-14 08:41:49 +0000
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
+<document filename="Budgets.pdf">
<template pageSize="(595.0,842.0)" title="Budgets" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
@@ -90,17 +90,17 @@
</stylesheet>
<story>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
- <blockTable colWidths="499.0" style="Table2">
+ <blockTable colWidths="482.0" style="Table2">
<tr>
<td>
- <para style="terp_header_Centre">Budgets</para>
+ <para style="terp_header_Centre">Budget</para>
</td>
</tr>
</blockTable>
- <blockTable colWidths="249.0,249.0" style="Table1">
+ <blockTable colWidths="241.0,241.0" style="Table1">
<tr>
<td>
- <para style="terp_default_9">Currency: [[ company.currency_id.name ]]</para>
+ <para style="terp_default_9"><font face="Helvetica-Bold">Currency: </font>[[ company.currency_id.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">Printed at: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] at [[ time.strftime('%H:%M:%S')]]</para>
@@ -108,10 +108,10 @@
</tr>
<tr>
<td>
- <para style="terp_default_9">Analysis from [[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para>
+ <para style="terp_default_9"><font face="Helvetica-Bold">Analysis from</font> [[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para>
</td>
<td>
- <para style="terp_default_Bold_right_9">Budget : <font face="Helvetica" color="blue">[[ o.name ]]</font></para>
+ <para style="terp_default_Bold_right_9">Budget : <font color="Blue">[[ o.name ]]</font></para>
</td>
</tr>
</blockTable>
@@ -127,13 +127,13 @@
<para style="terp_tblheader_Details">Description</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Theoretical Amount</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Planned Amount</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Practical Amount</para>
+ <para style="terp_tblheader_Details_Centre">Theoretical Amount([[ company.currency_id.code]])</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Planned Amount([[ company.currency_id.code]])</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Practical Amount([[ company.currency_id.code]])</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Perc(%)</para>
@@ -142,19 +142,19 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(funct(o,data['form']),'a') ]]</para>
- <blockTable colWidths="191.0,82.0,81.0,84.0,61.0" style="Table4">
+ <blockTable colWidths="185.0,79.0,78.0,81.0,59.0" style="Table4">
<tr>
<td>
<para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ '%.2f' % a['theo'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ '%.2f' % a['pln'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ '%.2f' % a['prac'] ]]</para>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ '%.2f' % a['theo'] ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ '%.2f' % a['pln'] ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ '%.2f' % a['prac'] ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ '%.2f' % a['perc'] ]]%</para>
@@ -162,19 +162,19 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="191.0,85.0,83.0,84.0,62.0" style="Table5">
+ <blockTable colWidths="185.0,82.0,80.0,81.0,60.0" style="Table5">
<tr>
<td>
- <para style="terp_default_Bold_9"><font face="Helvetica">[[ repeatIn(funct_total(data['form']),'b') ]]</font><font face="Helvetica">Total </font>:</para>
- </td>
- <td>
- <para style="terp_default_Bold_right_9">[[ '%.2f' % b['tot_theo'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_right_9">[[ '%.2f' % b['tot_pln'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_right_9">[[ '%.2f' % b['tot_prac'] ]]</para>
+ <para style="terp_default_Bold_9"><font face="Helvetica">[[ repeatIn(funct_total(data['form']),'b') ]]</font><font face="Helvetica">Total ([[ company.currency_id.code]]) </font>:</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo']) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln']) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Bold_right_9">[[ '%.2f' % b['tot_perc'] ]]%</para>
=== modified file 'account_budget/report/crossovered_budget_report.sxw'
Binary files account_budget/report/crossovered_budget_report.sxw 2010-08-26 07:06:42 +0000 and account_budget/report/crossovered_budget_report.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'account_invoice_layout/report/report_account_invoice_layout.py'
--- account_invoice_layout/report/report_account_invoice_layout.py 2010-08-17 05:48:28 +0000
+++ account_invoice_layout/report/report_account_invoice_layout.py 2010-09-14 08:41:49 +0000
@@ -74,7 +74,7 @@
sub_total[i]=entry.price_subtotal
i=i+1
res['note']=entry.note
- res['currency']=invoice.currency_id.code
+ res['currency']=invoice.currency_id.symbol
res['type']=entry.state
if entry.uos_id.id==False:
@@ -107,7 +107,7 @@
j=j+1
res['price_subtotal']="%.2f"%(sum)
- res['currency']=invoice.currency_id.code
+ res['currency']=invoice.currency_id.symbol
res['quantity']=''
res['price_unit']=''
res['discount']=''
@@ -138,7 +138,7 @@
else:
res['name']=entry.name
res['price_subtotal']=''
- res['currency']=invoice.currency_id.code
+ res['currency']=invoice.currency_id.symbol
result.append(res)
return result
=== modified file 'account_invoice_layout/report/report_account_invoice_layout.rml'
--- account_invoice_layout/report/report_account_invoice_layout.rml 2010-08-27 11:04:43 +0000
+++ account_invoice_layout/report/report_account_invoice_layout.rml 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(595.0,842.0)" title="Invoice" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@@ -61,7 +61,6 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
@@ -81,7 +80,6 @@
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
@@ -92,7 +90,6 @@
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
</blockTableStyle>
<blockTableStyle id="Table7">
<blockAlignment value="LEFT"/>
@@ -119,16 +116,13 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
- <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
+ <paraStyle name="Standard" fontName="Helvetica"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -139,8 +133,8 @@
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -154,11 +148,11 @@
<paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Drawing" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Header" fontName="Times-Roman"/>
- <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
- <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
- <paraStyle name="Signature" fontName="Times-Roman"/>
+ <paraStyle name="Drawing" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Header" fontName="Helvetica"/>
+ <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+ <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+ <paraStyle name="Signature" fontName="Helvetica"/>
<paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -167,19 +161,19 @@
<paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Salutation" fontName="Times-Roman"/>
- <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Salutation" fontName="Helvetica"/>
+ <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Detail_another" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
</stylesheet>
- <images/>
<story>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
@@ -191,12 +185,11 @@
</para>
</td>
<td>
- <para style="terp_default_9">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] </para>
- <para style="terp_default_9">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
+ <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
<para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.street2 or '' ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
+ <para style="terp_default_9">[[ o.address_invoice_id.street2 or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]][[ o.address_invoice_id.city or '' ]]</para>
+ <para style="terp_default_9">[[ (o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para')]]</para>
<para style="terp_default_9">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
@@ -216,11 +209,11 @@
<para style="terp_header">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
- <para style="P2">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
- <para style="terp_default_space">
+ <para style="terp_header">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
- <para style="P3">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="180.0,179.0,180.0" style="Table_Invoice_General_Header">
@@ -239,13 +232,13 @@
<blockTable colWidths="179.0,179.0,180.0" style="Table_General_Detail_Content">
<tr>
<td>
- <para style="terp_default_Centre_9">[[ o.name ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
+ <para style="terp_default_Centre_8">[[ o.name ]]<font color="white"> </font></para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ formatLang(o.date_invoice,date=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
</td>
</tr>
</blockTable>
@@ -267,37 +260,34 @@
<para style="terp_tblheader_Details_Right">Disc. (%)</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Price</para>
+ <para style="terp_tblheader_Details_Right">Price([[ o.currency_id.code ]])</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
- <blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,51.0,19.0" style="Table_Invoice_Line_Content">
+ <blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,71.0" style="Table_Invoice_Line_Content">
<tr>
<td>
<para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
</td>
<td>
- <para style="terp_default_9">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] + ')' ) ]]</para>
+ <para style="terp_default_9"><font face="Helvetica">[[ ((a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] + ')' ) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['uos'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]] [[ a['price_subtotal'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['currency'] ]]</para>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['price_unit'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['discount'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['price_subtotal'] ]] [[ a['currency'] ]]</para>
</td>
</tr>
<tr>
@@ -307,12 +297,7 @@
</para>
</td>
<td>
- <para style="terp_default_Note">Note: [[ format(a['note']) or removeParentNode('tr') ]]</para>
- <para style="terp_default_Note">
- <font color="white"> </font>
- </para>
- </td>
- <td>
+ <para style="terp_default_Note">Note: [[ (a['note'] and format(a['note'])) or removeParentNode('tr') ]]</para>
<para style="terp_default_Note">
<font color="white"> </font>
</para>
@@ -344,9 +329,6 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
<blockTable colWidths="4.0,278.0,257.0" style="Table1">
<tr>
<td>
@@ -362,7 +344,7 @@
</td>
</tr>
</blockTable>
- <pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
+ <para style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</para>
<blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Table2">
<tr>
<td>
@@ -378,58 +360,42 @@
<para style="terp_tblheader_Details_Right">Disc. (%)</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Price</para>
+ <para style="terp_tblheader_Details_Right">Price([[ o.currency_id.code ]])</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_1"/>
</section>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="405.0,59.0,54.0,20.0" style="Tableau3">
- <tr>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Bold_9">Net Total:</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="405.0,59.0,54.0,20.0" style="Table4">
- <tr>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Bold_9">Taxes:</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="405.0,59.0,54.0,20.0" style="Table6">
+ <blockTable colWidths="405.0,59.0,74.0" style="Tableau3">
+ <tr>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">Net Total:</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="405.0,59.0,74.0" style="Table4">
+ <tr>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">Taxes:</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="405.0,59.0,74.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">
@@ -440,23 +406,20 @@
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
- <para style="P1">
- <font color="white"> </font>
- </para>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="57.0,61.0,60.0,360.0" style="Table7">
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="105.0,52.0,62.0,320.0" style="Table7">
<tr>
<td>
- <para style="terp_tblheader_Details_Centre">Tax</para>
+ <para style="terp_tblheader_Details">Tax</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Base</para>
@@ -476,10 +439,10 @@
</para>
<section>
<para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
- <blockTable colWidths="54.0,61.0,67.0,357.0" style="Table8">
+ <blockTable colWidths="105.0,51.0,63.0,320.0" style="Table8">
<tr>
<td>
- <para style="terp_default_Centre_8">[[ t.name ]]</para>
+ <para style="terp_default_8">[[ t.name ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
@@ -522,4 +485,4 @@
<font color="white"> </font>
</para>
</story>
-</document>
+</document>
\ No newline at end of file
=== modified file 'account_invoice_layout/report/report_account_invoice_layout.sxw'
Binary files account_invoice_layout/report/report_account_invoice_layout.sxw 2009-11-18 07:19:26 +0000 and account_invoice_layout/report/report_account_invoice_layout.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'account_invoice_layout/report/special_message_invoice.py'
--- account_invoice_layout/report/special_message_invoice.py 2010-08-17 05:48:28 +0000
+++ account_invoice_layout/report/special_message_invoice.py 2010-09-14 08:41:49 +0000
@@ -84,7 +84,7 @@
sub_total[i]=entry.price_subtotal
i=i+1
res['note']=entry.note
- res['currency']=invoice.currency_id.code
+ res['currency']=invoice.currency_id.symbol
res['type']=entry.state
if entry.uos_id.id==False:
@@ -117,7 +117,7 @@
j=j+1
res['price_subtotal']="%.2f"%(sum)
- res['currency']=invoice.currency_id.code
+ res['currency']=invoice.currency_id.symbol
res['quantity']=''
res['price_unit']=''
res['discount']=''
@@ -148,7 +148,7 @@
else:
res['name']=entry.name
res['price_subtotal']=''
- res['currency']=invoice.currency_id.code
+ res['currency']=invoice.currency_id.symbol
result.append(res)
return result
=== modified file 'account_invoice_layout/report/special_message_invoice.rml'
--- account_invoice_layout/report/special_message_invoice.rml 2010-08-27 11:04:43 +0000
+++ account_invoice_layout/report/special_message_invoice.rml 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(595.0,842.0)" title="Invoice" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@@ -61,7 +61,6 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
@@ -81,7 +80,6 @@
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
@@ -92,7 +90,6 @@
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
</blockTableStyle>
<blockTableStyle id="Table7">
<blockAlignment value="LEFT"/>
@@ -123,16 +120,13 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
- <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
- <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
+ <paraStyle name="Standard" fontName="Helvetica"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -143,8 +137,8 @@
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -158,11 +152,11 @@
<paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Drawing" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Header" fontName="Times-Roman"/>
- <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
- <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
- <paraStyle name="Signature" fontName="Times-Roman"/>
+ <paraStyle name="Drawing" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Header" fontName="Helvetica"/>
+ <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+ <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+ <paraStyle name="Signature" fontName="Helvetica"/>
<paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -171,19 +165,19 @@
<paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Salutation" fontName="Times-Roman"/>
- <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Salutation" fontName="Helvetica"/>
+ <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Detail_another" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
</stylesheet>
- <images/>
<story>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
@@ -195,12 +189,11 @@
</para>
</td>
<td>
- <para style="terp_default_9">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
+ <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
<para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.street2 or '' ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
+ <para style="terp_default_9">[[ o.address_invoice_id.street2 or removeParentNode('para')]]</para>
+ <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]][[ o.address_invoice_id.city or '' ]]</para>
+ <para style="terp_default_9">[[ (o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
<para style="terp_default_9">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
@@ -220,11 +213,11 @@
<para style="terp_header">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
- <para style="P3">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
- <para style="terp_default_space">
+ <para style="terp_header">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
- <para style="P2">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="180.0,179.0,180.0" style="Table_Invoice_General_Header">
@@ -243,7 +236,7 @@
<blockTable colWidths="179.0,179.0,180.0" style="Table_General_Detail_Content">
<tr>
<td>
- <para style="terp_default_Centre_9">[[ o.name ]]</para>
+ <para style="terp_default_Centre_9">[[ o.name ]]<font color="white"> </font></para>
</td>
<td>
<para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
@@ -271,37 +264,34 @@
<para style="terp_tblheader_Details_Right">Disc. (%)</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Price</para>
+ <para style="terp_tblheader_Details_Right">Price([[ o.currency_id.code ]])</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
- <blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,51.0,19.0" style="Table_Invoice_Line_Content">
+ <blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,71.0" style="Table_Invoice_Line_Content">
<tr>
<td>
<para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
</td>
<td>
- <para style="terp_default_9">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] +')' ) ]]</para>
+ <para style="terp_default_9"><font face="Helvetica">[[ ((a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] +' )' ) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['uos'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]] [[ a['price_subtotal'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ a['currency'] ]]</para>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['price_unit'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['discount'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['price_subtotal'] ]] [[ a['currency'] ]]</para>
</td>
</tr>
<tr>
@@ -311,12 +301,7 @@
</para>
</td>
<td>
- <para style="terp_default_Note">Note: [[ format(a['note']) or removeParentNode('tr') ]]</para>
- <para style="terp_default_Note">
- <font color="white"> </font>
- </para>
- </td>
- <td>
+ <para style="terp_default_Note">Note: [[ (a['note'] and format(a['note'])) or removeParentNode('tr') ]]</para>
<para style="terp_default_Note">
<font color="white"> </font>
</para>
@@ -348,9 +333,6 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
<blockTable colWidths="4.0,278.0,257.0" style="Table1">
<tr>
<td>
@@ -366,7 +348,7 @@
</td>
</tr>
</blockTable>
- <pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
+ <para style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</para>
<blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Table2">
<tr>
<td>
@@ -382,58 +364,42 @@
<para style="terp_tblheader_Details_Right">Disc. (%)</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Price</para>
+ <para style="terp_tblheader_Details_Right">Price([[ o.currency_id.code ]])</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_1"/>
</section>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="405.0,59.0,54.0,20.0" style="Tableau3">
- <tr>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Bold_9">Net Total:</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="405.0,59.0,54.0,20.0" style="Table4">
- <tr>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Bold_9">Taxes:</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="405.0,59.0,54.0,20.0" style="Table6">
+ <blockTable colWidths="405.0,59.0,74.0" style="Tableau3">
+ <tr>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">Net Total:</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="405.0,59.0,74.0" style="Table4">
+ <tr>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">Taxes:</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="405.0,59.0,74.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">
@@ -444,23 +410,20 @@
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
- <para style="P1">
- <font color="white"> </font>
- </para>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="57.0,61.0,60.0,360.0" style="Table7">
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="119.0,50.0,59.0,310.0" style="Table7">
<tr>
<td>
- <para style="terp_tblheader_Details_Centre">Tax</para>
+ <para style="terp_tblheader_Details">Tax</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Base</para>
@@ -480,10 +443,10 @@
</para>
<section>
<para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
- <blockTable colWidths="54.0,61.0,67.0,357.0" style="Table8">
+ <blockTable colWidths="120.0,49.0,60.0,310.0" style="Table8">
<tr>
<td>
- <para style="terp_default_Centre_8">[[ t.name ]]</para>
+ <para style="terp_default_8">[[ t.name ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
@@ -502,7 +465,7 @@
<font color="white"> </font>
</para>
</section>
- <para style="terp_default_space">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="539.0" style="Table_Coment_Payment_Term">
@@ -537,4 +500,4 @@
<font color="white"> </font>
</para>
</story>
-</document>
+</document>
\ No newline at end of file
=== modified file 'account_invoice_layout/report/special_message_invoice.sxw'
Binary files account_invoice_layout/report/special_message_invoice.sxw 2009-11-18 07:19:26 +0000 and account_invoice_layout/report/special_message_invoice.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'hr_attendance/report/attendance_errors.rml'
--- hr_attendance/report/attendance_errors.rml 2010-08-27 11:31:55 +0000
+++ hr_attendance/report/attendance_errors.rml 2010-09-14 08:41:49 +0000
@@ -95,7 +95,7 @@
<blockTable colWidths="78.0,118.0,151.0,98.0,75.0" style="Table_employee_detail_header">
<tr>
<td>
- <para style="terp_tblheader_Details_Centre">Operation</para>
+ <para style="terp_tblheader_Details">Operation</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Date Signed</para>
@@ -118,7 +118,7 @@
<blockTable colWidths="62.0,123.0,154.0,100.0,75.0" style="Table_employee_detail_content">
<tr>
<td>
- <para style="terp_default_Centre_9">[[ att['action'] ]]</para>
+ <para style="terp_default_9">[[ att['action'] ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ formatLang(att['date'],date_time=True) ]]</para>
=== modified file 'hr_attendance/report/attendance_errors.sxw'
Binary files hr_attendance/report/attendance_errors.sxw 2010-08-27 09:14:13 +0000 and hr_attendance/report/attendance_errors.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'hr_expense/report/expense.rml'
--- hr_expense/report/expense.rml 2010-08-27 11:31:55 +0000
+++ hr_expense/report/expense.rml 2010-09-14 08:41:49 +0000
@@ -57,16 +57,12 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
</blockTableStyle>
<blockTableStyle id="Table_Final_total">
<blockAlignment value="LEFT"/>
@@ -76,21 +72,20 @@
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Standard" fontName="Helvetica"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Contents" fontName="Times-Roman"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
- <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Contents" fontName="Helvetica"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+ <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -113,8 +108,8 @@
<paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_bold_right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_italic_8" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
</stylesheet>
- <images/>
<story>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_8">
@@ -146,7 +141,7 @@
<para style="terp_default_Centre_8">[[ o.employee_id.name ]] </para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ time.strftime('%d/%m/%Y', time.strptime(o.date, '%Y-%m-%d')) ]]</para>
+ <para style="terp_default_Centre_8">[[ formatLang(o.date,date=True) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ o.ref ]]</para>
@@ -165,7 +160,7 @@
<para style="terp_tblheader_Details">Name</para>
</td>
<td>
- <para style="terp_tblheader_Details">Ref.</para>
+ <para style="terp_tblheader_Details_Centre">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Unit Price</para>
@@ -174,7 +169,7 @@
<para style="terp_tblheader_Details_Centre">Qty</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Total Price</para>
+ <para style="terp_tblheader_Details_Right">Total Price([[ o.currency_id.code ]])</para>
</td>
</tr>
</blockTable>
@@ -183,10 +178,10 @@
</para>
<section>
<para style="terp_default_8">[[ repeatIn(o.line_ids,'line') ]]</para>
- <blockTable colWidths="49.0,204.0,46.0,58.0,23.0,52.0,71.0,21.0" style="Table_expense_line">
+ <blockTable colWidths="49.0,204.0,46.0,79.0,53.0,92.0" style="Table_expense_line">
<tr>
<td>
- <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime(line.date_value, '%Y-%m-%d')) or '' ]]</para>
+ <para style="terp_default_9">[[ formatLang(line.date_value,date=True) ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.name or '' ]] [[ line.description or '' ]]</para>
@@ -195,24 +190,19 @@
<para style="terp_default_9">[[ line.ref or '' ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ '%.2f' % line.unit_amount or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ o.currency_id.name ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ '%.2f' % line.unit_quantity or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ '%.2f' % line.total_amount or '' ]] </para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ o.currency_id.name ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line.unit_amount) ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(line.unit_quantity) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]] </para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9">
+ <font color="white"> </font>
</para>
</td>
<td>
@@ -220,32 +210,28 @@
</td>
<td>
<para style="terp_default_9">
- </para>
- </td>
- <td>
- <para style="terp_default_Right_9">
- </para>
- </td>
- <td>
- <para style="terp_default_Right_9">
- </para>
- </td>
- <td>
- <para style="terp_default_Right_9">
- </para>
- </td>
- <td>
- <para style="terp_default_Right_9">
- </para>
- </td>
- <td>
- <para style="terp_default_Right_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">
+ <font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
</section>
- <blockTable colWidths="57.0,171.0,171.0,32.0,71.0,21.0" style="Table_Final_total">
+ <blockTable colWidths="57.0,171.0,171.0,32.0,92.0" style="Table_Final_total">
<tr>
<td>
<para style="terp_default_8">
@@ -266,10 +252,7 @@
<para style="terp_tblheader_Details_Right">Total:</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ '%.2f' % o.amount ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ o.currency_id.name ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'hr_expense/report/expense.sxw'
Binary files hr_expense/report/expense.sxw 2009-04-02 09:55:23 +0000 and hr_expense/report/expense.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'hr_payroll/report/payment_advice.sxw'
Binary files hr_payroll/report/payment_advice.sxw 2010-08-05 04:41:04 +0000 and hr_payroll/report/payment_advice.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'hr_payroll/report/payroll_register.rml'
--- hr_payroll/report/payroll_register.rml 2010-08-27 11:31:55 +0000
+++ hr_payroll/report/payroll_register.rml 2010-09-14 08:41:49 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Payroll Register" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(595.0,842.0)" title="Salary Payment Register" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="57.0" y1="57.0" width="480" height="728"/>
+ <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
</pageTemplate>
</template>
<stylesheet>
@@ -65,197 +65,193 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10"/>
- <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
- <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
- <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
- <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
- <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
- <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
- <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
- <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
- <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
- <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
- <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
- <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
- <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10"/>
- <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10"/>
- <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
- <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
- <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
- <paraStyle name="P19" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Standard" fontName="Times-Roman"/>
+ <paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
- <paraStyle name="Table Contents" fontName="Times-Roman"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
+ <paraStyle name="Table Contents" fontName="Helvetica"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10"/>
+ <paraStyle name="terp_header_center" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_default_8_center" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+ <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+ <paraStyle name="terp_default_9_bold_center" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
+ <paraStyle name="terp_default_9_center" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+ <paraStyle name="terp_tblheader_general" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+ <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_tblheader_details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+ <paraStyle name="terp_tblheader_details_center" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tbleheader_details_right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_9_right" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+ <paraStyle name="terp_default_9_bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+ <images/>
</stylesheet>
- <images/>
<story>
- <para style="P1">[[ repeatIn(objects, 'o') ]]</para>
- <para style="P4">Salary Payment Register</para>
- <para style="P5">[[o.name]]</para>
- <para style="P2">For the month of [[get_month(o.date)]]</para>
- <para style="P3">
+ <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
+ <para style="terp_header_center">Salary Payment Register</para>
+ <para style="terp_default_9_bold_center">[[o.name]]</para>
+ <para style="terp_default_8_center">For the month of [[get_month(o.date)]]</para>
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="72.0,294.0,46.0,68.0" style="Table3">
+ <blockTable colWidths="72.0,295.0,47.0,68.0" style="Table3">
<tr>
<td>
- <para style="P6">Expanse To</para>
- </td>
- <td>
- <para style="P11">[[o.journal_id.name]]</para>
- </td>
- <td>
- <para style="P13">Number</para>
- </td>
- <td>
- <para style="P12">[[o.number]]</para>
+ <para style="terp_tblheader_general">Expanse To</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[o.journal_id.name]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_general">Number</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[o.number]]</para>
</td>
</tr>
<tr>
<td>
- <para style="P13">Payment From</para>
- </td>
- <td>
- <para style="P11">[[o.bank_journal_id.name]]</para>
- </td>
- <td>
- <para style="P6">Date</para>
- </td>
- <td>
- <para style="P12">[[formatLang(time.strftime('%Y-%m-%d'), date = True)]]</para>
+ <para style="terp_tblheader_general">Payment From</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[o.bank_journal_id.name]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_general">Date</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[formatLang(time.strftime('%Y-%m-%d'), date = True)]]</para>
</td>
</tr>
</blockTable>
- <para style="P3">
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
<section>
<blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table1">
<tr>
<td>
- <para style="P5">#</para>
- </td>
- <td>
- <para style="P6">Employee Name</para>
- </td>
- <td>
- <para style="P7">Basic SAL</para>
- </td>
- <td>
- <para style="P7">Others</para>
- </td>
- <td>
- <para style="P7">Allowances</para>
- </td>
- <td>
- <para style="P7">Gross SAL</para>
- </td>
- <td>
- <para style="P7">Deduction</para>
- </td>
- <td>
- <para style="P7">Net SAL</para>
+ <para style="terp_tblheader_details_center">#</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_details">Employee Name</para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">Basic SAL <font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">Others <font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">Allowances <font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">Gross SAL <font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">Deduction <font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">Net SAL <font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
</td>
</tr>
</blockTable>
<blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table2">
<tr>
<td>
- <para style="P9">[[ get_no() ]]</para>
- </td>
- <td>
- <para style="P8">[[ repeatIn(o.line_ids, 'l') ]]</para>
- <para style="P8">[[add_line(l)]]</para>
- <para style="P8">[[ l.employee_id.name ]]</para>
- </td>
- <td>
- <para style="P10">[[formatLang(l.basic)]]</para>
- </td>
- <td>
- <para style="P10">[[formatLang(l.other_pay)]]</para>
- </td>
- <td>
- <para style="P10">[[formatLang(l.allounce)]]</para>
- </td>
- <td>
- <para style="P10">[[formatLang(l.grows)]]</para>
- </td>
- <td>
- <para style="P10">[[formatLang(l.deduction)]]</para>
- </td>
- <td>
- <para style="P10">[[formatLang(l.net)]]</para>
+ <para style="terp_default_8">[[ get_no() ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9">[[ repeatIn(o.line_ids, 'l') ]]</para>
+ <para style="terp_default_8">[[add_line(l)]]</para>
+ <para style="terp_default_8">[[ l.employee_id.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9_right">[[ formatLang(l.basic) ]] [[ company.currency_id.symbol]] </para>
+ </td>
+ <td>
+ <para style="terp_default_9_right">[[ formatLang(l.other_pay)]] [[ company.currency_id.symbol]] </para>
+ </td>
+ <td>
+ <para style="terp_default_9_right">[[ formatLang(l.allounce)]] [[ company.currency_id.symbol]] </para>
+ </td>
+ <td>
+ <para style="terp_default_9_right">[[ formatLang(l.grows)]] [[ company.currency_id.symbol]] </para>
+ </td>
+ <td>
+ <para style="terp_default_9_right">[[ formatLang(l.deduction)]] [[ company.currency_id.symbol]] </para>
+ </td>
+ <td>
+ <para style="terp_default_9_right">[[ formatLang(l.net)]] [[ company.currency_id.symbol]] </para>
</td>
</tr>
</blockTable>
<blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table4">
<tr>
<td>
- <para style="P5">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
<td>
- <para style="P6">Total SAL</para>
- </td>
- <td>
- <para style="P7">[[get_basic()]]</para>
- </td>
- <td>
- <para style="P7">[[get_other()]]</para>
- </td>
- <td>
- <para style="P7">[[get_allow()]]</para>
- </td>
- <td>
- <para style="P7">[[get_grows()]]</para>
- </td>
- <td>
- <para style="P7">[[get_deduct()]]</para>
- </td>
- <td>
- <para style="P7">[[get_net()]]</para>
+ <para style="terp_tblheader_details">Total SAL<font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_basic())]][[ company.currency_id.symbol]] </para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_other())]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_allow())]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_grows())]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_deduct())]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_net())]] [[ company.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
- <para style="Standard">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
</section>
- <blockTable colWidths="240.0,240.0" style="Table5">
+ <blockTable colWidths="241.0,241.0" style="Table5">
<tr>
<td>
- <para style="P6">For [[company.name]],</para>
- <para style="P6">
- <font color="white"> </font>
- </para>
- <para style="P6">
- <font color="white"> </font>
- </para>
- <para style="P6">
- <font color="white"> </font>
- </para>
- <para style="P6">HR Manager</para>
- <para style="P19">Authorised Signature</para>
+ <para style="terp_default_9_bold">For [[company.name]],</para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9_bold">HR Manager</para>
+ <para style="terp_default_8">Authorised Signature</para>
</td>
<td>
- <para style="P6">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
- <para style="P1">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
</story>
-</document>
-
+</document>
\ No newline at end of file
=== modified file 'hr_payroll/report/payroll_register.sxw'
Binary files hr_payroll/report/payroll_register.sxw 2010-08-05 04:41:04 +0000 and hr_payroll/report/payroll_register.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'hr_payroll/report/payslip.rml'
--- hr_payroll/report/payslip.rml 2010-08-27 11:31:55 +0000
+++ hr_payroll/report/payslip.rml 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Pay Slip" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(595.0,842.0)" title="Pay slip" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@@ -227,7 +227,6 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -270,16 +269,13 @@
<blockTable colWidths="539.0" style="Table2">
<tr>
<td>
- <para style="terp_header_Centre">Pay Slip</para>
+ <para style="terp_header_Centre">Pay Slip </para>
+ <para style="terp_default_Centre_9">
+ <font color="white"> </font>
+ </para>
</td>
</tr>
</blockTable>
- <para style="terp_default_space">
- <font color="white"> </font>
- </para>
- <para style="terp_default_space">
- <font color="white"> </font>
- </para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
@@ -295,7 +291,7 @@
<para style="terp_default_Bold_9">Name </para>
</td>
<td>
- <para style="terp_default_9">[[o.employee_id.name]]</para>
+ <para style="terp_default_Bold_9">[[o.employee_id.name]]</para>
</td>
</tr>
</blockTable>
@@ -325,7 +321,7 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="42.0,207.0,93.0,197.0" style="Table17">
+ <blockTable colWidths="42.0,208.0,93.0,197.0" style="Table17">
<tr>
<td>
<para style="terp_default_Bold_9">Slip ID</para>
@@ -341,7 +337,7 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="42.0,207.0,93.0,197.0" style="Table18">
+ <blockTable colWidths="42.0,208.0,93.0,197.0" style="Table18">
<tr>
<td>
<para style="terp_default_Bold_9">Register</para>
@@ -396,7 +392,7 @@
<para style="terp_default_Bold_9">Basic Salary</para>
</td>
<td>
- <para style="terp_default_9">[[ o.basic_before_leaves or '' ]]</para>
+ <para style="terp_default_9">[[ formatLang(o.basic_before_leaves) ]] [[ o.company_id.currency_id.symbol ]] </para>
</td>
<td>
<para style="terp_default_Bold_9">Leaved Deduction</para>
@@ -408,13 +404,10 @@
<para style="terp_default_Bold_9">Basic Salary – Leaves</para>
</td>
<td>
- <para style="terp_default_9">[[ formatLang(o.basic) ]]</para>
+ <para style="terp_default_9">[[ formatLang(o.basic) ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_space">
- <font color="white"> </font>
- </para>
<blockTable colWidths="539.0" style="Table12">
<tr>
<td>
@@ -422,9 +415,6 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
<blockTable colWidths="292.0,247.0" style="Table14">
<tr>
<td>
@@ -435,9 +425,6 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
<section>
<para style="terp_default_9">[[repeatIn(get_leave(o.line_ids),'ld') ]]</para>
<blockTable colWidths="293.0,246.0" style="Table13">
@@ -446,17 +433,11 @@
<para style="terp_default_9">[[ ld.code ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(ld.total) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(ld.total) ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
</section>
- <para style="terp_default_space">
- <font color="white"> </font>
- </para>
<blockTable colWidths="158.0,112.0,160.0,109.0" style="Table3">
<tr>
<td>
@@ -473,9 +454,6 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
<blockTable colWidths="269.0,269.0" style="Table8">
<tr>
<td>
@@ -485,7 +463,7 @@
<para style="terp_default_9">Basic Salary</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.basic) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.basic) ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@@ -493,7 +471,7 @@
<para style="terp_default_9">[[repeatIn(get_earnings(o.line_ids),'a') ]] [[ a.code or removeParentNode('tr') ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(a.total) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(a.total) ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -510,7 +488,7 @@
<para style="terp_default_9">[[ b.code ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(b.total) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(b.total) ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -524,22 +502,19 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
<blockTable colWidths="181.0,88.0,177.0,93.0" style="Table4">
<tr>
<td>
- <para style="terp_tblheader_Details">Total Earnings </para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(o.allounce + o.basic) ]] </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Total Deductions </para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(o.deduction) ]]</para>
+ <para style="terp_tblheader_Details">Total Earnings<font face="Helvetica" size="7.0">([[ o.company_id.currency_id.code ]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(o.allounce + o.basic) ]] [[ o.company_id.currency_id.symbol ]] </para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Total Deductions<font face="Helvetica" size="7.0">([[ o.company_id.currency_id.code ]])</font></para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(o.deduction) ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -559,9 +534,6 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
<section>
<para style="terp_default_9">[[repeatIn(get_others(o.line_ids),'ol') ]]</para>
<blockTable colWidths="269.0,134.0,135.0" style="Table22">
@@ -570,20 +542,14 @@
<para style="terp_default_9">[[ ol.type in ['advance','loan','otherpay','otherdeduct','installment'] and ol.code or '' ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total) or '' ]]</para>
+ <para style="terp_default_Right_9">[[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total) or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id.currency_id.symbol or '' ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total) or '' ]]</para>
+ <para style="terp_default_Right_9">[[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total) or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id.currency_id.symbol or '' ]]</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
</section>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
<blockTable colWidths="269.0,177.0,93.0" style="Table5">
<tr>
<td>
@@ -592,10 +558,10 @@
</para>
</td>
<td>
- <para style="terp_tblheader_Details">Net Amount </para>
+ <para style="terp_tblheader_Details">Net Amount<font face="Helvetica" size="7.0">([[ o.company_id.currency_id.code ]])</font></para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(o.net) ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(o.net) ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -630,7 +596,7 @@
<blockTable colWidths="269.0,269.0" style="Table7">
<tr>
<td>
- <para style="P1">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
@@ -643,5 +609,4 @@
<font color="white"> </font>
</para>
</story>
-</document>
-
+</document>
\ No newline at end of file
=== modified file 'hr_payroll/report/payslip.sxw'
Binary files hr_payroll/report/payslip.sxw 2010-08-27 09:14:13 +0000 and hr_payroll/report/payslip.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'hr_payroll/report/report_payroll_advice.rml'
--- hr_payroll/report/report_payroll_advice.rml 2010-08-27 11:31:55 +0000
+++ hr_payroll/report/report_payroll_advice.rml 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Payment Advice" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(595.0,842.0)" title="Payroll Advice" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@@ -63,7 +63,7 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P1" fontName="Helvetica"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -120,7 +120,7 @@
</stylesheet>
<story>
<para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
- <para style="terp_tblheader_Details_Centre">Payment Advice</para>
+ <para style="terp_header_Centre">Payment Advice</para>
<para style="terp_default_1">
<font color="white"> </font>
</para>
@@ -149,7 +149,7 @@
</tr>
<tr>
<td>
- <para style="terp_default_Bold_9">[[o.bank or 'Bank']]</para>
+ <para style="terp_default_Bold_9">[[ o.bank or 'Bank' ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">
@@ -197,10 +197,10 @@
<para style="terp_tblheader_Details">Name of the Employee</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Amount</para>
+ <para style="terp_tblheader_Details_Right">Amount([[ company.currency_id.code ]])</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">By Sal</para>
+ <para style="terp_tblheader_Details_Right">By Sal([[ company.currency_id.code ]])</para>
</td>
<td>
<para style="terp_tblheader_Details">Bank Account</para>
@@ -219,7 +219,7 @@
<tr>
<td>
<para style="P1" leftIndent="15" bulletIndent="0">
- <bullet size="8.0"><seq id="L1"/>.</bullet>
+ <bullet><seq id="L1"/>.</bullet>
<font color="white"> </font>
</para>
</td>
@@ -227,10 +227,10 @@
<para style="terp_default_9">[[ line['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line['amount' ]) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line['amount' ]) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line['bysal']) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line['bysal']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line['acc_no'] ]]</para>
@@ -255,13 +255,13 @@
</para>
</td>
<td>
- <para style="terp_tblheader_Details">Total</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_total()) ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total()) ]]</para>
+ <para style="terp_tblheader_Details">Total([[ company.currency_id.code ]]):</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total()) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">
@@ -336,5 +336,4 @@
<seqReset id="L1"/>
</para>
</story>
-</document>
-
+</document>
\ No newline at end of file
=== modified file 'mrp/report/custom_default.xsl'
--- mrp/report/custom_default.xsl 2008-12-10 22:55:43 +0000
+++ mrp/report/custom_default.xsl 2010-09-14 08:41:49 +0000
@@ -1,7 +1,7 @@
<?xml version = '1.0' encoding="utf-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format";>
- <xsl:variable name="signature">Axair</xsl:variable>
+ <xsl:variable name="signature" select="//corporate-header/user/signature"/>
<xsl:variable name="title">Open ERP Report</xsl:variable>
<xsl:variable name="leftMargin">1cm</xsl:variable>
<xsl:variable name="rightMargin">1cm</xsl:variable>
@@ -11,26 +11,49 @@
<xsl:variable name="page_format">a4_letter</xsl:variable>
+ <xsl:template name="first_page_graphics_corporation">
+ <!--logo-->
+ <fill color="black"/>
+ <stroke color="black"/>
+ <setFont name="DejaVu Sans" size="8"/>
+ <drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
+ <setFont name="DejaVu Sans Bold" size="10"/>
+ <drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
+ <setFont name="DejaVu Sans" size="8"/>
+ <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> / </drawRightString>
+ <stroke color="#000000"/>
+ <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
+
+ </xsl:template>
+
+
+ <xsl:template name="other_pages_graphics_corporation">
+ <!--logo-->
+ <fill color="black"/>
+ <stroke color="black"/>
+ <setFont name="DejaVu Sans" size="8"/>
+ <drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
+ <setFont name="DejaVu Sans Bold" size="10"/>
+ <drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
+ <setFont name="DejaVu Sans" size="8"/>
+ <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> / </drawRightString>
+ <stroke color="#000000"/>
+ <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
+ </xsl:template>
+
<xsl:template name="first_page_frames">
- <frame id="column" x1="1.5cm" y1="1.5cm">
- <xsl:attribute name="width">
- <xsl:value-of select="/report/config/PageWidth - 85"/>
- </xsl:attribute>
- <xsl:attribute name="height">
- <xsl:value-of select="/report/config/PageHeight - 100"/>
- </xsl:attribute>
- </frame>
+ <xsl:if test="$page_format='a4_normal'">
+ <frame id="main" x1="1cm" y1="2.5cm" width="21.0cm" height="29.0cm"/>
+ </xsl:if>
+
+ <xsl:if test="$page_format='a4_letter'">
+ <frame id="address" x1="11cm" y1="21.5cm" width="6cm" height="4cm"/>
+ <frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="17.5cm"/>
+ </xsl:if>
</xsl:template>
<xsl:template name="other_pages_frames">
- <frame id="column" x1="1.5cm" y1="1.5cm">
- <xsl:attribute name="width">
- <xsl:value-of select="/report/config/PageWidth - 85"/>
- </xsl:attribute>
- <xsl:attribute name="height">
- <xsl:value-of select="/report/config/PageHeight - 100"/>
- </xsl:attribute>
- </frame>
+ <frame id="main" x1="1cm" y1="2.5cm" width="21.0cm" height="29cm"/>
</xsl:template>
</xsl:stylesheet>
=== modified file 'mrp/report/custom_rml.xsl'
--- mrp/report/custom_rml.xsl 2008-12-10 22:55:43 +0000
+++ mrp/report/custom_rml.xsl 2010-09-14 08:41:49 +0000
@@ -4,7 +4,7 @@
<xsl:template name="first_page_graphics_report"/>
<xsl:template name="other_pages_graphics_report"/>
-
+
<xsl:template name="rml">
<document>
<template author="Generated by Open ERP, Fabien Pinckaers">
@@ -19,11 +19,11 @@
<xsl:attribute name="rightMargin">
<xsl:value-of select="$rightMargin"/>
</xsl:attribute>
-
+
<xsl:attribute name="topMargin">
<xsl:value-of select="$topMargin"/>
</xsl:attribute>
-
+
<xsl:attribute name="bottomMargin">
<xsl:value-of select="$bottomMargin"/>
</xsl:attribute>
@@ -31,9 +31,10 @@
<xsl:attribute name="title">
<xsl:value-of select="$title"/>
</xsl:attribute>
-
+
<pageTemplate id="first_page">
<pageGraphics>
+ <xsl:call-template name="first_page_graphics_corporation"/>
<xsl:call-template name="first_page_graphics_report"/>
</pageGraphics>
@@ -42,9 +43,10 @@
<pageTemplate id="other_pages">
<pageGraphics>
+ <xsl:call-template name="other_pages_graphics_corporation"/>
<xsl:call-template name="other_pages_graphics_report"/>
</pageGraphics>
-
+
<xsl:call-template name="other_pages_frames"/>
</pageTemplate>
</template>
=== modified file 'mrp/report/price.py'
--- mrp/report/price.py 2010-09-03 07:29:19 +0000
+++ mrp/report/price.py 2010-09-14 08:41:49 +0000
@@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
-
+import time
import ir
import pooler
from report.interface import report_rml
@@ -55,25 +55,22 @@
main_sp_name = "<b>%s</b>\r\n" %(prod.seller_id.name)
price = supplier_info_pool.price_get(cr, uid, prod.seller_id.id, prod.id, number*prod_qtty)[prod.seller_id.id]
price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, price, to_uom_id=product_uom.id)
- main_sp_price = '<b>%s</b>\r\n' %(str(price))
+ main_sp_price = '<b>%.2f</b>\r\n' %(price)
sum += prod_qtty*price
std_price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, prod.standard_price, to_uom_id=product_uom.id)
main_strd_price = str(std_price) + '\r\n'
sum_strd = prod_qtty*std_price
-
for seller_id in prod.seller_ids:
sellers += '- <i>'+ seller_id.name.name +'</i>\r\n'
price = supplier_info_pool.price_get(cr, uid, seller_id.name.id, prod.id, number*prod_qtty)[seller_id.name.id]
price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, price, to_uom_id=product_uom.id)
- sellers_price += '<i>' + str(price) + '</i>\r\n'
-
- xml += "<col para='yes'>" + prod_name + '</col>'
- xml += "<col para='yes'>" + main_sp_name + sellers + '</col>'
- xml += "<col f='yes'>" + str(prod_qtty) + '</col>'
- xml += "<col f='yes'>" + product_uom.name + '</col>'
- xml += "<col f='yes'>" + main_strd_price + '</col>'
- xml += "<col f='yes'>" + main_sp_price + sellers_price + '</col>'
-
+ sellers_price += """<i>%.2f</i>\r\n"""%(price)
+ xml += """<col para='yes'> %s </col>
+ <col para='yes'> %s </col>
+ <col f='yes'>%.2f</col>
+ <col f='yes'>%s</col>
+ <col f='yes'>%.2f</col>
+ <col f='yes'>%s</col>'"""%(prod_name,main_sp_name + sellers ,prod_qtty, product_uom.name,float(main_strd_price),main_sp_price + sellers_price)
xml += '</row>'
return xml, sum, sum_strd
@@ -87,9 +84,9 @@
xml += "<col para='yes'>" + workcenter.name + '</col>'
xml += "<col/>"
xml += "<col/>"
- xml += "<col f='yes'>" + str(cost_cycle) + '</col>'
- xml += "<col f='yes'>" + str(cost_hour) + '</col>'
- xml += "<col f='yes'>" + str(cost_hour + cost_cycle) + '</col>'
+ xml += """<col f='yes'>%.2f</col>"""%(cost_cycle)
+ xml += """<col f='yes'>%.2f</col>"""%(cost_hour)
+ xml += """<col f='yes'>%.2f</col>"""%(cost_hour + cost_cycle)
xml += '</row>'
return xml, total
@@ -98,12 +95,13 @@
xml = ''
config_start = """
<config>
- <date>09/09/2005</date>
+ <date>%s</date>
+ <company>%s</company>
<PageSize>210.00mm,297.00mm</PageSize>
<PageWidth>595.27</PageWidth>
<PageHeight>841.88</PageHeight>
<tableSize>55.00mm,55.00mm, 20.00mm, 22.00mm, 22.00mm, 25.00mm</tableSize>
- """
+ """ % (time.strftime('%m/%d/%Y %H:%M'),user_pool.browse(cr, uid, uid).company_id.name)
config_stop = """
<report-footer>Generated by OpenERP</report-footer>
</config>
@@ -154,9 +152,9 @@
<col/>
<col/>
<col f='yes'/>
- <col f='yes'>%s</col>
- <col f='yes'>%s</col>
- </row></lines>'"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, str(total_strd), str(total))
+ <col f='yes'>%.2f</col>
+ <col f='yes'>%.2f</col>
+ </row></lines>'"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, total_strd, total)
else:
bom = bom_pool.browse(cr, uid, bom_id, context=context)
factor = number * product.uom_id.factor / bom.product_uom.factor
@@ -182,9 +180,9 @@
<col/>
<col/>
<col t='yes'/>
- <col t='yes'>%s</col>
- <col t='yes'>%s</col>
- </row></lines>'"""%(_('Cost'), _('of'), str(number), product.uom_id.name, str(total_strd), str(total))
+ <col t='yes'>%.2f</col>
+ <col t='yes'>%.2f</col>
+ </row></lines>'"""%(_('Cost'), _('of'), str(number), product.uom_id.name, total_strd, total)
total2 = 0
xml_tmp = ''
@@ -201,16 +199,16 @@
<col/>
<col/>
<col/>
- <col t='yes'>%s</col>
- </row></lines>'"""%(_('Work Cost'), _('of'), str(number), product.uom_id.name, str(total2))
+ <col t='yes'>%.2f</col>
+ </row></lines>'"""%(_('Work Cost'), _('of'), str(number), product.uom_id.name, total2)
xml += """<lines style='total'> <row>
<col>%s %s %s %s : </col>
<col/>
<col/>
<col t='yes'/>
- <col t='yes'>%s</col>
- <col t='yes'>%s</col>
- </row></lines>'"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, str(total_strd+total2), str(total+total2))
+ <col t='yes'>%.2f</col>
+ <col t='yes'>%.2f</col>
+ </row></lines>'"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, total_strd+total2, total+total2)
xml = '<?xml version="1.0" ?><report>' + config_start + config_stop + xml + '</report>'
=== modified file 'mrp_repair/report/order.rml'
--- mrp_repair/report/order.rml 2010-08-27 11:31:55 +0000
+++ mrp_repair/report/order.rml 2010-09-14 08:41:49 +0000
@@ -167,17 +167,21 @@
<td>
<para style="P5">Shipping address :</para>
<para style="P3">[[ o.partner_id.name ]]</para>
- <para style="P3">[[ o.address_id.title or '' ]] [[ o.address_id.name ]]</para>
<para style="P3">[[ o.address_id.street ]]</para>
- <para style="P3">[[ o.address_id.street2 or '' ]]</para>
+ <para style="P3">[[ o.address_id.street2 or removeParentNode('para') ]]</para>
<para style="P3">[[ o.address_id.city or '' ]] [[ o.address_id.zip or '' ]]</para>
- <para style="P3">[[ o.address_id.state_id and o.address_id.state_id.name or '' ]] [[ o.address_id.country_id and o.address_id.country_id.name or '' ]]</para>
+ <para style="P3">[[ (o.address_id.state_id and o.address_id.state_id.name) or removeParentNode('para') ]] </para>
+ <para style="P3">[[ o.address_id.country_id and o.address_id.country_id.name or '' ]]</para>
<para style="P3">
<font color="white"> </font>
</para>
- <para style="P13">Invoice address :[[ o.partner_id and o.partner_id.property_payment_term.name ]]</para>
- <para style="P3">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
- <para style="P3">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
+ <para style="P13">Invoice address</para>
+ <para style="P3">[[ o.partner_id and o.partner_id.property_payment_term.name ]]</para>
+ <para style="P3">[[ o.partner_invoice_id.street ]]</para>
+ <para style="P3">[[ o.partner_invoice_id.street2 or removeParentNode('para') ]]</para>
+ <para style="P3">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]</para>
+ <para style="P3">[[ (o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+ <para style="P3">[[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]</para>
</td>
<td>
<para style="P12">
@@ -186,9 +190,10 @@
</td>
<td>
<para style="P3">[[ o.partner_id.name ]]</para>
- <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['name'] ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['street'] ]]</para>
+ <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['street2'] or removeParentNode('para') ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['zip'] ]][[ o.partner_id and adr_get(o.partner_id, 'default')['city'] ]]</para>
+ <para style="P3">[[ (o.partner_id and adr_get(o.partner_id, 'default')['state_id'] and adr_get(o.partner_id, 'default')['state_id'][1]) or removeParentNode('para') ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['country_id'] and adr_get(o.partner_id, 'default')['country_id'][1] ]]</para>
<para style="P3">
<font color="white"> </font>
@@ -257,134 +262,118 @@
<para style="P12">
<font color="white"> </font>
</para>
- <blockTable colWidths="165.0,165.0,71.0,70.0,64.0" repeatRows="1" style="Table4">
+ <blockTable colWidths="254.0,100.0,60.0,60.0,60.0" repeatRows="1" style="Table4">
<tr>
<td>
- <para style="P14">Description</para>
- </td>
- <td>
- <para style="P14">VAT</para>
- </td>
- <td>
- <para style="P17">Quantity</para>
- </td>
- <td>
- <para style="P18">Unit Price</para>
- </td>
- <td>
- <para style="P19">Price</para>
+ <para style="terp_tblheader_Details">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">VAT</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Quantity</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Unit Price</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Price([[ o.pricelist_id.currency_id. name ]])</para>
</td>
</tr>
</blockTable>
+ <para style="P29">Operation Line(s)</para>
<section>
<para style="P30"><font color="white">[[ repeatIn(o.operations,'line') ]] </font></para>
<para style="P30"><font color="white">[[ line or removeParentNode('section')]]</font></para>
- <para style="P29">Operation Line(s)</para>
- <blockTable colWidths="28.0,145.0,150.0,96.0,51.0,69.0" style="Table5">
+ <blockTable colWidths="254.0,100.0,60.0,60.0,60.0" style="Table5">[[ (line.to_invoice==True) or removeParentNode('blockTable') ]]
<tr>
<td>
- <para style="P4">Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] </para>
- <para style="P4">Remove [[ ((line.type == 'remove') or removeParentNode('para')) and '' ]]</para>
- </td>
- <td>
- <para style="P3"><font>[[ line.name ]]</font><font>[[ (line.to_invoice==True) or removeParentNode('blockTable') ]]</font></para>
- </td>
- <td>
- <para style="P6">[[ ','.join(map( lambda x: x.name, line.tax_id)) ]]</para>
- </td>
- <td>
- <para style="P20">[[ formatLang(line.product_uom_qty) ]] [[ line.product_uom.name ]]</para>
+ <para style="terp_default_9"><font face="Helvetica-Oblique" size="8.0">(Add) [[ ((line.type == 'add') or removeParentNode('para')) and '' ]]</font><font> [[ line.name ]]</font></para>
+ <para style="terp_default_9"><font face="Helvetica-Oblique" size="8.0">(Remove) [[ ((line.type == 'remove') or removeParentNode('para')) and '' ]]</font><font> [[ line.name ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9">[[ ','.join(map( lambda x: x.name, line.tax_id)) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(line.product_uom_qty) ]] [[ line.product_uom.name ]]</para>
</td>
<td>
- <para style="P1">[[ formatLang(line.price_unit) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line.price_unit) ]] </para>
</td>
<td>
- <para style="P2">[[ formatLang(line.price_subtotal) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td>
</tr>
</blockTable>
</section>
+ <para style="P12">
+ <font color="white"> </font>
+ </para>
+ <para style="P29">Fees Line(s) [[ (o.fees_lines ==[] and removeParentNode('para') ) ]]</para>
<section>
<para style="P30"><font color="white">[[ repeatIn(o.fees_lines,'fees') ]]</font></para>
<para style="P30"><font color="white">[[ fees or removeParentNode('section')]]</font></para>
- <para style="P23">Fees Line(s) [[ (o.fees_lines ==[] and removeParentNode('para') ) ]]</para>
- <blockTable colWidths="28.0,145.0,150.0,96.0,51.0,69.0" style="Table6">
+
+ <blockTable colWidths="254.0,100.0,60.0,60.0,60.0" style="Table6">[[ (fees.to_invoice==True) or removeParentNode('blockTable') ]]
<tr>
<td>
- <para style="P21"></para>
- </td>
- <td>
- <para style="P3"><font>[[ fees.name ]]</font><font>[[ (fees.to_invoice==True) or removeParentNode('blockTable') ]]</font></para>
- </td>
- <td>
- <para style="P6">[[ ','.join(map( lambda x: x.name, fees.tax_id)) ]]</para>
- </td>
- <td>
- <para style="P20">[[ formatLang(fees.product_uom_qty) ]] [[ fees.product_uom.name ]] </para>
- </td>
- <td>
- <para style="P1">[[ formatLang(fees.price_unit) ]]</para>
- </td>
- <td>
- <para style="P2">[[ formatLang(fees.price_subtotal) ]]</para>
+ <para style="terp_default_9"><font>[[ fees.name ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9">[[ ','.join(map( lambda x: x.name, fees.tax_id)) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(fees.product_uom_qty) ]] [[ fees.product_uom.name ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(fees.price_unit) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(fees.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td>
</tr>
</blockTable>
</section>
- <para style="P22">
- <font color="white"> </font>
- </para>
- <para style="P22">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="384.0,67.0,64.0,24.0" style="Table9">
- <tr>
- <td>
- <para style="P28">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P25">Net Total :</para>
- </td>
- <td>
- <para style="P26">[[ formatLang(o.amount_untaxed)]]</para>
- </td>
- <td>
- <para style="P26">[[ o.pricelist_id.currency_id.name ]]</para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="P28">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P25">Taxes:</para>
- </td>
- <td>
- <para style="P26">[[ formatLang(o.amount_tax)]]</para>
- </td>
- <td>
- <para style="P26">[[ o.pricelist_id.currency_id.name ]]</para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="P28">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P25">Total :</para>
- </td>
- <td>
- <para style="P27">[[ formatLang(total(o)) ]]</para>
- </td>
- <td>
- <para style="P26">[[ o.pricelist_id.currency_id.name ]]</para>
+ <blockTable colWidths="404.0,67.0,64.0" style="Table9">
+ <tr>
+ <td>
+ <para style="P28">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">Net Total :</para>
+ </td>
+ <td>
+ <para style="P26">[[ formatLang(o.amount_untaxed)]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+ </td>
+
+ </tr>
+ <tr>
+ <td>
+ <para style="P28">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">Taxes:</para>
+ </td>
+ <td>
+ <para style="P26">[[ formatLang(o.amount_tax)]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P28">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Total :</para>
+ </td>
+ <td>
+ <para style="terp_default_right_bold_9">[[ formatLang(total(o)) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'product/report/product_pricelist.py'
--- product/report/product_pricelist.py 2010-09-01 10:36:32 +0000
+++ product/report/product_pricelist.py 2010-09-14 08:41:49 +0000
@@ -33,6 +33,7 @@
'time': time,
'get_pricelist': self._get_pricelist,
'get_currency': self._get_currency,
+ 'get_currency_symbol': self._get_currency_symbol,
'get_categories': self._get_categories,
'get_price': self._get_price,
'get_titles': self._get_titles,
@@ -69,6 +70,12 @@
pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'])[0]
return pricelist['currency_id'][1]
+ def _get_currency_symbol(self, pricelist_id):
+ pool = pooler.get_pool(self.cr.dbname)
+ pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'])[0]
+ symbol = pool.get('res.currency').read(self.cr, self.uid, [pricelist['currency_id'][0]], ['symbol'])[0]
+ return symbol['symbol'] or ''
+
def _get_categories(self, products,form):
cat_ids=[]
res=[]
=== modified file 'product/report/product_pricelist.rml'
--- product/report/product_pricelist.rml 2010-09-01 10:36:32 +0000
+++ product/report/product_pricelist.rml 2010-09-14 08:41:49 +0000
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
+<document filename="Price List.pdf">
<template pageSize="(595.0,842.0)" title="Price List" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
@@ -173,19 +173,19 @@
<para style="terp_default_1">[[repeatIn(get_titles(data['form']), 'k')]]</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty1') and k['qty1']) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty2') and k['qty2']) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty3') and k['qty3']) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty4') and k['qty4']) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty5') and k['qty5']) or '' ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty1') and k['qty1']) or '' ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty2') and k['qty2']) or '' ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty3') and k['qty3']) or '' ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty4') and k['qty4']) or '' ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty5') and k['qty5']) or '' ]] </para>
</td>
</tr>
</blockTable>
@@ -214,19 +214,19 @@
<para style="terp_default_9">[[ p['code'] and '[' + p['code'] + '] ' or '' ]] [[ p['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty1') and p['qty1']) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty2') and p['qty2']) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty3') and p['qty3']) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty4') and p['qty4']) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty5') and p['qty5']) or '' ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty1') and p['qty1']) or '' ]] [[ (k.has_key('qty1') and get_currency_symbol ( data['form']['price_list'])) or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty2') and p['qty2']) or '' ]] [[ (k.has_key('qty2') and get_currency_symbol ( data['form']['price_list'])) or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty3') and p['qty3']) or '' ]] [[ (k.has_key('qty3') and get_currency_symbol ( data['form']['price_list'])) or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty4') and p['qty4']) or '' ]] [[ (k.has_key('qty4') and get_currency_symbol ( data['form']['price_list'])) or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty5') and p['qty5']) or '' ]] [[ (k.has_key('qty5') and get_currency_symbol ( data['form']['price_list'])) or '' ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'product/report/product_pricelist.sxw'
Binary files product/report/product_pricelist.sxw 2010-09-01 10:36:32 +0000 and product/report/product_pricelist.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'purchase/report/order.rml'
--- purchase/report/order.rml 2010-09-03 13:14:55 +0000
+++ purchase/report/order.rml 2010-09-14 08:41:49 +0000
@@ -250,7 +250,7 @@
<para style="terp_tblheader_Details_Right">Unit Price</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Net Price</para>
+ <para style="terp_tblheader_Details_Centre">Net Price([[ o.pricelist_id.currency_id.code ]])</para>
</td>
</tr>
</blockTable>
=== modified file 'purchase/report/order.sxw'
Binary files purchase/report/order.sxw 2010-09-03 13:14:55 +0000 and purchase/report/order.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'purchase/report/request_quotation.rml'
--- purchase/report/request_quotation.rml 2010-09-01 10:50:44 +0000
+++ purchase/report/request_quotation.rml 2010-09-14 08:41:49 +0000
@@ -76,11 +76,11 @@
<td>
<para style="terp_default_Bold_9">Expected Delivery address:</para>
<para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.partner_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
- <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.title) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.title) or ' ']] [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.name) or '' ]]</para>
<para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street) or '']]</para>
- <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street2) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street2) or '']]</para>
- <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.zip) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.zip) or '' ]] [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.city) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.city) or '' ]]</para>
- <para style="terp_default_9">[[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.state_id and order.warehouse_id.partner_address_id.state_id.name) or order.partner_address_id and order.partner_address_id.state_id and order.partner_address_id.state_id.name]] [[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.country_id and order.warehouse_id.partner_address_id.country_id.name) or order.partner_address_id.country_id.name ]]</para>
+ <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street2) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.zip) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.zip) or '' ]][[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.city) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.city) or '' ]]</para>
+ <para style="terp_default_9">[[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.state_id and order.warehouse_id.partner_address_id.state_id.name) or order.partner_address_id and order.partner_address_id.state_id and order.partner_address_id.state_id.name or removeParentNode('para') ]] </para>
+ <para style="terp_default_9">[[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.country_id and order.warehouse_id.partner_address_id.country_id.name) or order.partner_address_id.country_id.name ]]</para>
</td>
<td>
<para style="terp_default_9">
@@ -89,10 +89,11 @@
</td>
<td>
<para style="terp_default_9">[[ (order.partner_id and order.partner_id.title) or '' ]] [[ order.partner_id.name ]]</para>
- <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.title) or '' ]] [[ order.partner_address_id.name ]] </para>
- <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.street) or '']] [[ order.partner_address_id.street2 ]]</para>
- <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.zip) or '' ]] [[ (order.partner_address_id and order.partner_address_id.city) or '' ]]</para>
- <para style="terp_default_9">[[ order.partner_address_id.state_id.code ]] [[ (order.partner_address_id and order.partner_address_id.country_id and order.partner_address_id.country_id.code) or '' ]]</para>
+ <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.street) or '']]</para>
+ <para style="terp_default_9">[[ (order.partner_address_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.zip) or '' ]][[ (order.partner_address_id and order.partner_address_id.city) or '' ]]</para>
+ <para style="terp_default_9">[[ (order.partner_address_id.state_id.name) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.country_id and order.partner_address_id.country_id.name) or '' ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
@@ -146,7 +147,9 @@
</tr>
</blockTable>
</section>
- <para style="terp_default_9"/>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
<para style="terp_default_9">[[ format(order.notes or '') ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
=== modified file 'purchase/report/request_quotation.sxw'
Binary files purchase/report/request_quotation.sxw 2010-09-01 10:50:44 +0000 and purchase/report/request_quotation.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'sale/report/sale_order.rml'
--- sale/report/sale_order.rml 2010-09-03 07:29:19 +0000
+++ sale/report/sale_order.rml 2010-09-14 08:41:49 +0000
@@ -234,7 +234,7 @@
<para style="terp_tblheader_Details_Right">Disc.(%)</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Price</para>
+ <para style="terp_tblheader_Details_Right">Price([[ o.pricelist_id.currency_id.code ]])</para>
</td>
</tr>
</blockTable>
@@ -361,4 +361,4 @@
<font color="white"> </font>
</para>
</story>
-</document>
+</document>
\ No newline at end of file
=== modified file 'sale/report/sale_order.sxw'
Binary files sale/report/sale_order.sxw 2010-09-03 07:29:19 +0000 and sale/report/sale_order.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'sale_layout/report/report_sale_layout.rml'
--- sale_layout/report/report_sale_layout.rml 2010-08-27 11:44:38 +0000
+++ sale_layout/report/report_sale_layout.rml 2010-09-14 08:41:49 +0000
@@ -81,6 +81,7 @@
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table2">
@@ -191,17 +192,21 @@
<td>
<para style="terp_default_Bold_9">Shipping address :</para>
<para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]]</para>
<para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.street2 or '' ]]</para>
+ <para style="terp_default_9">[[ o.partner_shipping_id.street2 or removeParentNode('para') ]]</para>
<para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]] [[ o.partner_shipping_id.zip or '' ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]] [[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_Bold_9">Invoice address :</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
- <para style="P27">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
+ <para style="terp_default_9">[[ o.partner_invoice_id.partner_id.name or '' ]]</para>
+ <para style="terp_default_9">[[ o.partner_invoice_id.street ]]</para>
+ <para style="terp_default_9">[[ o.partner_invoice_id.street2 or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '']]</para>
</td>
<td>
<para style="P17">
@@ -210,11 +215,11 @@
</td>
<td>
<para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]]</para>
<para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.street2 or '' ]]</para>
+ <para style="terp_default_9">[[ o.partner_order_id.street2 or removeParentNode('para') ]]</para>
<para style="terp_default_9">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]] [[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_order_id.state_id and o.partner_order_id.state_id.name) or removeParentNode('para') ]] </para>
+ <para style="terp_default_9">[[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
@@ -257,7 +262,7 @@
<para style="terp_default_Centre_8">[[ o.client_order_ref ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ o.date_order ]]</para>
+ <para style="terp_default_Centre_8">[[ formatLang(o.date_order,date=True) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ o.user_id.name ]]</para>
@@ -279,7 +284,7 @@
<para style="terp_tblheader_Details_Centre">VAT</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Quantity</para>
+ <para style="terp_tblheader_Details_Right">Quantity</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Unit Price</para>
@@ -288,38 +293,38 @@
<para style="terp_tblheader_Details_Right">Disc.(%)</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Price</para>
+ <para style="terp_tblheader_Details_Right">Price([[ o.pricelist_id.currency_id.code ]])</para>
</td>
</tr>
</blockTable>
<section>
<para style="P32">[[ repeatIn(sale_order_lines(o),'a') ]]</para>
- <blockTable colWidths="0.0,216.0,66,46,24,66,55,54" style="Table1">
+ <blockTable colWidths="0.0,216.0,62.0,40.0,22.0,62.0,51.0,74.0" style="Table1">
<tr>
<td>
<para style="P8">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</para>
</td>
<td>
- <para style="Table Contents"><font>[[ (a['layout_type']=='title' or a['layout_type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para>
- </td>
- <td>
- <para style="Table Contents"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['tax_id'] ]]</font></para>
- </td>
- <td>
- <para style="Table Contents"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['product_uom_qty'] ]]</font></para>
- </td>
- <td>
- <para style="Table Contents"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['product_uom'] ]]</font></para>
- </td>
- <td>
- <para style="Table Contents"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] </font><font>[[ a['price_unit'] ]]</font></para>
- </td>
- <td>
- <para style="Table Contents"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['discount'] ]]</font></para>
- </td>
- <td>
- <para style="Table Contents"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['price_subtotal'] ]]</font></para>
+ <para style="terp_default_9"><font>[[ (a['layout_type']=='title' or a['layout_type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['tax_id'] ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['product_uom_qty'] ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['product_uom'] ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] </font><font>[[ a['price_unit'] ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['discount'] ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['price_subtotal'] ]] [[ o.pricelist_id.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@@ -368,7 +373,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="387.0,56.0,73.0,21.0" style="Table_final">
+ <blockTable colWidths="382.0,56.0,90.0" style="Table_final">
<tr>
<td>
<para style="terp_default_9">
@@ -379,10 +384,7 @@
<para style="terp_default_9">Net Total :</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@@ -395,10 +397,7 @@
<para style="terp_default_9">Taxes :</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax ) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@@ -411,10 +410,7 @@
<para style="terp_default_Bold_9">Total :</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] </para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ o.pricelist_id.currency_id.name ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'stock/report/__init__.py'
--- stock/report/__init__.py 2010-08-13 05:37:09 +0000
+++ stock/report/__init__.py 2010-09-14 08:41:49 +0000
@@ -23,10 +23,10 @@
import lot_location
import ups
import picking
-import lot_overview
import lot_overview_all
import report_stock
import report_stock_picking
import report_stock_move
import stock_inventory_move_report
+import lot_overview
=== added file 'stock/report/lot_overview.py'
--- stock/report/lot_overview.py 1970-01-01 00:00:00 +0000
+++ stock/report/lot_overview.py 2010-09-14 08:41:49 +0000
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# 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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import pooler
+import time
+from report import report_sxw
+
+class lot_overview(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context):
+ super(lot_overview, self).__init__(cr, uid, name, context=context)
+ self.price_total = 0.0
+ self.grand_total = 0.0
+ self.localcontext.update({
+ 'time': time,
+ 'process':self.process,
+ 'price_total': self._price_total,
+ 'grand_total_price':self._grand_total,
+ })
+
+ def process(self,location_id):
+ location_obj = pooler.get_pool(self.cr.dbname).get('stock.location')
+ data = location_obj._product_get_report(self.cr,self.uid, [location_id])
+ data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['name'])[0]['name']
+ self.price_total = 0.0
+ self.price_total += data['total_price']
+ self.grand_total += data['total_price']
+ return [data]
+
+ def _price_total(self):
+ return self.price_total
+
+ def _grand_total(self):
+ return self.grand_total
+
+report_sxw.report_sxw('report.lot.stock.overview', 'stock.location', 'addons/stock/report/lot_overview.rml', parser=lot_overview)
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
=== removed file 'stock/report/lot_overview.py'
--- stock/report/lot_overview.py 2010-02-24 10:55:29 +0000
+++ stock/report/lot_overview.py 1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# 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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import pooler
-import time
-from report import report_sxw
-
-class lot_overview(report_sxw.rml_parse):
- def __init__(self, cr, uid, name, context):
- super(lot_overview, self).__init__(cr, uid, name, context=context)
- self.price_total = 0.0
- self.grand_total = 0.0
- self.localcontext.update({
- 'time': time,
- 'process':self.process,
- 'price_total': self._price_total,
- 'grand_total_price':self._grand_total,
- })
-
- def process(self,location_id):
- location_obj = pooler.get_pool(self.cr.dbname).get('stock.location')
- data = location_obj._product_get_report(self.cr,self.uid, [location_id])
- data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['name'])[0]['name']
- self.price_total = 0.0
- self.price_total += data['total_price']
- self.grand_total += data['total_price']
- return [data]
-
- def _price_total(self):
- return str( self.price_total)
-
- def _grand_total(self):
- return str( self.grand_total)
-
-report_sxw.report_sxw('report.lot.stock.overview', 'stock.location', 'addons/stock/report/lot_overview.rml', parser=lot_overview)
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== added file 'stock/report/lot_overview.rml'
--- stock/report/lot_overview.rml 1970-01-01 00:00:00 +0000
+++ stock/report/lot_overview.rml 2010-09-14 08:41:49 +0000
@@ -0,0 +1,212 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+ <template pageSize="(595.0,842.0)" title="Location Overview" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+ <pageTemplate id="first">
+ <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+ </pageTemplate>
+ </template>
+ <stylesheet>
+ <blockTableStyle id="Standard_Outline">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table6">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table7">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#999999" start="1,-1" stop="1,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table8">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table10">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table1">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ </blockTableStyle>
+ <initialize>
+ <paraStyle name="all" alignment="justify"/>
+ </initialize>
+ <paraStyle name="Standard" fontName="Helvetica"/>
+ <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
+ <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
+ </stylesheet>
+ <story>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_header_Centre">Location Overview</para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="233.0,60.0,59.0,59.0,72.0" style="Table6">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Location / Product</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Variants</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Quantity</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Unit Price</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Value([[ company.currency_id.name ]])</para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+ <section>
+ <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
+ <blockTable colWidths="152.0,82.0,59.0,59.0,58.0,72.0" style="Table7">
+ <tr>
+ <td>
+ <para style="terp_default_Bold_9">[[ (not ob['product']) and removeParentNode('blockTable') ]] [[ ob['location_name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="terp_default_8">[[ repeatIn(ob['product'],'p') ]]</para>
+ <blockTable colWidths="38.0,196.0,60.0,59.0,58.0,72.0" style="Table8">
+ <tr>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">[ [[ p['code'] ]] ] [[ p['prod_name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9">[[ p['variants'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(p['price']) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(p['price_value']) ]] [[ o.company_id.currency_id.symbol]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ <blockTable colWidths="38.0,366.0,78.0" style="Table10">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9">Total:</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ </section>
+ <blockTable colWidths="71.0,334.0,77.0" repeatRows="1" style="Table1">
+ <tr>
+ <td>
+ <para style="terp_default_Bold_9">Grand Total:</para>
+ </td>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price()) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_2">
+ <font color="white"> </font>
+ </para>
+ </story>
+</document>
\ No newline at end of file
=== removed file 'stock/report/lot_overview.rml'
--- stock/report/lot_overview.rml 2010-08-27 11:44:38 +0000
+++ stock/report/lot_overview.rml 1970-01-01 00:00:00 +0000
@@ -1,299 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Lot Overview" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
- <pageTemplate id="first">
- <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
- </pageTemplate>
- </template>
- <stylesheet>
- <blockTableStyle id="Standard_Outline">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table1">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table3">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table4">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table5">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table2">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
- </blockTableStyle>
- <initialize>
- <paraStyle name="all" alignment="justify"/>
- </initialize>
- <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
- <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
- <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- </stylesheet>
- <images/>
- <story>
- <section>
- <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
- <section>
- <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
- <blockTable colWidths="99.0,137.0,51.0,54.0,38.0,60.0,43.0" repeatRows="1" style="Table1">
- <tr>
- <td>
- <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] Location</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Product</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Variants</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Amount</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">UoM</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Unit Price</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Value</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="99.0,137.0,51.0,54.0,38.0,60.0,43.0" repeatRows="1" style="Table3">
- <tr>
- <td>
- <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] [[ ob['location_name'] ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <section>
- <para style="terp_default_8">[[ repeatIn(ob['product'],'p') ]]</para>
- <blockTable colWidths="99.0,137.0,51.0,54.0,38.0,60.0,43.0" repeatRows="1" style="Table4">
- <tr>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_9">[[ p['prod_name'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ p['variants'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ p['prod_qty'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ p['uom'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ p['price'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ p['price_value'] ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- </section>
- <blockTable colWidths="99.0,137.0,51.0,54.0,38.0,60.0,43.0" repeatRows="1" style="Table5">
- <tr>
- <td>
- <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Total:</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ price_total() ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- </section>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- </section>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="99.0,137.0,51.0,54.0,38.0,56.0,47.0" repeatRows="1" style="Table2">
- <tr>
- <td>
- <para style="terp_tblheader_Details">Grand Total:</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ grand_total_price() ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="Standard">
- <font color="white"> </font>
- </para>
- </story>
-</document>
=== added file 'stock/report/lot_overview.sxw'
Binary files stock/report/lot_overview.sxw 1970-01-01 00:00:00 +0000 and stock/report/lot_overview.sxw 2010-09-14 08:41:49 +0000 differ
=== removed file 'stock/report/lot_overview.sxw'
Binary files stock/report/lot_overview.sxw 2009-06-18 08:19:28 +0000 and stock/report/lot_overview.sxw 1970-01-01 00:00:00 +0000 differ
=== modified file 'stock/report/lot_overview_all.rml'
--- stock/report/lot_overview_all.rml 2010-09-01 14:19:37 +0000
+++ stock/report/lot_overview_all.rml 2010-09-14 08:41:49 +0000
@@ -119,7 +119,7 @@
<blockTable colWidths="152.0,82.0,59.0,59.0,58.0,72.0" style="Table7">
<tr>
<td>
- <para style="terp_default_Bold_9">[[ ob['location_name'] ]]</para>
+ <para style="terp_default_Bold_9">[[ (not ob['product']) and removeParentNode('blockTable') ]][[ ob['location_name'] ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">
@@ -178,9 +178,7 @@
<blockTable colWidths="38.0,366.0,78.0" style="Table10">
<tr>
<td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
+ <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Total:</para>
=== modified file 'stock/report/lot_overview_all.sxw'
Binary files stock/report/lot_overview_all.sxw 2010-09-01 14:19:37 +0000 and stock/report/lot_overview_all.sxw 2010-09-14 08:41:49 +0000 differ
=== removed file 'stock/report/packing.rml'
--- stock/report/packing.rml 2010-08-27 11:44:38 +0000
+++ stock/report/packing.rml 1970-01-01 00:00:00 +0000
@@ -1,310 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Packing" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
- <pageTemplate id="first">
- <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
- </pageTemplate>
- </template>
- <stylesheet>
- <blockTableStyle id="Standard_Outline">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Address_detail">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Title_String">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Header_Order_Reference_Tbl">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Content_Order_Reference_Table">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Move_Line_Header">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Move_Line_Contect_Assign_State">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Move_Line_Content_Other_State">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
- </blockTableStyle>
- <initialize>
- <paraStyle name="all" alignment="justify"/>
- </initialize>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
- <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Table Contents" fontName="Times-Roman"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
- <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_5cm_Above_Space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_1cm_above_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
- </stylesheet>
- <images/>
- <story>
- <para style="terp_default_8">[[ repeatIn(objects,'picking') ]] </para>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="269.0,269.0" style="Table_Address_detail">
- <tr>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
- <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
- <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '']]</para>
-
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_tblheader_Details">[[ 'sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and 'Shipping Address :' or removeParentNode('para') ]] </para>
- <para style="terp_default_9">[[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
- <para style="terp_default_9">[[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] </para>
- <para style="terp_default_9">[[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]] [[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
- <para style="terp_default_9">[[ ('sale_id' in picking._columns.keys() and picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_5cm_Above_Space">
- <font color="white"> </font>
- </para>
- <para style="terp_default_5cm_Above_Space">
- <font color="white"> </font>
- </para>
- <para style="terp_default_5cm_Above_Space">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="538.0" style="Table_Title_String">
- <tr>
- <td>
- <para style="terp_header">Packing List: [[ picking.name ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_5cm_Above_Space">
- <font color="white"> </font>
- </para>
- <para style="terp_default_5cm_Above_Space">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="123.0,134.0,133.0,134.0" style="Header_Order_Reference_Tbl">
- <tr>
- <td>
- <para style="terp_tblheader_General_Centre">Order(Origin)</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Centre">Recipient</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Centre">Expected Shipping Date </para>
- </td>
- <td>
- <para style="terp_tblheader_General_Centre"> Weight</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="123.0,134.0,133.0,134.0" style="Content_Order_Reference_Table">
- <tr>
- <td>
- <para style="terp_default_Centre_8">[[ picking.origin ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_8">[[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ ('sale_id' in picking._columns.keys() and picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
- </td>
- <td>
- <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_8">[[ 'weight' in picking._columns.keys() and picking.weight or '']] </para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_5cm_Above_Space">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="196.0,68.0,56.0,61.0,73.0,70.0" repeatRows="1" style="Move_Line_Header">
- <tr>
- <td>
- <para style="terp_tblheader_Details">Description</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Tracking Lot</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Lot</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">State</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Quantity</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Location</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <section>
- <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]]</para>
- <blockTable colWidths="197.0,68.0,61.0,57,46.0,26.0,74.0" style="Move_Line_Contect_Assign_State">
- <tr>
- <td>
- <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </para>
- </td>
- <td>
- <para style="terp_default_9">[[ (move_lines.tracking_id and move_lines.tracking_id.name) or '/' ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ move_lines.state ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
- </td>
- <td>
- <para style="terp_default_9">[[ move_lines.product_uom.name ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- </section>
-
- <para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
- <section>
- <blockTable colWidths="197.0,68.0,61.0,57,46.0,26.0,74.0" style="Move_Line_Content_Other_State">
- <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]</para>
- <tr>
- <td>
- <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ (move_lines.tracking_id and move_lines.tracking_id.name) or '/' ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ move_lines.state ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
- </td>
- <td>
- <para style="terp_default_9">[[ move_lines.product_uom.name ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
- </td>
- </tr>
- </blockTable>
- </section>
- </story>
-</document>
=== removed file 'stock/report/packing.sxw'
Binary files stock/report/packing.sxw 2010-07-26 12:36:55 +0000 and stock/report/packing.sxw 1970-01-01 00:00:00 +0000 differ
=== modified file 'stock/report/picking.py'
--- stock/report/picking.py 2010-06-21 16:12:29 +0000
+++ stock/report/picking.py 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -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 <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -32,5 +32,4 @@
})
report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking)
-report_sxw.report_sxw('report.stock.packing.list2','stock.picking','addons/stock/report/packing.rml',parser=picking)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'stock/report/picking.rml'
--- stock/report/picking.rml 2010-09-03 12:33:25 +0000
+++ stock/report/picking.rml 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Picking" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(595.0,842.0)" title="Picking List" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
</pageTemplate>
@@ -69,7 +69,6 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Move_Line_Content_Other_State">
<blockAlignment value="LEFT"/>
@@ -79,17 +78,16 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="Standard" fontName="Times-Roman"/>
+ <paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -97,13 +95,13 @@
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Table Contents" fontName="Times-Roman"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="Table Contents" fontName="Helvetica"/>
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -116,10 +114,10 @@
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_5cm_Above_Space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_1cm_above_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+ <images/>
</stylesheet>
- <images/>
<story>
- <para style="terp_default_8">[[ repeatIn(objects,'picking') ]] </para>
+ <para style="terp_default_8">[[repeatIn(objects,'picking')]] </para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
@@ -128,16 +126,16 @@
<td>
<para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
<para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
- <para style="terp_default_9">[[ picking.address_id and picking.address_id.street2 or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '']]</para>
- <para style="terp_default_9">[[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '' ]]</para>
+ <para style="terp_default_9">[[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or removeParentNode('para') ]]</para>
<para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
</td>
<td>
- <para style="terp_default_9">[[ (picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
- <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street) or '' ]] </para>
- <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]] </para>
- <para style="terp_default_9">[[ (picking.address_id and picking.address_id.zip) or '' ]] [[ (picking.address_id and picking.address_id.city) or '' ]]</para>
+ <para style="terp_default_9">[[ picking.address_id and picking.address_id.title or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]</para>
+ <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
+ <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '' ]]</para>
<para style="terp_default_9">[[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or removeParentNode('para') ]]</para>
<para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
</td>
@@ -155,7 +153,7 @@
<blockTable colWidths="538.0" style="Table_Title_String">
<tr>
<td>
- <para style="terp_header">Picking List: [[ picking.name ]]</para>
+ <para style="terp_header">Packing List: [[ picking.name ]]</para>
</td>
</tr>
</blockTable>
@@ -177,30 +175,30 @@
<para style="terp_tblheader_General_Centre">Expected Shipping Date </para>
</td>
<td>
- <para style="terp_tblheader_General_Centre">Weight</para>
+ <para style="terp_tblheader_General_Centre">weight</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="123.0,134.0,133.0,134.0" style="Content_Order_Reference_Table">
<tr>
<td>
- <para style="terp_default_Centre_8">[[ picking.origin ]]</para>
+ <para style="terp_default_Centre_8">[[ picking.origin or '']]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ (picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and and picking.address_id.name) or '' ]] </para>
+ <para style="terp_default_Centre_8">[[ (picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and and picking.address_id.name) or '' ]] </para>
</td>
<td>
<para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">[[ 'weight' in picking._columns.keys() and picking.weight or '']] </para>
+ <para style="terp_default_Centre_8">[[ 'weight' in picking._columns.keys() and picking.weight or '']]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_5cm_Above_Space">
<font color="white"> </font>
</para>
- <blockTable colWidths="256.0,58.0,64.0,74.0,70.0" repeatRows="1" style="Move_Line_Header">
+ <blockTable colWidths="256.0,73.0,59.0,59.0,71.0" repeatRows="1" style="Move_Line_Header">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
@@ -212,71 +210,62 @@
<para style="terp_tblheader_Details">State</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Quantity</para>
+ <para style="terp_tblheader_Details_Centre">Quantity</para>
</td>
<td>
- <para style="terp_tblheader_Details">Location</para>
+ <para style="terp_tblheader_Details_Centre">Location</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]</para>
- <blockTable colWidths="257.0,58.0,61.0,54.0,20.0,70.0" style="Move_Line_Contect_Assign_State">[[ picking.move_lines or removeParentNode('blockTable')]]
+ [[ picking.move_lines or removeParentNode('section')]]
+ <blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
<tr>
<td>
- <para style="terp_default_9"><font> [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ] </font> <font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font> </para>
+ <para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </para>
</td>
<td>
- <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
+ <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_lines.state ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ move_lines.product_uom.name ]]</para>
+ <para style="terp_default_Right_9">[[ move_lines.product_qty ]] [[ move_lines.product_uom.name ]] </para>
</td>
<td>
<para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
</td>
</tr>
</blockTable>
-
-
- </section>
- <para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
+ </section>
+ <para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
<section>
- <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]</para>
- <blockTable colWidths="257.0,57.0,62.0,54.0,20.0,70.0" style="Move_Line_Content_Other_State">[[ picking.move_lines or removeParentNode('blockTable')]]
+ <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] </para>
+ [[ picking.move_lines or removeParentNode('section')]]
+ <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Move_Line_Content_Other_State">
<tr>
<td>
- <para style="terp_default_9"><font> [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ] </font> <font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font> </para>
+ <para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para>
</td>
<td>
- <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
+ <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_lines.state ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ move_lines.product_uom.name ]]</para>
+ <para style="terp_default_Right_9">[[ move_lines.product_qty ]] [[ move_lines.product_uom.name ]] </para>
</td>
<td>
<para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
</td>
</tr>
</blockTable>
+ <para style="terp_default_2">
+ <font color="white"> </font>
+ </para>
</section>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <para style="Standard">
- <font color="white"> </font>
- </para>
</story>
-</document>
+</document>
\ No newline at end of file
=== modified file 'stock/report/picking.sxw'
Binary files stock/report/picking.sxw 2010-08-27 10:05:22 +0000 and stock/report/picking.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'stock/report/stock_inventory_move.rml'
--- stock/report/stock_inventory_move.rml 2010-09-01 11:26:32 +0000
+++ stock/report/stock_inventory_move.rml 2010-09-14 08:41:49 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Inventory" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(595.0,842.0)" title="Stock Inventory" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@@ -47,7 +47,6 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
</blockTableStyle>
<blockTableStyle id="Table8">
<blockAlignment value="LEFT"/>
@@ -56,19 +55,16 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
</blockTableStyle>
<blockTableStyle id="Table7">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -155,22 +151,19 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="114.0,93.0,194.0,66.0,71.0" style="Table4">
+ <blockTable colWidths="114.0,93.0,194.0,138.0" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Location</para>
</td>
<td>
- <para style="terp_tblheader_Details">Production Lot</para>
+ <para style="terp_tblheader_Details_Centre">Production Lot</para>
</td>
<td>
<para style="terp_tblheader_Details">Product </para>
</td>
<td>
- <para style="terp_tblheader_Details">Quantity</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">UOM</para>
+ <para style="terp_tblheader_Details_Right">Quantity</para>
</td>
</tr>
</blockTable>
@@ -179,42 +172,30 @@
</para>
<section>
<para style="terp_default_9">[[ repeatIn(o.inventory_line_id, 'p') ]]</para>
- <blockTable colWidths="114.0,93.0,194.0,66.0,71.0" style="Table8">
+ <blockTable colWidths="114.0,93.0,194.0,138.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">[[ p.location_id.name ]]</para>
</td>
<td>
- <para style="terp_default_9">[[ p.prod_lot_id and p.prod_lot_id.name or '' ]]</para>
+ <para style="terp_default_Centre_9">[[ p.prod_lot_id and p.prod_lot_id.name or '' ]]</para>
</td>
<td>
<para style="terp_default_9">[[ p.product_id.name ]]</para>
</td>
<td>
- <para style="terp_default_9">[[ p.product_qty ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ p.product_uom.name ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(p.product_qty) ]] [[ p.product_uom.name ]]</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
</section>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="402.0,66.0,71.0" style="Table7">
+ <blockTable colWidths="402.0,137.0" style="Table7">
<tr>
<td>
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
- <para style="terp_default_Bold_9">[[ format(qty_total(o.inventory_line_id)['quantity']) ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_9">[[ format(qty_total(o.inventory_line_id)['uom']) ]]</para>
+ <para style="terp_default_Bold_Right_9">[[ format(qty_total(o.inventory_line_id)['quantity']) ]] [[ format(qty_total(o.inventory_line_id)['uom']) ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'stock/report/stock_inventory_move.sxw'
Binary files stock/report/stock_inventory_move.sxw 2010-09-01 11:26:32 +0000 and stock/report/stock_inventory_move.sxw 2010-09-14 08:41:49 +0000 differ
=== modified file 'survey/report/survey_analysis_report.py'
--- survey/report/survey_analysis_report.py 2010-09-01 05:21:18 +0000
+++ survey/report/survey_analysis_report.py 2010-09-14 08:41:49 +0000
@@ -115,18 +115,19 @@
<paraStyle name="P2" fontName="Helvetica" fontSize="14.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
</stylesheet>
<images/>
- <story>
- <para style="Title">Answer Summary</para>
- <para style="Standard"><font></font></para>
- <para style="P2">
- <font color="white"> </font>
- </para>"""
+ """
if datas.has_key('form') and datas['form']['survey_ids']:
ids = datas['form']['survey_ids']
for survey in surv_obj.browse(cr, uid, ids):
- rml += """<blockTable colWidths="280.0,100.0,120.0" style="Table_heading">
+ rml += """<story>
+ <para style="Title">Answer Summary</para>
+ <para style="Standard"><font></font></para>
+ <para style="P2">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="280.0,100.0,120.0" style="Table_heading">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Survey Title </para>
@@ -420,9 +421,9 @@
<td><para style="Standard1">""" + tools.ustr(survey.tot_start_survey - que.tot_resp) + """</para></td>
</tr>
</blockTable>"""
- rml += """<pageBreak/>"""
+ rml += """</story>"""
- rml += """</story></document>"""
+ rml += """</document>"""
report_type = datas.get('report_type', 'pdf')
create_doc = self.generators[report_type]
pdf = create_doc(rml, title=self.title)
Follow ups
