bzr revid: fp@tinyerp.com-20090609180946-su8lbwme4rv14vxs
This commit is contained in:
Fabien Pinckaers 2009-06-09 20:09:46 +02:00
commit 213da8bc73
69 changed files with 2549 additions and 1756 deletions

File diff suppressed because it is too large Load Diff

View File

@ -2,137 +2,297 @@
<document filename="test.pdf">
<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"/>
<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 Journal - [[ 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>
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
</template>
<stylesheet>
<blockTableStyle id="tbl_header">
<blockTableStyle id="Standard_Outline">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="tbl_code_name">
<blockTableStyle id="Table_Tilte">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="tbl_content">
<blockTableStyle id="Table_detail_header">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
<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">
<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="Table2">
<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"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<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"/>
</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"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" alignment="LEFT"/>
<paraStyle name="Heading_right" fontName="Helvetica" fontSize="8.0" alignment="RIGHT"/>
<paraStyle name="total" fontName="Helvetica-Bold" fontSize="8.5" alignment="LEFT"/>
<paraStyle name="total_right" fontName="Helvetica-Bold" fontSize="8.5" alignment="RIGHT"/>
<paraStyle name="tbl_content" fontName="Helvetica" fontSize="8.0" alignment="LEFT"/>
<paraStyle name="tbl_content_right" fontName="Helvetica" fontSize="8.0" alignment="RIGHT"/>
<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="CENTER" 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="11.0" leading="14" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P5" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P7" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" 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="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.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="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="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="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_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="11.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"/>
</stylesheet>
<images/>
<story>
<para style="Heading">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" style="tbl_header" repeatRows="1">
<tr>
<td><para style="Heading">Date</para></td>
<td><para style="Heading">Code</para></td>
<td><para style="Heading">Move name</para></td>
<td><para style="Heading">Account n°</para></td>
<td><para style="Heading_right">General</para></td>
<td><para style="Heading_right">Analytic</para></td>
</tr>
</blockTable>
<blockTable colWidths="450.0,48.0,48.0" style="tbl_code_name">
<para style="P12">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="539.0" style="Table_Tilte">
<tr>
<td><para style="total">[[ o.code ]] - [[ o.name ]]</para></td>
<td><para style="total_right"><u>[[ formatLang(sum_general(o.id,data['form']['date1'],data['form']['date2'])) ]]</u></para></td>
<td><para style="total_right"><u>[[ formatLang(sum_analytic(o.id,data['form']['date1'],data['form']['date2'])) ]]</u></para></td>
<td>
<para style="terp_header_Centre">Analitic Journal - [[ company.currency_id.name ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_header_Centre">Period from : [[ data['form']['date1'] ]]</para>
<para style="terp_header_Centre">to : [[ data['form']['date2'] ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_space">
<font color="white"> </font>
</para>
<blockTable colWidths="85.0,62.0,168.0,73.0,74.0,77.0" style="Table_detail_header">
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
</td>
<td>
<para style="terp_tblheader_Details">Code</para>
</td>
<td>
<para style="terp_tblheader_Details">Move Name</para>
</td>
<td>
<para style="terp_tblheader_Details">Account n°</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">General</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Analytic</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="118.0,28.0,168.0,73.0,74.0,77.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">[[ o.code ]] - [[ o.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_default_Right_9_Bold">[[ formatLang(sum_general(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(sum_analytic(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="tbl_content">[[ repeatIn(lines(o.id,data['form']['date1'],data['form']['date2']), 'move') ]]</para>
<blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" repeatRows="1" style="tbl_content">
<tr>
<td><para style="tbl_content"></para></td>
<td><para style="tbl_content"></para></td>
<td><para style="tbl_content">[[ move.name ]]</para></td>
<td><para style="tbl_content">[[ move.account_id.code ]] - [[ move.account_id.name ]]</para></td>
<td><para style="tbl_content_right">[[ formatLang(move.debit-move.credit) ]]</para></td>
<td><para style="tbl_content"></para></td>
</tr>
</blockTable>
<blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" style="tbl_content">
<tr>
<para style="terp_default_8">[[ repeatIn(lines(o.id,data['form']['date1'],data['form']['date2']), 'move') ]]</para>
<blockTable colWidths="85.0,62.0,168.0,73.0,74.0,77.0" style="Table2">
<tr>
<td>
<para style="tbl_content">[[ repeatIn(lines_a(move.id,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<para style="tbl_content">[[ formatLang(move_a.date,date = True) ]]</para>
<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_default_9">[[ move.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move.account_id.code ]] - [[ move.account_id.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move.debit-move.credit) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">
<font color="white"> </font>
</para>
</td>
<td><para style="tbl_content">[[ move_a.code ]]</para></td>
<td><para style="tbl_content">[[ move_a.name ]]</para></td>
<td><para style="tbl_content">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para></td>
<td><para style="tbl_content"></para></td>
<td><para style="tbl_content_right">[[ formatLang( move_a.amount) ]]</para></td>
</tr>
</blockTable>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_a(move.id,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<blockTable colWidths="85.0,62.0,168.0,73.0,74.0,77.0" style="Table4">
<tr>
<td>
<para style="terp_default_9">[[ move_a or removeParentNode('blockTable') ]] [[ formatLang(move_a.date,date = True) ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_a.code ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_a.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang( move_a.amount) ]]</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>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<blockTable colWidths="55.0,50.0,245.0,100.0,48.0,48.0" style="tbl_content">
<tr>
<para style="tbl_content">[[ repeatIn(lines_a(False,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<td><para style="tbl_content">[[ formatLang(move_a.date,date = True) ]]</para></td>
<td><para style="tbl_content">[[ move_a.code ]]</para></td>
<td><para style="tbl_content">[[ move_a.name ]]</para></td>
<td><para style="tbl_content">[[move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para></td>
<td><para style="tbl_content"></para></td>
<td><para style="tbl_content_right">[[ formatLang( move_a.amount) ]]</para></td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_a(False,o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<blockTable colWidths="85.0,62.0,168.0,73.0,74.0,77.0" style="Table3">
<tr>
<td>
<para style="terp_default_9">[[ move_a or removeParentNode('blockTable') ]] [[ formatLang(move_a.date,date = True) ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_a.code ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_a.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang( move_a.amount) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</story>
</document>
</document>

View File

@ -2,37 +2,7 @@
<document filename="test.pdf">
<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"/>
<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">Inverted 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>
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
</template>
<stylesheet>
@ -40,165 +10,209 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="tbl_header1">
<blockTableStyle id="Table_Title">
<blockAlignment value="LEFT"/>
<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"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockTableStyle id="Table_Header_table">
<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">
<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="Table4">
<blockAlignment value="LEFT"/>
<lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" 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"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Times-Bold" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Times-Roman" fontSize="6.0" leading="8"/>
<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="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.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="15.0" leading="19" 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-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_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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_tblheader_General" fontName="Helvetica" 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="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="6.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="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="RIGHT" 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_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_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="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"/>
</stylesheet>
<images/>
<story>
<blockTable colWidths="60.0,280.0,48.0,50.0,50.0,48.0" style="tbl_header1" repeatRows="1">
<blockTable colWidths="539.0" style="Table_Title">
<tr>
<td>
<para style="terp_tblheader_General">Code</para>
</td>
<td>
<para style="terp_tblheader_General">Account Name</para>
</td>
<td>
<para style="terp_tblheader_General_Right">Debit</para>
</td>
<td>
<para style="terp_tblheader_General_Right">Credit</para>
</td>
<td>
<para style="terp_tblheader_General_Right">Balance</para>
</td>
<td>
<para style="terp_tblheader_General_Right">Quantity</para>
<para style="terp_header_Centre">Inverted Analytic Balance - [[ company.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_space">
<font color="white"> </font>
</para>
<para style="terp_default_space">
<font color="white"> </font>
</para>
<blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table_Header_table">
<tr>
<td>
<para style="terp_tblheader_Details">Code</para>
</td>
<td>
<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>
</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="58.0,238.0,62.0,62.0,60.0,59.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">Total</para>
</td>
<td></td>
<td>
<para style="terp_tblheader_Details_Right"><u>[[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</u></para>
<para style="terp_tblheader_Details">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_tblheader_Details_Right"><u>[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</u></para>
<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"><u>[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]]</u></para>
<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"><u>[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</u></para>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]]</para>
</td>
</tr>
<tr>
<td>
<para style="P1">[[ repeatIn(lines_g(objects,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<blockTable colWidths="56.0,278.0,48.0,50.0,50.0,47.0" style="Table4">
<tr>
<td>
<para style="terp_default_8"><b>[[ move_g['code'] ]]</b> </para>
</td>
<td>
<para style="terp_default_8"><b>[[ move_g['name'] ]]</b></para>
</td>
<td>
<para style="terp_default_Right_8"><b><u>[[ formatLang(move_g['debit'])]]</u></b></para>
</td>
<td>
<para style="terp_default_Right_8"><b><u>[[formatLang(move_g['credit'])]]</u></b></para>
</td>
<td>
<para style="terp_default_Right_8"><b><u>[[ formatLang(move_g['balance'])]]</u></b></para>
</td>
<td>
<para style="terp_default_Right_8"><b><u>[[formatLang(move_g['quantity']) ]]</u></b></para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_8">[[ repeatIn(lines_a(objects,move_g['id'],data['form']['date1'],data['form']['date2']),'move_a') ]] </para>
<para style="terp_default_8">[[ move_a['code'] ]]</para>
</td>
<td>
<para style="terp_default_8">[[ move_a['complete_name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(move_a['debit']) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(move_a['credit']) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(move_a['balance']) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(move_a['quantity'] or 0.00) ]]</para>
</td>
</tr>
</blockTable>
<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">
<tr>
<td>
<para style="terp_default_Bold_9">[[ move_g or removeParentNode('blockTable') ]] [[ move_g['code'] ]]</para>
</td>
<td>
<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>
</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">
<tr>
<td>
<para style="terp_default_9">[[ move_a or removeParentNode('blockTable') ]] [[ move_a['code'] ]]</para>
</td>
<td>
<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>
</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>
</story>
</document>
</document>

View File

@ -2,7 +2,7 @@
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
</template>
<stylesheet>
@ -10,213 +10,303 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Tableau1">
<blockTableStyle id="Table_sub_header">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
<blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
<blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
<blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
<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="LINEAFTER" 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"/>
</blockTableStyle>
<blockTableStyle id="Table_sub_content">
<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="LINEAFTER" 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"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<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="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" 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"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<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="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<blockBackground colorName="#cccccc" start="0,0" stop="0,0"/>
<blockBackground colorName="#cccccc" start="1,0" stop="1,0"/>
<blockBackground colorName="#cccccc" start="2,0" stop="2,0"/>
<blockBackground colorName="#cccccc" start="3,0" stop="3,0"/>
<blockBackground colorName="#cccccc" start="4,0" stop="4,0"/>
<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="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" 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"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<blockBackground colorName="#cccccc" start="0,0" stop="0,0"/>
<blockBackground colorName="#cccccc" start="1,0" stop="1,0"/>
<blockBackground colorName="#cccccc" start="2,0" stop="2,0"/>
<blockBackground colorName="#cccccc" start="3,0" stop="3,0"/>
<blockBackground colorName="#cccccc" start="4,0" stop="4,0"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<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="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Times-Roman"/>
<paraStyle name="P2" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER"/>
<paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/>
<paraStyle name="P4" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/>
<paraStyle name="P5" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/>
<paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/>
<paraStyle name="P7" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P8" fontName="Times-Bold" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P9" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P13" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P15" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P16" fontName="Times-Bold" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P17" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.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="P1" fontName="Helvetica" fontSize="9.0" leading="11" 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"/>
<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="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="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_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_space_0.5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
</stylesheet>
<images/>
<story>
<blockTable colWidths="176.0,176.0,176.0" repeatRows="1" style="Tableau1">
<para style="terp_header_Centre">Crossovered Analytic - [[ company.currency_id.name ]]</para>
<para style="terp_header_Centre">[[ company.name ]]</para>
<para style="terp_default_space_0.5">
<font color="white"> </font>
</para>
<blockTable colWidths="180.0,180.0,180.0" style="Table_sub_header">
<tr>
<td>
<para style="P7">
<font color="white"> </font>
</para>
<para style="terp_tblheader_Details_Centre">From Date</para>
</td>
<td>
<para style="P8">Crossovered Analytic</para>
<para style="terp_tblheader_Details_Centre">To Date</para>
</td>
<td>
<para style="P9">
<font color="white"> </font>
</para>
<para style="P10">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="P7">[[ company.name ]]</para>
</td>
<td>
<para style="P11">Period from [[ data['form']['date1'] ]]</para>
<para style="P11">to [[ data['form']['date2'] ]]</para>
</td>
<td>
<para style="P10">Currency: [[ company.currency_id.name ]]</para>
<para style="terp_tblheader_Details_Centre">Printing date</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
<para style="P1">
<font color="white"> </font>
</para>
<para style="P4">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
<para style="P5">
<font color="white"> </font>
</para>
<para style="P6">Analytic Account Reference:</para>
<para style="P6">
<font color="white"> </font>
</para>
<blockTable colWidths="152.0,123.0,90.0,63.0,99.0" style="Table3">
<blockTable colWidths="180.0,180.0,180.0" style="Table_sub_content">
<tr>
<td>
<para style="P13">Account Name</para>
<para style="terp_tblheader_Details_Centre">[[ data['form']['date1'] ]] </para>
</td>
<td>
<para style="P13">Code</para>
<para style="terp_tblheader_Details_Centre">[[ data['form']['date2'] ]]</para>
</td>
<td>
<para style="P13">Quantity</para>
</td>
<td>
<para style="P13">Amount</para>
</td>
<td>
<para style="P13">Percentage</para>
<para style="terp_tblheader_Details_Centre">[[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="152.0,123.0,90.0,63.0,100.0" style="Table4">
<para style="terp_default_space_0.5">
<font color="white"> </font>
</para>
<para style="terp_default_Bold_9">Analytic Account Reference:</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="155.0,125.0,92.0,65.0,101.0" style="Table5">
<tr>
<td>
<para style="P14">[[ repeatIn(ref_lines(data['form']),'a') ]]<font face="Times-Roman" size="10.0">[[ a['ref_name'] ]]</font></para>
<para style="terp_tblheader_Details_Centre">Account Name</para>
</td>
<td>
<para style="P12">[[ a['ref_code'] ]]</para>
<para style="terp_tblheader_Details_Centre">Code</para>
</td>
<td>
<para style="P12">[[ '%.2f' % a['ref_qty'] ]]</para>
<para style="terp_tblheader_Details_Right">Quantity</para>
</td>
<td>
<para style="P12">[[ '%.2f' % a['ref_amt'] ]]</para>
<para style="terp_tblheader_Details_Right">Amount</para>
</td>
<td>
<para style="P12">100.00%</para>
<para style="terp_tblheader_Details_Right">Percentage</para>
</td>
</tr>
</blockTable>
<para style="P4">
<para style="terp_default_2">
<font color="white"> </font>
</para>
<para style="P4">
<section>
<para style="terp_default_9">[[ repeatIn(ref_lines(data['form']),'a') ]]</para>
<blockTable colWidths="155.0,125.0,92.0,64.0,102.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">
<font face="Helvetica" size="10.0">[[ a['ref_name'] ]]</font>
</para>
</td>
<td>
<para style="terp_default_9">[[ a['ref_code'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ '%.2f' % a['ref_qty'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ '%.2f' % a['ref_amt'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">100.00%</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2"/>
</section>
<para style="terp_default_space_0.5">
<font color="white"> </font>
</para>
<para style="P3">
<para style="terp_default_Bold_9">Analytic Account :</para>
<para style="terp_default_Bold_9">
<font color="white"> </font>
</para>
<para style="P3">
<font color="white"> </font>
</para>
<blockTable colWidths="152.0,123.0,89.0,64.0,99.0" style="Table1">
<blockTable colWidths="155.0,126.0,91.0,65.0,101.0" style="Table3">
<tr>
<td>
<para style="P13">Account Name</para>
<para style="terp_tblheader_Details_Centre">Account Name</para>
</td>
<td>
<para style="P13">Code</para>
<para style="terp_tblheader_Details_Centre">Code</para>
</td>
<td>
<para style="P13">Quantity</para>
<para style="terp_tblheader_Details_Right">Quantity</para>
</td>
<td>
<para style="P13">Amount</para>
<para style="terp_tblheader_Details_Right">Amount</para>
</td>
<td>
<para style="P13">Percentage</para>
<para style="terp_tblheader_Details_Right">Percentage</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="152.0,123.0,89.0,64.0,99.0" style="Table2">
<tr>
<td>
<para style="P15">[[ repeatIn(lines(data['form']),'a') ]] </para>
<para style="P15">[[a['acc_name'] ]]</para>
</td>
<td>
<para style="P12">[[ a['code'] ]]</para>
</td>
<td>
<para style="P12">[[ '%.2f' % a['qty'] ]]</para>
</td>
<td>
<para style="P12">[[ '%.2f' % a['amt'] ]]</para>
</td>
<td>
<para style="P12">[[ '%.2f' % a['perc'] ]]%</para>
</td>
</tr>
</blockTable>
<para style="P2">
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_9">[[ repeatIn(lines(data['form']),'a') ]]</para>
<blockTable colWidths="156.0,126.0,91.0,66.0,101.0" style="Table4">
<tr>
<td>
<para style="terp_default_9">[[ a['acc_name'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ a['code'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ '%.2f' % a['qty'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ '%.2f' % a['amt'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ '%.2f' % a['perc'] ]]%</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</story>
</document>

View File

@ -68,14 +68,15 @@
<paraStyle name="P5" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P6" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P7" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P7a" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0" />
<paraStyle name="P8b" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
<paraStyle name="P8a" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" />
<paraStyle name="P9" fontName="Times-Italic" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="3.0"/>
<paraStyle name="P10" fontName="Helvetica-Bold" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11a" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Helvetica-Bold" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11a" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P13" fontName="Helvetica-Bold" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" fontName="Helvetica" fontSize="12.0" leading="13" alignment="LEFT"/>
<paraStyle name="P15" fontName="Helvetica" fontSize="12.0" leading="13" alignment="CENTER"/>
@ -139,42 +140,35 @@
<para style="P8b">
<font color="white"></font>
</para>
<blockTable colWidths="212.0,62.0,62.0,70.0,61.0,74.0" style="Tableau6">
<blockTable colWidths="274.0,62.0,70.0,67.0,68.0" style="Tableau6">
<tr>
<td><para style="P3">Description</para></td>
<td><para style="P4">Taxes</para></td>
<td><para style="P4">Quantity</para></td>
<td><para style="P3">Description / Taxes</para></td>
<td><para style="P3">Quantity</para></td>
<td><para style="P4">Unit Price</para></td>
<td><para style="P4">Disc. (%)</para></td>
<td><para style="P4a">Price</para></td>
<td><para style="P3">Price</para></td>
</tr>
</blockTable>
<section>
<para style="P20">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
<blockTable colWidths="0.0,221.5,60.0,31.0,16.0,31.0,39.0,61.0,45.0,23.0" style="Tableau7">
<blockTable colWidths="0.0,240.0,77.5,41.0,39.0,50.0,79.0" style="Tableau7">
<tr>
<td><para style="P8">[[ a['type']=='text' and removeParentNode('blockTable')]]</para></td>
<td><para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]]</para></td>
<td><para style="P8a">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['tax_types'] ]]</para></td>
<td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para></td>
<td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['uos'] ]]</para></td>
<td><para><font color="white"></font></para></td>
<td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para></td>
<td><para style="Table Contents1">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para></td>
<td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_subtotal'] ]]</para></td>
<td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['currency'] ]]</para></td>
<td><para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] / ( [[ a['tax_types'] ]] )</para></td>
<td><para style="P7a">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para></td>
<td><para style="P5">[[ a['uos'] ]]</para></td>
<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para></td>
<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para></td>
<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]]<font>[[ a['price_subtotal'] ]]</font><font> [[ a['currency'] ]]</font></para></td>
</tr>
<tr>
<td><para style="P8"><font color="white"></font></para></td>
<td><para style="terp_default_Note">[[ format(a['note'] or removeParentNode('tr')) ]]</para></td>
<td><para style="P8a"><font color="white"></font></para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
<td><para style="terp_default_Note">Note : [[ format(a['note'] or removeParentNode('tr')) ]]</para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
<td><para><font color="white"></font></para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
<td><para style="P7"><font color="white"></font></para></td>
<td><para style="Table Contents1"><font color="white"></font></para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
</tr>
</blockTable>
<blockTable colWidths="453.0,74.0" style="Tableau8">
@ -184,18 +178,17 @@
</tr>
</blockTable>
<pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
<blockTable colWidths="212.0,62.0,62.0,70.0,61.0,74.0" style="Tableau6">
<blockTable colWidths="274.0,62.0,70.0,67.0,68.0" style="Tableau6">
<tr>
<td><para style="P3">Description [[ a['type']!='break' and removeParentNode('blockTable')]]</para></td>
<td><para style="P4">Taxes</para></td>
<td><para style="P3">Description/Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para></td>
<td><para style="P4">Quantity</para></td>
<td><para style="P4">Unit Price</para></td>
<td><para style="P4">Disc. (%)</para></td>
<td><para style="P4a">Price</para></td>
<td><para style="P3">Price</para></td>
</tr>
</blockTable>
</section>
<blockTable colWidths="340.0,191.0" style="Tableau3">
<blockTable colWidths="321.0,210.0" style="Tableau3">
<tr>
<td>
<blockTable colWidths="100.0,73.0,100.0" style="Tableau8">
@ -212,14 +205,14 @@
</blockTable>
</td>
<td>
<blockTable colWidths="110.0,81.0" style="Tableau5">
<blockTable colWidths="110.0,90.0" style="Tableau5">
<tr>
<td><para style="P13">Total (Excl. taxes):</para></td>
<td><para style="P12"><u>[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</u></para></td>
</tr>
<tr>
<td><para style="P13">Taxes:</para></td>
<td><para style="P12"><u>[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</u></para></td>
<td><para style="P11a">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para></td>
</tr>
<tr>
<td><para style="P13">Total <font>(Incl. taxes):</font></para></td>

View File

@ -29,8 +29,10 @@
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="-1,1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,1"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,2" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Tableau8">
<blockAlignment value="LEFT"/>
@ -68,14 +70,15 @@
<paraStyle name="P5" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P6" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P7" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P7a" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0" />
<paraStyle name="P8b" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
<paraStyle name="P8a" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" />
<paraStyle name="P9" fontName="Times-Italic" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="3.0"/>
<paraStyle name="P10" fontName="Helvetica-Bold" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11a" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Helvetica-Bold" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11a" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P13" fontName="Helvetica-Bold" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" fontName="Helvetica" fontSize="12.0" leading="13" alignment="LEFT"/>
<paraStyle name="P15" fontName="Helvetica" fontSize="12.0" leading="13" alignment="CENTER"/>
@ -139,42 +142,35 @@
<para style="P17"><font>Invoice Date: </font><font>[[ formatLang(o.date_invoice,date=True) ]]</font></para>
<para style="P18"><font>Customer Ref:</font> [[ o.address_invoice_id.partner_id.ref or '/' ]]</para>
<para style="P8b"><font color="white"> </font></para>
<blockTable colWidths="212.0,62.0,62.0,70.0,61.0,74.0" style="Tableau6">
<tr>
<td><para style="P3">Description</para></td>
<td><para style="P4">Taxes</para></td>
<td><para style="P4">Quantity</para></td>
<td><para style="P4">Unit Price</para></td>
<td><para style="P4">Disc. (%)</para></td>
<td><para style="P4a">Price</para></td>
</tr>
<blockTable colWidths="274.0,62.0,70.0,67.0,68.0" style="Tableau6">
<tr>
<td><para style="P3">Description / Taxes</para></td>
<td><para style="P3">Quantity</para></td>
<td><para style="P4">Unit Price</para></td>
<td><para style="P4">Disc. (%)</para></td>
<td><para style="P3">Price</para></td>
</tr>
</blockTable>
<section>
<para style="P20">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
<blockTable colWidths="0.0,221.5,60.0,31.0,16.0,31.0,39.0,61.0,45.0,23.0" style="Tableau7">
<blockTable colWidths="0.0,240.0,77.5,41.0,39.0,50.0,79.0" style="Tableau7">
<tr>
<td><para style="P8">[[ a['type']=='text' and removeParentNode('blockTable')]]</para></td>
<td><para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]]</para></td>
<td><para style="P8a">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['tax_types'] ]]</para></td>
<td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para></td>
<td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['uos'] ]]</para></td>
<td><para><font color="white"></font></para></td>
<td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para></td>
<td><para style="Table Contents1">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para></td>
<td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_subtotal'] ]]</para></td>
<td><para style="Table Contents">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['currency'] ]]</para></td>
<td><para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] / ( [[ a['tax_types'] ]] )</para></td>
<td><para style="P7a">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para></td>
<td><para style="P5">[[ a['uos'] ]]</para></td>
<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para></td>
<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para></td>
<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]]<font>[[ a['price_subtotal'] ]]</font><font> [[ a['currency'] ]]</font></para></td>
</tr>
<tr>
<td><para style="P8"><font color="white"></font></para></td>
<td><para style="terp_default_Note">[[ format(a['note'] or '') ]]</para></td>
<td><para style="P8a"><font color="white"></font></para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
<td><para style="terp_default_Note">Note : [[ format(a['note'] or removeParentNode('tr')) ]]</para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
<td><para><font color="white"></font></para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
<td><para style="P7"><font color="white"></font></para></td>
<td><para style="Table Contents1"><font color="white"></font></para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
</tr>
</blockTable>
<blockTable colWidths="453.0,74.0" style="Tableau8">
@ -184,21 +180,20 @@
</tr>
</blockTable>
<pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
<blockTable colWidths="212.0,62.0,62.0,70.0,61.0,74.0" style="Tableau6">
<blockTable colWidths="274.0,62.0,70.0,67.0,68.0" style="Tableau6">
<tr>
<td><para style="P3">Description [[ a['type']!='break' and removeParentNode('blockTable')]]</para></td>
<td><para style="P4">Taxes</para></td>
<td><para style="P3">Description/Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para></td>
<td><para style="P4">Quantity</para></td>
<td><para style="P4">Unit Price</para></td>
<td><para style="P4">Disc. (%)</para></td>
<td><para style="P4a">Price</para></td>
<td><para style="P3">Price</para></td>
</tr>
</blockTable>
</section>
<blockTable colWidths="340.0,191.0" style="Tableau3">
<blockTable colWidths="321.0,210.0" style="Tableau3">
<tr>
<td>
<blockTable colWidths="81.0,73.0,65.0" style="Tableau8">
<blockTable colWidths="100.0,73.0,100.0" style="Tableau8">
<tr>
<td><para style="P10"><font color="white"></font></para></td>
<td><para style="P8"><font color="white"></font></para></td>
@ -212,18 +207,18 @@
</blockTable>
</td>
<td>
<blockTable colWidths="110.0,81.0" style="Tableau5">
<blockTable colWidths="110.0,90.0" style="Tableau5">
<tr>
<td><para style="P13">Total (Excl. taxes):</para></td>
<td><para style="P12"><u>[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</u></para></td>
</tr>
<tr>
<td><para style="P13">Taxes:</para></td>
<td><para style="P12"><u>[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</u></para></td>
<td><para style="P11a">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para></td>
</tr>
<tr>
<td><para style="P13">Total <font>(Incl. taxes):</font></para></td>
<td><para style="P22"><u>[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]</u></para></td>
<td><para style="P12"><u>[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]</u></para></td>
</tr>
</blockTable>
</td>

View File

@ -17,109 +17,137 @@
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
<blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/>
<blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
<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="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<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"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Times-Roman" fontSize="16.0" leading="20"/>
<paraStyle name="P2" fontName="Times-Roman" alignment="CENTER"/>
<paraStyle name="P3" fontName="Times-Roman" alignment="RIGHT"/>
<paraStyle name="P4" fontName="Times-Roman" alignment="LEFT"/>
<paraStyle name="P5" fontName="Times-Roman" alignment="CENTER"/>
<paraStyle name="P6" fontName="Times-Roman" alignment="RIGHT"/>
<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-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="P1" fontName="Helvetica" alignment="LEFT"/>
<paraStyle name="P2" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="P3" fontName="Helvetica" alignment="RIGHT"/>
<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"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
<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"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.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="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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="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_Space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_space_0.2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.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>
<para style="Standard">[[ repeatIn(objects, 'o') ]]</para>
<para style="Standard">
<para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="264.0,264.0" style="Table3">
<tr>
<td>
<para style="Table Contents">
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="Table Contents">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']]</para>
<para style="Table Contents">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']]</para>
<para style="Table Contents">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or '']]</para>
<para style="Table Contents">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']]</para>
<para style="Table Contents">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or '' ]]</para>
<para style="Table Contents">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']]</para>
<para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']]</para>
<para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']]</para>
<para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or '']]</para>
<para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']]</para>
<para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or '' ]]</para>
<para style="terp_default_9">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<para style="terp_default_Space">
<font color="white"> </font>
</para>
<para style="Standard">
<font color="white"> </font>
</para>
<para style="P1">[[ o.mode and o.mode.name ]]</para>
<para style="Standard">
<para style="terp_header">[[ o.mode and o.mode.name ]]</para>
<para style="terp_default_space_0.2">
<font color="white"> </font>
</para>
<para style="Standard">Reference: [[ o.reference ]]</para>
<para style="Standard">Execution date: [[ o.date_done or '/']]</para>
<para style="Standard">
<para style="terp_default_9">Reference: [[ o.reference ]]</para>
<para style="terp_default_9">Execution date: [[ o.date_done or '/']]</para>
<para style="terp_default_space_0.2">
<font color="white"> </font>
</para>
<blockTable colWidths="83.0,98.0,190.0,70.0,85.0" style="Table2">
<tr>
<td>
<para style="P4">Partner</para>
<para style="P1">Partner</para>
</td>
<td>
<para style="P4">Bank account</para>
<para style="P1">Bank account</para>
</td>
<td>
<para style="P4">Reference</para>
<para style="P1">Reference</para>
</td>
<td>
<para style="P5">Date</para>
<para style="P2">Date</para>
</td>
<td>
<para style="P6">Amount</para>
<para style="P3">Amount</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="83.0,98.0,190.0,70.0,85.0" style="Table1">
<tr>
<td>
<para style="Table Contents">[[repeatIn(o.line_ids, 'line') ]]</para>
<para style="Table Contents">[[ line.partner_id and line.partner_id.name or '' ]]</para>
<para style="terp_default_9">[[repeatIn(o.line_ids, 'line') ]]</para>
<para style="terp_default_9">[[ line.partner_id and line.partner_id.name or '' ]]</para>
</td>
<td>
<para style="Table Contents">[[ line.bank_id and line.bank_id.name ]]</para>
<para style="terp_default_9">[[ line.bank_id and line.bank_id.name ]]</para>
</td>
<td>
<para style="Table Contents">[[ line.name ]]</para>
<para style="terp_default_9">[[ line.name ]]</para>
</td>
<td>
<para style="P2">[[ line.date ]]</para>
<para style="terp_default_9">[[ line.date ]]</para>
</td>
<td>
<para style="P3">[[ formatLang(line.amount_currency) ]] [[ line.currency.name ]]</para>
<para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.name ]]</para>
</td>
</tr>
</blockTable>
@ -128,4 +156,3 @@
</para>
</story>
</document>

View File

@ -65,90 +65,44 @@
</stylesheet>
<images/>
<story>
<para style="P1">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="146.0,223.0,158.0" repeatRows="1" style="Table2">
<tr>
<td>
<para style="P9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P10">Accounting Report</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="P5">[[ company.name ]]</para>
</td>
<td>
<para style="P4">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P2">Currency: <font face="Times-Roman" size="11.0">[[ company.currency_id.name]]</font>
</para>
</td>
</tr>
</blockTable>
<para style="P3">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
<blockTable colWidths="361.0,73.0,93.0" repeatRows="1" style="Table4">
<tr>
<td>
<para style="P6">Name</para>
</td>
<td>
<para style="P6">Code</para>
</td>
<td>
<para style="P6">Amount</para>
</td>
</tr>
</blockTable>
<para style="P3">
<font color="white"> </font>
</para>
<section>
<para style="P7">[[repeatIn(childs(o.id),'obj')]]</para>
<blockTable colWidths="362.0,73.0,93.0" repeatRows="1" style="Table3">
<tr>
<td>
<para style="P11"><font color="white">[[ '....'*(obj['level']) ]]</font>[[ obj['name'] ]]</para>
</td>
<td>
<para style="P11">[[obj['code'] ]]</para>
</td>
<td>
<para style="P12">[['%.2f' % obj['amount'] ]] </para>
</td>
</tr>
<tr>
<td>
<para style="P13">[[ repeatIn((obj['note'] and obj['note'].splitlines()) or [], 'l') ]]</para>
<para style="P14">[[ l or removeParentNode('table') ]]</para>
</td>
<td>
<para style="P14">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P8">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<para style="P1">
<font color="white"> </font>
</para>
</section>
<para style="P1">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="146.0,223.0,158.0" repeatRows="1" style="Table2">
<tr>
<td><para style="P9"><font color="white"> </font></para></td>
<td><para style="P10">Accounting Report</para></td>
<td><para style="P2"><font color="white"> </font></para></td>
</tr>
<tr>
<td><para style="P5">[[ company.name ]]</para></td>
<td><para style="P4"><font color="white"> </font></para></td>
<td><para style="P2">Currency: <font face="Times-Roman" size="11.0">[[ company.currency_id.name]]</font></para></td>
</tr>
</blockTable>
<para style="P3">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
<blockTable colWidths="361.0,73.0,93.0" repeatRows="1" style="Table4">
<tr>
<td><para style="P6">Name</para></td>
<td><para style="P6">Code</para></td>
<td><para style="P6">Amount</para></td>
</tr>
</blockTable>
<para style="P3"><font color="white"> </font></para>
<section>
<para style="P7">[[repeatIn(childs(o.id),'obj')]]</para>
<blockTable colWidths="362.0,73.0,93.0" repeatRows="1" style="Table3">
<tr>
<td><para style="P11"><font color="white">[[ '....'*(obj['level']) ]]</font><font>[[ obj['name'] ]]</font></para></td>
<td><para style="P11">[[obj['code'] ]]</para></td>
<td><para style="P12">[['%.2f' % obj['amount'] ]] </para></td>
</tr>
<tr>
<td><para style="P13">[[ repeatIn((obj['note'] and obj['note'].splitlines()) or [], 'l') ]]</para><para style="P14">[[ l or removeParentNode('table') ]]</para></td>
<td><para style="P14"><font color="white"> </font></para></td>
<td><para style="P8"><font color="white"> </font></para></td>
</tr>
</blockTable>
<para style="P1"><font color="white"> </font></para>
</section>
</story>
</document>

View File

@ -73,13 +73,6 @@ import tools
import os
parents = {
'tr':1,
'li':1,
'story': 0,
'section': 0
}
class accounting_report_indicator(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
@ -91,6 +84,7 @@ class accounting_report_indicator(report_sxw.rml_parse):
'lines':self.lines,
'getarray':self.getarray,
'gettree':self.gettree,
'getarray_head':self.getarray_head,
})
self.count = 0
self.treecount = 0
@ -98,61 +92,8 @@ class accounting_report_indicator(report_sxw.rml_parse):
self.header_name = []
self.header_val = []
self.main_dict = {}
def repeatIn(self, lst, name, nodes_parent=False,td=False,width=[],value=[],type=[],data=''):
self._node.data = ''
node = self._find_parent(self._node, nodes_parent or parents)
ns = node.nextSibling
#start
if (not name in ['array','array_header']):
return super(accounting_report_indicator,self).repeatIn(lst, name, nodes_parent=False)
array_header = eval(data,{'year':'Fiscal Year','periods':'Periods'})
# value = [array_header]
value = []
value.extend(self.header_name)
if name=='array':
type = ['float']*len(self.header_name)
else:
type = ['lable'] * (len(self.header_name))
width = [438/float(len(value))]*(len(value))
if not lst:
lst.append(1)
for ns in node.childNodes :
if ns and ns.nodeName!='#text' and ns.tagName=='blockTable' and td :
width_str = ns._attrs['colWidths'].nodeValue
ns.removeAttribute('colWidths')
# total_td = td * len(value)
if not width:
for v in value:
width.append(30)
for v in range(len(width)):
width_str +=',%d'%width[v]
ns.setAttribute('colWidths',width_str)
child_list = ns.childNodes
for child in child_list:
if child.nodeName=='tr':
lc = child.childNodes[1]
i=0
for v in value:
newnode = lc.cloneNode(1)
if type[i] == 'float':
t1="[[ '%.2f' % " + "%s['%s'] ]]"%(name,v)
if type[i] == 'lable':
t1="%s"%(v)
else:
t1="[[ %s['%s'] ]]"%(name,v)
newnode.childNodes[1].lastChild.data = t1
child.appendChild(newnode)
newnode=False
i+=1
return super(accounting_report_indicator,self).repeatIn(lst, name, nodes_parent=False)
#
def lines(self,data):
res={}
@ -193,12 +134,30 @@ class accounting_report_indicator(report_sxw.rml_parse):
result.append(res)
return result
def getarray_head(self,data,object,array_header=''):
self.getgraph(data,object,intercall=True)
self.header_val=[str(x) for x in self.header_val]
if data['select_base'] == 'year':
year = [1,2,3,4,5,6,7,8]
temp_head = [str(x) for x in self.header_name]
head_dict = dict(zip(year,temp_head))
else:
temp_head = [str(x[0:3]) for x in self.header_name]
head_dict = dict(zip(temp_head,temp_head))
print "head_dict",head_dict
return [head_dict]
def getarray(self,data,object,array_header=''):
res={}
result=[]
self.getgraph(data,object,intercall=True)
self.header_val=[str(x) for x in self.header_val]
temp_dict=zip(self.header_name,self.header_val)
self.header_val = [str(x) for x in self.header_val]
if data['select_base'] == 'year':
year = [1,2,3,4,5,6,7,8]
temp_dict = zip(year,self.header_val)
else:
temp_head = [str(x[0:3]) for x in self.header_name]
temp_dict = zip(temp_head,self.header_val)
res=dict(temp_dict)
array_header = eval(array_header,{'year':'Fiscal Year','periods':'Periods'})
res[array_header]=object['name']

View File

@ -81,101 +81,93 @@
</stylesheet>
<images/>
<story>
<blockTable colWidths="520.0" style="Standard_Outline">
<blockTable colWidths="520.0" style="Standard_Outline">
<tr>
<td>
<para style="terp_header_Centre">Indicators</para>
</td>
<td><para style="terp_header_Centre">Indicators</para></td>
</tr>
</blockTable>
<blockTable colWidths="264.0,264.0" style="Table2">
</blockTable>
<blockTable colWidths="264.0,264.0" style="Table2">
<tr>
<td><para style="P14">[[ company.name ]]</para></td>
<td><para style="P4">Currency: <font face="Times-Roman" size="11.0">[[ company.currency_id.name]]</font></para></td>
</tr>
</blockTable>
<para style="P4"><font color="white"> </font></para>
<para style="P1">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
<blockTable colWidths="528.0" style="Table4">
<tr>
<td>
<para style="P14">[[ company.name ]]</para>
</td>
<td>
<para style="P4">Currency: <font face="Times-Roman" size="11.0">[[ company.currency_id.name]]</font>
</para>
</td>
<para style="P6">Name</para></td>
</tr>
</blockTable>
<para style="P4">
<font color="white"> </font>
</para>
<para style="P1">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
<blockTable colWidths="528.0" style="Table4">
<tr>
<td>
<para style="P6">Name</para>
</td>
</tr>
</blockTable>
<para style="P3">
<font color="white"> </font>
</para>
<para style="P3"><seqReset/></para>
<section>
<para style="P1">[[ repeatIn(lines(data['form']),'o')]]</para>
<blockTable colWidths="528.0" style="Table7">
<tr>
<td>
<para style="P11"><font>[['.....'*(o['level']) ]][[ setTag('font','font',{'color':'white'}) ]]</font><b>(<seq/>)</b> [[ o['type']=='view' and setTag('para','para',{'fontName':'Helvetica-Bold','fontSize':'10.5'}) ]][[ o['name'] ]] ([[ o['code'] ]])</para>
</td>
</tr>
</blockTable>
<para style="P1">[[ o['disp_tree'] and setTag('para','image',{'file':gettree(data['form'],o)}) or removeParentNode('para') ]]</para>
<para style="P1">[[ o['disp_graph'] and setTag('para','image',{'width':'450.00','height':'215.00','file':getgraph(data['form'],o)}) or removeParentNode('para') ]]</para>
<para style="P3">
<font color="white"> </font>
</para>
<blockTable colWidths="528.0" repeatRows="1" style="Table7">
<tr><td>
<para style="P5"><font>[['..........'*(o['level']) ]][[ setTag('font','font',{'color':'white'}) ]]</font><b>Expression :</b> [[ o['expression'] ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="528.0" repeatRows="1" style="Table7">
<tr>
<td>
<para style="P5"> <font>[['..........'*(o['level']) ]][[ setTag('font','font',{'color':'white'}) ]]</font> [[ format(o['note']) or removeParentNode('blockTable') ]]</para>
</td>
</tr>
</blockTable>
</section>
<pageBreak/>
<para style="P10">
<u>Tabular Summary</u>
</para>
<section>
<para style="P13">[[ repeatIn(getarray(data['form'],o,array_header=data['form']['select_base']),'array_header',td=len(data['form']['base_selection'][0][2]),data=data['form']['select_base']) or removeParentNode('section') ]]</para>
<blockTable colWidths="0.00,90.00" style="Table4">
</blockTable>
<para style="P3"><font color="white"> </font></para>
<para style="P3"><seqReset/></para>
<section>
<para style="P1">[[ repeatIn(lines(data['form']),'o')]]</para>
<blockTable colWidths="528.0" style="Table7">
<tr>
<td><para style="P11"><font color="white">[['.....'*(o['level']) ]]</font><font>[[ o['type']=='view' and setTag('para','para',{'fontName':'Helvetica-Bold','fontSize':'10.5'}) ]]</font>(<seq/>)<font>[[ o['name'] ]] ([[ o['code'] ]])</font></para></td>
</tr>
</blockTable>
<para style="P1">[[ o['disp_tree'] and setTag('para','image',{'file':gettree(data['form'],o)}) or removeParentNode('para') ]]</para>
<para style="P1">[[ o['disp_graph'] and setTag('para','image',{'width':'450.00','height':'215.00','file':getgraph(data['form'],o)}) or removeParentNode('para') ]]</para>
<para style="P3"><font color="white"> </font></para>
<blockTable colWidths="528.0" repeatRows="1" style="Table7">
<tr>
<td><para style="P5"><font color="white">[['..........' *(o['level']) ]]</font><b>Expression :</b>[[ o['expression'] ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="528.0" repeatRows="1" style="Table7">
<tr>
<td><para style="P5"> <font color="white">[['..........'*(o['level']) ]]</font> <font>[[ format(o['note']) or removeParentNode('blockTable') ]]</font></para></td>
</tr>
</blockTable>
</section>
<pageBreak/>
<para style="P10"><u>Tabular Summary</u></para>
<section>
<para style="P13">[[ repeatIn(getarray_head(data['form'],o,array_header=data['form']['select_base']),'array_header')]]</para>
<blockTable colWidths="90,36,36,36,36,36,36,36,36,36,36,36,36" style="Table4">
<tr>
<td>
<para style="P3"> </para>
</td>
<td>
<para style="P3">Indicators</para>
</td>
<td><para style="P3">Indicators</para></td>
<td><para style="P3">[[ array_header['Jan'] or '' ]][[ array_header[1] or '' ]]</para></td>
<td><para style="P3">[[ array_header['Feb'] or '' ]][[ array_header[2] or '' ]]</para></td>
<td><para style="P3">[[ array_header['Mar'] or '' ]][[ array_header[3] or '' ]]</para></td>
<td><para style="P3">[[ array_header['Apr'] or '' ]][[ array_header[4] or '' ]]</para></td>
<td><para style="P3">[[ array_header['May'] or '' ]][[ array_header[5] or '' ]]</para></td>
<td><para style="P3">[[ array_header['Jun'] or '' ]][[ array_header[6] or '' ]]</para></td>
<td><para style="P3">[[ array_header['Jul'] or '' ]][[ array_header[7] or '' ]]</para></td>
<td><para style="P3">[[ array_header['Aug'] or '' ]][[ array_header[8] or '' ]]</para></td>
<td><para style="P3">[[ array_header['Sep'] or '' ]]</para></td>
<td><para style="P3">[[ array_header['Oct'] or '' ]]</para></td>
<td><para style="P3">[[ array_header['Nov'] or '' ]]</para></td>
<td><para style="P3">[[ array_header['Dec'] or '' ]]</para></td>
</tr>
</blockTable>
</section>
<section>
</section>
<section>
<para style="P1">[[ repeatIn(lines(data['form']),'obj')]]</para>
<para style="P13">[[ repeatIn(getarray(data['form'],obj,array_header=data['form']['select_base']),'array',td=len(data['form']['base_selection'][0][2]),data=data['form']['select_base']) or removeParentNode('section') ]]</para>
<blockTable colWidths="0.00,90.00" style="Table3">
<section>
<para style="P13">[[ repeatIn(getarray(data['form'],obj,array_header=data['form']['select_base']),'array')]]</para>
<blockTable colWidths="90,36,36,36,36,36,36,36,36,36,36,36,36" style="Table3">
<tr>
<td>
<para style="P9"> </para>
</td>
<td>
<para style="P5"><font>[['.....'*(obj['level']) ]][[ setTag('font','font',{'color':'white'}) ]]</font>[[ obj['code'] ]]</para>
</td>
<td><para style="P5"><font color="white">[['.....'*(obj['level']) ]]</font><font>[[ obj['code'] ]]</font></para></td>
<td><para style="P3">[[ array['Jan'] or '' ]][[ array[1] or '' ]]</para></td>
<td><para style="P3">[[ array['Feb'] or '' ]][[ array[2] or '' ]]</para></td>
<td><para style="P3">[[ array['Mar'] or '' ]][[ array[3] or '' ]]</para></td>
<td><para style="P3">[[ array['Apr'] or '' ]][[ array[4] or '' ]]</para></td>
<td><para style="P3">[[ array['May'] or '' ]][[ array[5] or '' ]]</para></td>
<td><para style="P3">[[ array['Jun'] or '' ]][[ array[6] or '' ]]</para></td>
<td><para style="P3">[[ array['Jul'] or '' ]][[ array[7] or '' ]]</para></td>
<td><para style="P3">[[ array['Aug'] or '' ]][[ array[8] or '' ]]</para></td>
<td><para style="P3">[[ array['Sep'] or '' ]]</para></td>
<td><para style="P3">[[ array['Oct'] or '' ]]</para></td>
<td><para style="P3">[[ array['Nov'] or '' ]]</para></td>
<td><para style="P3">[[ array['Dec'] or '' ]]</para></td>
</tr>
</blockTable>
</section>
</section>
</section>
</story>
</document>

View File

@ -98,7 +98,10 @@ class account_report_bs(osv.osv):
'report_type' : fields.selection([('only_obj', 'Report Objects Only'),('with_account', 'Report Objects With Accounts'),('acc_with_child', 'Report Objects With Accounts and child of Accounts')],"Report Type")
}
_defaults = {
'report_type': lambda *a :'only_obj'
'report_type': lambda *a :'only_obj',
'color_font': lambda *a :'',
'color_back': lambda *a :'',
'font_style': lambda *a :'',
}
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):

View File

@ -94,7 +94,7 @@
</para>
</td>
<td>
<para style="P1"><font>[[o.name]] [[o.font_style and (setTag('font','font',{'face':o.font_style} ) ) ]] [[ o.color_font and ( setTag('font','font',{'color':o.color_font.name})) ]] [[ o.color_back and ( setTag('para','para',{'backColor':o.color_back.name})) ]]</font></para>
<para style="P1"><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]]</font></para>
</td>
<td>
<para style="P2">
@ -119,15 +119,14 @@
<blockTable colWidths="131.0,280.0,131.0" style="Table4">
<tr>
<td>
<para style="P10">[[ repeatIn(lines(data['form'],object=o), 'a') ]]<font> [[ a['code'] ]] [[ (a['font_style']) and (setTag('font','font',{'face':a['font_style']})) or (a['level']==1 and (setTag('para','para',{'fontName':'Helvetica-Bold'}))) ]] [[ a['color_font'] and ( setTag('font','font',{'color':a['color_font']})) ]] [[ a['color_back'] and ( setTag('para','para',{'backColor':a['color_back']})) ]]</font></para>
<para style="P10"><font>[[ repeatIn(lines(data['form'],object=o), 'a') ]]</font><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['code'] ]]</font></para>
</td>
<td>
<para style="P17"><font><font color="white">[[ '..'*(a['level']-1) ]]</font> [[ a['name'] ]] [[ (a['font_style']) and (setTag('font','font',{'face':a['font_style']})) or (a['level']==1 and (setTag('para','para',{'fontName':'Helvetica-Bold'}))) ]] [[ a['color_font'] and ( setTag('font','font',{'color':a['color_font']})) ]] [[ a['color_back'] and ( setTag('para','para',{'backColor':a['color_back']})) ]]</font></para>
<para style="P17"><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['name'] ]]</font></para>
</td>
<td>
<para style="P18"><font>[[ '%.2f'% a['balance'] ]] [[ (a['font_style']) and (setTag('font','font',{'face':a['font_style']})) or (a['level']==1 and (setTag('para','para',{'fontName':'Helvetica-Bold'}))) ]] [[ a['color_font'] and ( setTag('font','font',{'color':a['color_font']})) ]] [[ a['color_back'] and ( setTag('para','para',{'backColor':a['color_back']})) ]]</font></para>
<para style="P18"><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]][[ '%.2f'% a['balance'] ]]</font></para>
</td>
</tr>
</blockTable>
<para style="Standard">

View File

@ -82,7 +82,7 @@
<para style="P5">
<font color="white"> </font>
</para>
<para style="P6">[[ setTag('para','image',{'width':'100.0','height':'80.0','name':str(o.id)}) ]][[ o.image or setTag('image','para') ]]</para>
<para style="P6">[[ o.image and setTag('para','image',{'width':'100.0','height':'80.0','name':str(o.id)}) ]][[ o.image ]]</para>
<para style="P7">
<font face="Times-Roman"/>
</para>

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:14:30+0000\n"
"PO-Revision-Date: 2009-05-20 10:14:30+0000\n"
"POT-Creation-Date: 2009-04-09 13:21:53+0000\n"
"PO-Revision-Date: 2009-04-09 13:21:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:36:37+0000\n"
"PO-Revision-Date: 2009-05-20 10:36:37+0000\n"
"POT-Creation-Date: 2009-04-09 13:53:08+0000\n"
"PO-Revision-Date: 2009-04-09 13:53:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:15:53+0000\n"
"PO-Revision-Date: 2009-05-20 10:15:53+0000\n"
"POT-Creation-Date: 2009-04-09 13:24:08+0000\n"
"PO-Revision-Date: 2009-04-09 13:24:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr "Улица2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr "Телефон"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:15:11+0000\n"
"PO-Revision-Date: 2009-05-20 10:15:11+0000\n"
"POT-Creation-Date: 2009-04-09 13:23:01+0000\n"
"PO-Revision-Date: 2009-04-09 13:23:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:16:35+0000\n"
"PO-Revision-Date: 2009-05-20 10:16:35+0000\n"
"POT-Creation-Date: 2009-04-09 13:25:15+0000\n"
"PO-Revision-Date: 2009-04-09 13:25:15+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,8 +119,8 @@ msgstr "Carrer 2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgstr "Defineix companyia principal"
msgid "Report Information"
msgstr "Informació dels informes"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,phone:0
@ -131,8 +131,8 @@ msgstr "Telèfon"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgstr "Informació dels informes"
msgid "Define Main Company"
msgstr "Defineix companyia principal"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,name:0

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:34:10+0000\n"
"PO-Revision-Date: 2009-05-20 10:34:10+0000\n"
"POT-Creation-Date: 2009-02-06 15:17:42+0000\n"
"PO-Revision-Date: 2009-02-06 15:17:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:19:25+0000\n"
"PO-Revision-Date: 2009-05-20 10:19:25+0000\n"
"POT-Creation-Date: 2009-04-09 13:29:42+0000\n"
"PO-Revision-Date: 2009-04-09 13:29:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr "Ulice2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr "Telefon"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:23:07+0000\n"
"PO-Revision-Date: 2009-05-20 10:23:07+0000\n"
"POT-Creation-Date: 2009-04-09 13:35:34+0000\n"
"PO-Revision-Date: 2009-04-09 13:35:34+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,8 +119,8 @@ msgstr "Strasse2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgstr "Haupt Gesellschaft Defnieren"
msgid "Report Information"
msgstr "Report Information"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,phone:0
@ -131,8 +131,8 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgstr "Report Information"
msgid "Define Main Company"
msgstr "Haupt Gesellschaft Defnieren"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,name:0

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:30:53+0000\n"
"PO-Revision-Date: 2009-05-20 10:30:53+0000\n"
"POT-Creation-Date: 2009-04-09 13:47:16+0000\n"
"PO-Revision-Date: 2009-04-09 13:47:16+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:31:42+0000\n"
"PO-Revision-Date: 2009-05-20 10:31:42+0000\n"
"POT-Creation-Date: 2009-04-09 13:48:29+0000\n"
"PO-Revision-Date: 2009-04-09 13:48:29+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,8 +119,8 @@ msgstr "Calle 2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgstr "Definir compañia principal"
msgid "Report Information"
msgstr "Información de los informes"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,phone:0
@ -131,8 +131,8 @@ msgstr "Teléfono"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgstr "Información de los informes"
msgid "Define Main Company"
msgstr "Definir compañia principal"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,name:0

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:21:36+0000\n"
"PO-Revision-Date: 2009-05-20 10:21:36+0000\n"
"POT-Creation-Date: 2009-04-09 13:33:12+0000\n"
"PO-Revision-Date: 2009-04-09 13:33:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,8 +119,8 @@ msgstr "Tänav2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgstr "Määra Emaettevõte"
msgid "Report Information"
msgstr "Aruande informatsioon"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,phone:0
@ -131,8 +131,8 @@ msgstr "Telefon"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgstr "Aruande informatsioon"
msgid "Define Main Company"
msgstr "Määra Emaettevõte"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,name:0
@ -252,7 +252,7 @@ msgstr "Logo"
#. module: base_setup
#: model:ir.module.module,shortdesc:base_setup.module_meta_information
msgid "Base Setup"
msgstr "Baashäälestus"
msgstr ""
#. module: base_setup
#: wizard_button:base_setup.base_setup,company,init:0

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
"POT-Creation-Date: 2009-04-09 13:34:23+0000\n"
"PO-Revision-Date: 2009-04-09 13:34:23+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,8 +119,8 @@ msgstr "Rue (suite)"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgstr "Définir la société principale"
msgid "Report Information"
msgstr "Rapport d'information"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,phone:0
@ -131,8 +131,8 @@ msgstr "Téléphone"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgstr "Rapport d'information"
msgid "Define Main Company"
msgstr "Définir la société principale"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,name:0

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:18:42+0000\n"
"PO-Revision-Date: 2009-05-20 10:18:42+0000\n"
"POT-Creation-Date: 2009-04-09 13:28:34+0000\n"
"PO-Revision-Date: 2009-04-09 13:28:34+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:23:52+0000\n"
"PO-Revision-Date: 2009-05-20 10:23:52+0000\n"
"POT-Creation-Date: 2009-04-09 13:36:43+0000\n"
"PO-Revision-Date: 2009-04-09 13:36:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:24:38+0000\n"
"PO-Revision-Date: 2009-05-20 10:24:38+0000\n"
"POT-Creation-Date: 2009-04-09 13:37:54+0000\n"
"PO-Revision-Date: 2009-04-09 13:37:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,8 +119,8 @@ msgstr "Indirizzo 2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgstr "Definisci Azienda Principale"
msgid "Report Information"
msgstr "Informazion Report"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,phone:0
@ -131,8 +131,8 @@ msgstr "Telefono"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgstr "Informazion Report"
msgid "Define Main Company"
msgstr "Definisci Azienda Principale"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,name:0

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:25:25+0000\n"
"PO-Revision-Date: 2009-05-20 10:25:25+0000\n"
"POT-Creation-Date: 2009-04-09 13:39:04+0000\n"
"PO-Revision-Date: 2009-04-09 13:39:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:20:09+0000\n"
"PO-Revision-Date: 2009-05-20 10:20:09+0000\n"
"POT-Creation-Date: 2009-04-09 13:30:51+0000\n"
"PO-Revision-Date: 2009-04-09 13:30:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:20:52+0000\n"
"PO-Revision-Date: 2009-05-20 10:20:52+0000\n"
"POT-Creation-Date: 2009-04-09 13:32:02+0000\n"
"PO-Revision-Date: 2009-04-09 13:32:02+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,8 +119,8 @@ msgstr "Adres 2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgstr "Defineer moederorganisatie"
msgid "Report Information"
msgstr "Rapportinformatie"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,phone:0
@ -131,8 +131,8 @@ msgstr "Telefoon"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgstr "Rapportinformatie"
msgid "Define Main Company"
msgstr "Defineer moederorganisatie"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,name:0

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:26:10+0000\n"
"PO-Revision-Date: 2009-05-20 10:26:10+0000\n"
"POT-Creation-Date: 2009-04-09 13:40:14+0000\n"
"PO-Revision-Date: 2009-04-09 13:40:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr "Telefon"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:26:56+0000\n"
"PO-Revision-Date: 2009-05-20 10:26:56+0000\n"
"POT-Creation-Date: 2009-04-09 13:41:23+0000\n"
"PO-Revision-Date: 2009-04-09 13:41:23+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -25,7 +25,7 @@ msgstr "Cidade"
#. module: base_setup
#: wizard_view:base_setup.base_setup,finish:0
msgid "You can start configuring the system or connect directly to the database using the default setup."
msgstr "Você pode começar a configurar o sistema ou conectar diretamente a base de dados usando a configuração padrão."
msgstr "Voce pode iniciar configurando seu sistema ou conectando diretamente a base de dados usando o setup padrão."
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,zip:0
@ -52,12 +52,12 @@ msgstr "Iniciar configuração"
#. module: base_setup
#: wizard_view:base_setup.base_setup,init:0
msgid "You'll be able to install more modules later through the Administration menu."
msgstr "Você será capaz de instalar mais módulos posteriormente através do menu Administração."
msgstr "Voce poderá instala novos módulos mais tarde através do menu Administração."
#. module: base_setup
#: wizard_view:base_setup.base_setup,init:0
msgid "A profile sets a pre-selection of modules for specific needs. These profiles have been setup to help you discover the different aspects of OpenERP. This is just an overview, we have 300+ available modules."
msgstr "Um perfil configura uma pré-seleção dos módulos para necessidades específicas. Estes perfis foram configurados para ajudá-lo a descobrir os diferentes aspectos do OpenERP. Esta é apenas uma visão geral, nós temos mais de 300 módulos disponíveis."
msgstr ""
#. module: base_setup
#: wizard_button:base_setup.base_setup,company,update:0
@ -82,7 +82,7 @@ msgstr "Estado"
#. module: base_setup
#: wizard_view:base_setup.base_setup,finish:0
msgid "Your new database is now fully installed."
msgstr "Sua nova base de dados está agora completamente instalada."
msgstr "Sua nova base de dados já esta instalada."
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,profile:0
@ -108,7 +108,7 @@ msgstr "Rodapé 2 do relatório"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "General Information"
msgstr "Informação geral"
msgstr "Informações Gerais"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,street2:0
@ -119,8 +119,8 @@ msgstr "Complemento"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgstr "Definir empresa principal"
msgid "Report Information"
msgstr "Relatório de informação"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,phone:0
@ -131,8 +131,8 @@ msgstr "Telefone"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgstr "Relatório de informação"
msgid "Define Main Company"
msgstr "Definir empresa principal"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,name:0
@ -148,8 +148,7 @@ msgstr "Nome da Empresa"
msgid "This sentence will appear at the bottom of your reports.\n"
"We suggest you to put bank information here:\n"
"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
msgstr "Esta frase aparecerá no rodapé de seus relatórios.\n"
"Sugerimos que coloque informações bancarias aqui:"
msgstr ""
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,country_id:0
@ -166,7 +165,7 @@ msgstr "País"
#: model:ir.actions.wizard,name:base_setup.action_wizard_setup
#: model:ir.actions.wizard,name:base_setup.wizard_base_setup
msgid "Setup"
msgstr "Configurar"
msgstr "Setup"
#. module: base_setup
#: help:base_setup.base_setup,company,rml_footer1:0
@ -175,15 +174,12 @@ msgstr "Configurar"
msgid "This sentence will appear at the bottom of your reports.\n"
"We suggest you to write legal sentences here:\n"
"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
msgstr "Esta frase aparecerá no rodapé de seus relatórios.\\n"
"\n"
"Sugerimos que escreva uma frase válida aqui:\n"
"Web: http://openerp.com - Fax: +55.00.0000.0000"
msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,update:0
msgid "Summary"
msgstr "Resumo"
msgstr "Sumário"
#. module: base_setup
#: wizard_button:base_setup.base_setup,update,finish:0
@ -193,7 +189,7 @@ msgstr "Instalar"
#. module: base_setup
#: wizard_view:base_setup.base_setup,finish:0
msgid "Installation Done"
msgstr "Instalação concluída"
msgstr "Instalado"
#. module: base_setup
#: help:base_setup.base_setup,company,rml_header1:0
@ -202,11 +198,7 @@ msgstr "Instalação concluída"
msgid "This sentence will appear at the top right corner of your reports.\n"
"We suggest you to put a slogan here:\n"
"\"Open Source Business Solutions\"."
msgstr "Esta frase aparecerá no canto superior direito de seus relatórios.\\n"
"\n"
"Nós sugerimos que coloque um slogan aqui:\\n"
"\n"
"\\\"Soluções de negócios em código aberto\\\"."
msgstr ""
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,rml_header1:0
@ -218,7 +210,7 @@ msgstr "Cabeçalho do relatório"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Your Logo - Use a size of about 450x150 pixels."
msgstr "Seu logotipo - Use um tamanho de aproximadamente 450x150 pixels."
msgstr "Seu logotipo usa um tamanho acima de que 450x150 pixels."
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,currency:0
@ -254,7 +246,7 @@ msgstr "Logotipo"
#. module: base_setup
#: model:ir.module.module,shortdesc:base_setup.module_meta_information
msgid "Base Setup"
msgstr "Configurar base"
msgstr ""
#. module: base_setup
#: wizard_button:base_setup.base_setup,company,init:0

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:27:42+0000\n"
"PO-Revision-Date: 2009-05-20 10:27:42+0000\n"
"POT-Creation-Date: 2009-04-09 13:42:33+0000\n"
"PO-Revision-Date: 2009-04-09 13:42:33+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,8 +119,8 @@ msgstr "Rua2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgstr "Definir empresa principal"
msgid "Report Information"
msgstr "Informação do relatório"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,phone:0
@ -131,8 +131,8 @@ msgstr "Telefone"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgstr "Informação do relatório"
msgid "Define Main Company"
msgstr "Definir empresa principal"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,name:0

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:28:28+0000\n"
"PO-Revision-Date: 2009-05-20 10:28:28+0000\n"
"POT-Creation-Date: 2009-04-09 13:43:42+0000\n"
"PO-Revision-Date: 2009-04-09 13:43:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:29:16+0000\n"
"PO-Revision-Date: 2009-05-20 10:29:16+0000\n"
"POT-Creation-Date: 2009-04-09 13:44:55+0000\n"
"PO-Revision-Date: 2009-04-09 13:44:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,8 +119,8 @@ msgstr "Улица (2-я строка)"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgstr "Задать головную компанию"
msgid "Report Information"
msgstr ""
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,phone:0
@ -131,8 +131,8 @@ msgstr "Телефон"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgstr ""
msgid "Define Main Company"
msgstr "Задать головную компанию"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,name:0

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:30:05+0000\n"
"PO-Revision-Date: 2009-05-20 10:30:05+0000\n"
"POT-Creation-Date: 2009-04-09 13:46:06+0000\n"
"PO-Revision-Date: 2009-04-09 13:46:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,8 +119,8 @@ msgstr "Naslov 2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgstr "Določi glavno družbo"
msgid "Report Information"
msgstr ""
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,phone:0
@ -131,8 +131,8 @@ msgstr "Telefon"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgstr ""
msgid "Define Main Company"
msgstr "Določi glavno družbo"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,name:0

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:32:31+0000\n"
"PO-Revision-Date: 2009-05-20 10:32:31+0000\n"
"POT-Creation-Date: 2009-04-09 13:49:40+0000\n"
"PO-Revision-Date: 2009-04-09 13:49:40+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:34:58+0000\n"
"PO-Revision-Date: 2009-05-20 10:34:58+0000\n"
"POT-Creation-Date: 2009-02-06 15:19:09+0000\n"
"PO-Revision-Date: 2009-02-06 15:19:09+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:33:21+0000\n"
"PO-Revision-Date: 2009-05-20 10:33:21+0000\n"
"POT-Creation-Date: 2009-04-09 13:50:50+0000\n"
"PO-Revision-Date: 2009-04-09 13:50:50+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:35:48+0000\n"
"PO-Revision-Date: 2009-05-20 10:35:48+0000\n"
"POT-Creation-Date: 2009-04-09 13:52:00+0000\n"
"PO-Revision-Date: 2009-04-09 13:52:00+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr "Вулиця2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr "Телефон"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:17:17+0000\n"
"PO-Revision-Date: 2009-05-20 10:17:17+0000\n"
"POT-Creation-Date: 2009-04-09 13:26:21+0000\n"
"PO-Revision-Date: 2009-04-09 13:26:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr "街区地址5"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr "电话"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:18:00+0000\n"
"PO-Revision-Date: 2009-05-20 10:18:00+0000\n"
"POT-Creation-Date: 2009-04-09 13:27:28+0000\n"
"PO-Revision-Date: 2009-04-09 13:27:28+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -119,7 +119,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
msgid "Report Information"
msgstr ""
#. module: base_setup
@ -131,7 +131,7 @@ msgstr ""
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
msgid "Define Main Company"
msgstr ""
#. module: base_setup

View File

@ -389,7 +389,7 @@ class crm_case(osv.osv):
'partner_id': _get_default_partner,
'partner_address_id': _get_default_partner_address,
'email_from': _get_default_email,
'state': lambda *a: 'open',
'state': lambda *a: 'draft',
'priority': lambda *a: AVAILABLE_PRIORITIES[2][0],
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
}
@ -500,11 +500,12 @@ class crm_case(osv.osv):
if action.act_mail_to_partner:
emails.append(case.email_from)
if action.act_mail_to_watchers:
emails += (case.email_cc or '').split(',')
emails += (action.act_email_cc or '').split(',')
if action.act_mail_to_email:
emails += (action.act_mail_to_email or '').split(',')
emails = filter(None, emails)
if len(emails) and action.act_mail_body:
emails = list(set(emails))
self.email_send(cr, uid, case, emails, action.act_mail_body)
break
action_ids = newactions

View File

@ -136,11 +136,7 @@ class abstracted_fs:
res = cr.fetchone()
if res and len(res):
self.db_name_list.append(db_name)
cr.commit()
except Exception,e:
log(e)
if cr:
cr.rollback()
cr.commit()
finally:
if cr is not None:
cr.close()

View File

@ -296,6 +296,8 @@
</td>
</tr>
</blockTable>
</section>
<section>
<para style="terp_default_8">[[ repeatIn(line(data['form'], [j.id],[e.id]), 'l') ]] </para>
<blockTable colWidths="155.0,64.0,61.0,71.0,66.0,52.0,50.0" style="Table_Move_line">
<tr>

File diff suppressed because it is too large Load Diff

View File

@ -56,14 +56,16 @@ class mrp_production_workcenter_line(osv.osv):
res[op.id]=False
return res
def _get_date_end(self, cr, uid, ids, field_name, arg, context):
res={}
res = {}
for op in self.browse(cr, uid, ids, context=context):
d = DateTime.strptime(op.date_planned,'%Y-%m-%d %H:%M:%S')
i = self.pool.get('hr.timesheet.group').interval_get(cr, uid, op.workcenter_id.timesheet_id.id or False, d, op.hour or 0.0)
if i:
res[op.id] = i[-1][1].strftime('%Y-%m-%d %H:%M:%S')
else:
res[op.id] = op.date_planned
res[op.id]= False
if op.date_planned:
d = DateTime.strptime(op.date_planned,'%Y-%m-%d %H:%M:%S')
i = self.pool.get('hr.timesheet.group').interval_get(cr, uid, op.workcenter_id.timesheet_id.id or False, d, op.hour or 0.0)
if i:
res[op.id] = i[-1][1].strftime('%Y-%m-%d %H:%M:%S')
else:
res[op.id] = op.date_planned
return res
_inherit = 'mrp.production.workcenter.line'
_columns = {

View File

@ -1,8 +1,8 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(5.5cm,2.8cm)" title="Test" author="Martin Simon" allowSplitting="20">
<template pageSize="(550,280)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="0.1cm" y1="0.1cm" width="5.3cm" height="2.4cm"/>
<frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
</pageTemplate>
</template>
<stylesheet>
@ -34,7 +34,7 @@
<tr>
<td>
<para style="P1">[[ str(o.name) ]] ([[ str(o.code) ]])</para>
<barCode code="code128" x="26.9mm" height="68.1mm" quiet="9" fontName="Times-Roman" fontSize="50" alignment="CENTER">[['ID'+str(o.id)]]</barCode>
<barCode code="code128" x="300" height="180" quiet="9" fontName="Times-Roman" fontSize="50" alignment="CENTER">[['ID'+str(o.id)]]</barCode>
</td>
</tr>
</blockTable>

View File

@ -1,8 +1,8 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(5.5cm,2.8cm)" title="Test" author="Martin Simon" allowSplitting="20">
<template pageSize="(550,280)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="0.1cm" y1="0.1cm" width="5.3cm" height="2.4cm"/>
<frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
</pageTemplate>
</template>
<stylesheet>
@ -34,7 +34,7 @@
<tr>
<td>
<para style="P1">[[ str(o.name) ]]</para>
<barCode code="code128" x="26.9mm" height="68.1mm" quiet="9" fontName="Times-Roman" fontSize="50" alignment="CENTER">[['ID'+str(o.id)]]</barCode>
<barCode code="code128" x="300" height="180" quiet="9" fontName="Times-Roman" fontSize="50" alignment="CENTER">[['ID'+str(o.id)]]</barCode>
</td>
</tr>
</blockTable>

View File

@ -277,18 +277,17 @@
</tr>
</blockTable>
<section>
<para style="P30">
<font color="white"> </font>
</para>
<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">
<tr>
<td>
<para style="P4"><font face="Times-Roman" size="2.0">[[ repeatIn(o.operations,'line') ]]</font>Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] </para>
<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">[[ line.name ]][[ (line.to_invoice==True) or removeParentNode('tr') ]]</para>
<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>
@ -306,14 +305,17 @@
</tr>
</blockTable>
</section>
<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">
<tr>
<td>
<para style="P21">[[ repeatIn(o.fees_lines,'fees') ]]</para>
<para style="P21"></para>
</td>
<td>
<para style="P3">[[ fees.name ]][[ (fees.to_invoice==True) or removeParentNode('tr') ]]</para>
<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>
@ -329,6 +331,7 @@
</td>
</tr>
</blockTable>
</section>
<para style="P22">
<font color="white"> </font>
</para>

View File

@ -26,6 +26,7 @@ from osv import fields, osv
from mx import DateTime
from tools.translate import _
import tools
from wizard import except_wizard
class pos_config_journal(osv.osv):
@ -44,11 +45,11 @@ class pos_order(osv.osv):
_name = "pos.order"
_description = "Point of Sale"
_order = "date_order, create_date desc"
_order = "date_order desc"
_order = "date_order desc, name desc"
def unlink(self, cr, uid, ids, context={}):
for rec in self.browse(cr, uid, ids, context=context):
if rec.state<>'draft':
if rec.state != 'draft':
raise osv.except_osv(_('Invalid action !'), _('Cannot delete a point of sale which is already confirmed !'))
return super(pos_order, self).unlink(cr, uid, ids, context=context)
@ -56,7 +57,7 @@ class pos_order(osv.osv):
if not part:
return {}
pricelist = self.pool.get('res.partner').browse(cr, uid, part).property_product_pricelist.id
return {'value':{'pricelist_id': pricelist}}
return {'value': {'pricelist_id': pricelist}}
def _amount_total(self, cr, uid, ids, field_name, arg, context):
id_set = ",".join(map(str, ids))
@ -68,7 +69,7 @@ class pos_order(osv.osv):
) AS amount
FROM pos_order p
LEFT OUTER JOIN pos_order_line l ON (p.id=l.order_id)
WHERE p.id IN (""" + id_set +""") GROUP BY p.id """)
WHERE p.id IN (""" + id_set +""") GROUP BY p.id """)
res = dict(cr.fetchall())
for rec in self.browse(cr, uid, ids, context):
@ -281,21 +282,21 @@ class pos_order(osv.osv):
# delete this product from old picking:
for old_line in old_picking.move_lines:
if old_line.product_id.id == p_id:
old_line.write(cr, uid, [old_line.id], {'state': 'draft'}) # cannot delete if not draft
old_line.unlink(cr, uid, [old_line.id], context)
old_line.write({'state': 'draft'}, context=context) # cannot delete if not draft
old_line.unlink(context=context)
elif qty_to_del > 0: # product qty has been modified (customer took less than the ordered quantity):
# subtract qty from old picking:
for old_line in old_picking.move_lines:
if old_line.product_id.id == p_id:
old_line.write(cr, uid, [old_line.id], {'product_qty': old_line.product_qty - qty_to_del})
old_line.write({'product_qty': old_line.product_qty - qty_to_del}, context=context)
# add qty to new picking:
line.write(cr, uid, [line.id], {'product_qty': qty_to_del})
line.write({'product_qty': qty_to_del}, context=context)
else: # product hasn't changed (customer took it without any change):
# delete this product from new picking:
line.unlink(cr, uid, [line.id], context)
line.unlink(context=context)
else:
# delete it in the new picking:
line.unlink(cr, uid, [line.id], context)
line.unlink(context=context)
def create_picking(self, cr, uid, ids, context={}):
"""Create a picking for each order and validate it."""
@ -476,7 +477,6 @@ class pos_order(osv.osv):
})
clone_list.append(clone_id)
for clone in self.browse(cr, uid, clone_list):
for order_line in clone.lines:
line_obj.write(cr, uid, [order_line.id], {
@ -507,6 +507,10 @@ class pos_order(osv.osv):
'price_type': 'tax_included'
}
inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', order.partner_id.id)['value'])
if not self.pool.get('res.partner').browse(cr, uid, inv['partner_id']).address:
raise osv.except_osv(_('Error'), _('Unable to create invoice (partner has no address).'))
inv_id = inv_ref.create(cr, uid, inv, context)
self.write(cr, uid, [order.id], {'invoice_id': inv_id, 'state': 'invoiced'})
@ -690,12 +694,18 @@ class pos_order(osv.osv):
for payment in order.payments:
if not payment.journal_id.default_debit_account_id:
raise osv.except_osv(_('No Default Debit Account !'),
_('You have to define a Default Debit Account for your Financial Journals!\n'))
if not payment.journal_id.default_credit_account_id:
raise osv.except_osv(_('No Default Credit Account !'),
_('You have to define a Default Credit Account for your Financial Journals!\n'))
if payment.amount > 0:
payment_account = \
payment.journal_id.default_debit_account_id.id
payment_account = payment.journal_id.default_debit_account_id.id
else:
payment_account = \
payment.journal_id.default_credit_account_id.id
payment_account = payment.journal_id.default_credit_account_id.id
if payment.amount > 0:
order_account = \
@ -823,7 +833,7 @@ class pos_order_line(osv.osv):
product_id = self.pool.get('product.product').search(cr, uid, [('ean13','=', ean)])
if not product_id:
return False
return False
# search price product
product = self.pool.get('product.product').read(cr, uid, product_id)
@ -845,7 +855,7 @@ class pos_order_line(osv.osv):
}
line_id = self.create(cr, uid, vals)
if not line_id:
raise wizard.except_wizard(_('Error'), _('Create line failed !'))
raise except_wizard(_('Error'), _('Create line failed !'))
else:
vals = {
'qty': qty,
@ -853,7 +863,7 @@ class pos_order_line(osv.osv):
}
line_id = self.write(cr, uid, order_line_id, vals)
if not line_id:
raise wizard.except_wizard(_('Error'), _('Modify line failed !'))
raise except_wizard(_('Error'), _('Modify line failed !'))
line_id = order_line_id
price_line = float(qty)*float(price)

View File

@ -1,53 +1,53 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<openerp>
<data>
<report
id="pos_receipt"
string="Receipt"
model="pos.order"
name="pos.receipt"
rml="point_of_sale/report/pos_receipt.rml"
auto="False"
header="False"
/>
<data>
<report
id="pos_receipt"
string="Receipt"
model="pos.order"
name="pos.receipt"
rml="point_of_sale/report/pos_receipt.rml"
auto="False"
header="False"
/>
<report
id="pos_invoice_report"
string="Invoice"
model="pos.order"
name="pos.invoice"
auto="False"
rml="account/report/invoice.rml"
/>
<report
id="pos_invoice_report"
string="Invoice"
model="pos.order"
name="pos.invoice"
auto="False"
rml="point_of_sale/report/pos_invoice.rml"
/>
<report
id="pos_lines_detail"
string="Details of Sales"
model="pos.order"
name="pos.details"
auto="False"
multi="True"
rml="point_of_sale/report/pos_details.rml"
/>
<report
id="pos_lines_detail"
string="Details of Sales"
model="pos.order"
name="pos.details"
auto="False"
multi="True"
rml="point_of_sale/report/pos_details.rml"
/>
<report
id="pos_details_summary"
string="Sales (summary)"
model="pos.order"
name="pos.details_summary"
auto="False"
multi="True"
rml="point_of_sale/report/pos_details_summary.rml"
/>
<report
id="pos_details_summary"
string="Sales (summary)"
model="pos.order"
name="pos.details_summary"
auto="False"
multi="True"
rml="point_of_sale/report/pos_details_summary.rml"
/>
<report
id="pos_lines_report"
string="Pos Lines"
model="pos.order"
name="pos.lines"
auto="False"
rml="point_of_sale/report/pos_lines.rml"
/>
<report
id="pos_lines_report"
string="Pos Lines"
model="pos.order"
name="pos.lines"
auto="False"
rml="point_of_sale/report/pos_lines.rml"
/>
</data>
</data>
</openerp>

View File

@ -1,33 +1,33 @@
<?xml version="1.0"?>
<openerp>
<data>
<data>
<wizard string="Refund Orders" model="pos.order"
name="pos.refund_order" id="pos_refund" menu="False"/>
<wizard string="Refund Orders" model="pos.order"
name="pos.refund_order" id="pos_refund" menu="True"/>
<wizard string="Payment" model="pos.order"
name="pos.payment" id="pos_payment" menu="False"/>
<wizard string="Payment" model="pos.order"
name="pos.payment" id="pos_payment" menu="False"/>
<!--<wizard string="Create Invoices" model="pos.order"
name="pos.create_invoice" id="pos_invoice" multi="True"/>-->
<!--<wizard string="Create Invoices" model="pos.order"
name="pos.create_invoice" id="pos_invoice" multi="True"/>-->
<wizard string="Add products" model="pos.order"
name="pos.add_product" id="pos_add_product" menu="False"/>
<wizard string="Add products" model="pos.order"
name="pos.add_product" id="pos_add_product" menu="False"/>
<!--<wizard string="Cancel" model="pos.order"
name="pos.cancel" id="pos_cancel" multi="True"/>-->
<!--<wizard string="Cancel" model="pos.order"
name="pos.cancel" id="pos_cancel" multi="True"/>-->
<wizard string="Confirm" model="pos.order"
name="pos.confirm" id="pos_confirm" multi="True"/>
<wizard string="Confirm" model="pos.order"
name="pos.confirm" id="pos_confirm" multi="True"/>
<wizard string="Discount" model="pos.order"
name="pos.discount" id="pos_discount" menu="False"/>
<wizard string="Discount" model="pos.order"
name="pos.discount" id="pos_discount" menu="False"/>
<wizard string="Get From Order" model="pos.order"
name="pos.sale.get" id="pos_sale_get"/>
<wizard string="Get From Order" model="pos.order"
name="pos.sale.get" id="pos_sale_get"/>
<wizard string="Scan Product" model="pos.order"
name="pos.scan_product" id="pos_scan_product"/>
<wizard string="Scan Product" model="pos.order"
name="pos.scan_product" id="pos_scan_product"/>
</data>
</data>
</openerp>

View File

@ -22,29 +22,22 @@
import time
from report import report_sxw
from osv import osv
from tools.translate import _
class pos_invoice(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(pos_invoice, self).__init__(cr, uid, name, context)
self.localcontext.update({
'time': time,
})
def preprocess(self, objects, data, ids):
super(pos_invoice, self).preprocess(objects, data, ids)
def set_context(self, objects, data, ids, report_type = None):
super(pos_invoice, self).set_context(objects, data, ids, report_type)
iids = []
nids = []
for order in objects:
order.write({'nb_print': order.nb_print + 1})
if order.invoice_id and order.invoice_id not in iids:
if not order.invoice_id:
raise osv.except_osv(_('Error !'), _('Please create an invoice for this sale.'))
iids.append(order.invoice_id)
nids.append(order.invoice_id.id)
self.cr.commit()
@ -55,7 +48,7 @@ class pos_invoice(report_sxw.rml_parse):
self.localcontext['data'] = data
self.localcontext['objects'] = iids
report_sxw.report_sxw('report.pos.invoice', 'pos.order', 'addons/libeurop/report/invoice.rml', parser= pos_invoice)
report_sxw.report_sxw('report.pos.invoice', 'pos.order', 'account/report/invoice.rml', parser= pos_invoice)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -1,8 +1,8 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
<frame id="first" x1="34.0" y1="42.0" width="145" height="758"/>
</pageTemplate>
</template>
<stylesheet>
@ -13,37 +13,35 @@
<blockTableStyle id="Tableau2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<blockBackground colorName="#ffffff" start="0,0" stop="0,0"/>
<blockBackground colorName="#ffffff" start="1,0" stop="1,0"/>
<blockBackground colorName="#ffffff" start="2,0" stop="2,0"/>
<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"/>
<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"/>
</blockTableStyle>
<blockTableStyle id="Tableau3">
<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"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockTableStyle id="Table_Dicount_Total">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table_Discount_Total">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table_Total">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
<paraStyle name="P2" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
<paraStyle name="P3" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER"/>
<paraStyle name="P30" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT"/>
<paraStyle name="P31" fontName="Times-Bold" fontSize="8.0" leading="9" alignment="CENTER" backColor="#dddddd"/>
<paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT"/>
<paraStyle name="P5" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
<paraStyle name="P6" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
<paraStyle name="P7" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
<paraStyle name="P8" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/>
<paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
<paraStyle name="P10" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT"/>
<paraStyle name="P11" rightIndent="0.0" leftIndent="-3.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
<paraStyle name="P12" rightIndent="0.0" leftIndent="-2.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
<paraStyle name="P13" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
<paraStyle name="P14" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@ -52,82 +50,108 @@
<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="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="6.0" spaceAfter="6.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="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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="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_Bold_9_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"/>
</stylesheet>
<images/>
<story>
[[ repeatIn(objects,'o') ]]
<para style="P2">[[ o.user_id.company_id.name ]]</para>
<para style="P3">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
<para style="P3">[[ address and address.country_id and address.country_id.name ]]</para>
<para style="P3">Tel : [[ address and address.phone ]]</para>
<para style="P3">E-mail : [[ address and address.email ]]</para>
<para style="P3">User : [[ o.user_id.name ]]</para>
<para style="P3">Date : [[ time.strftime('%d/%m/%Y %H:%M') ]]</para>
<para style="P4">
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
<para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
<para style="terp_default_Centre_9">[[ address and address.country_id.name ]]</para>
<para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
<para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
<para style="terp_default_Centre_9">
<font color="white"> </font>
</para>
<para style="P4">
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="P4">Operation N° : [[ o.name ]]</para>
<blockTable colWidths="97.0,23.0,26.0" repeatRows="1" style="Tableau2">
<para style="terp_header">Operation N° : [[ o.name ]]</para>
<blockTable colWidths="78.0,30.0,38.0" repeatRows="1" style="Tableau2">
<tr>
<td>
<para style="P5">Description</para>
<para style="terp_tblheader_Details">Description</para>
</td>
<td>
<para style="P11">Qty</para>
<para style="terp_tblheader_Details_Right">Qty</para>
</td>
<td>
<para style="P12">Price</para>
<para style="terp_tblheader_Details_Right">Price</para>
</td>
</tr>
</blockTable>
<section>
<para style="P8">[[ repeatIn(o.lines,'line') ]]</para>
<blockTable colWidths="95.0,23.0,27.0" style="Tableau3">
<para style="terp_default_8">[[ repeatIn(o.lines,'line') ]]</para>
<blockTable colWidths="77.0,30.0,38.0" style="Tableau3">
<tr>
<td>
<para style="P9">[[ line.product_id.name ]]</para>
<para style="terp_default_9">[[ line.product_id.name ]]</para>
</td>
<td>
<para style="P10">[[ '%.f' % line.qty ]]</para>
<para style="terp_default_Right_9">[[ '%.f' % line.qty ]]</para>
</td>
<td>
<para style="P10">[[ '%.2f' % net(line.id) ]]</para>
<para style="terp_default_Right_9">[[ '%.2f' % net(line.id) ]]</para>
</td>
</tr>
</blockTable>
</section>
<blockTable colWidths="109.0,37.0" style="Table1">
<blockTable colWidths="146.0" style="Table_Dicount_Total">
<tr>
<td>
<para style="P13">Disc : </para>
</td>
<td>
<para style="P10">[[ '%.2f' % (disc(o.id) or 0.0,) ]] </para>
</td>
</tr>
<tr>
<td>
<para style="P6">Total :</para>
</td>
<td>
<para style="P7">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
<blockTable colWidths="57.0,88.0" style="Table_Discount_Total">
<tr>
<td>
<para style="terp_tblheader_Details">Total :</para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="62.0,82.0" style="Table_Total">
<tr>
<td>
<para style="terp_tblheader_Details">Discount : </para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ disc(o.id) or 0.00 ]] [[ o.pricelist_id.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<section>
[[ repeatIn((o.amount_total&gt;0) and o.payments or [], 'p') ]]
<para style="P30">
[[ p.journal_id.name ]] : [[ '%.2f' % (p.amount,) ]]
</para>
</section>
<section>
[[ repeatIn((o.amount_total&lt;0) and [1] or [], 'p') ]]
<para style="P31">
Ce bon est valide jusqu'au [[ time.strftime('%d/%m/%Y', time.strptime(o.date_validity,'%Y-%m-%d')) ]].
</para>
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</story>
</document>

View File

@ -28,5 +28,6 @@ import wizard_confirm
import wizard_discount
import wizard_get_sale
import wizard_scan_product
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
from wizard import except_wizard

View File

@ -114,29 +114,30 @@ def _add_pay(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
order_obj = pool.get('pos.order')
result = data['form']
invoice_wanted = data['form']['invoice_wanted']
# add 'invoice_wanted' in 'pos.order'
order_obj.write(cr, uid, [data['id']], {'invoice_wanted': invoice_wanted})
order_obj.add_payment(cr, uid, data['id'], result, context=context)
return {}
def _validate(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
order_obj = pool.get('pos.order')
order = order_obj.browse(cr, uid, data['id'], context)
# if not order.amount_total:
# return 'receipt'
order_obj.test_order_lines(cr, uid, order, context=context)
return {}
def _check(self, cr, uid, data, context):
"""Check the order:
if the order is not paid: continue payment,
if the order is paid print invoice (if wanted) or ticket.
"""
pool = pooler.get_pool(cr.dbname)
order_obj = pool.get('pos.order')
order = order_obj.browse(cr, uid, data['id'], context)
#if not order.amount_total:
# return 'receipt'
order_obj.test_order_lines(cr, uid, order, context=context)
action = 'ask_pay'
if order.state == 'paid':
if order.partner_id:
@ -146,22 +147,36 @@ def _check(self, cr, uid, data, context):
action = 'paid'
else:
action = 'receipt'
return action
def create_invoice(self, cr, uid, data, context):
wf_service = netsvc.LocalService("workflow")
for i in data['ids']:
wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
def _test_no_line(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
order = pool.get('pos.order').browse(cr, uid, data['id'], context)
if not order.lines:
raise wizard.except_wizard(_('Error'), _('No order lines defined for this sale.'))
return {}
def create_invoice(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
order_obj = pool.get('pos.order')
order = order_obj.browse(cr, uid, data['id'], context)
if not order.invoice_id:
inv_id = order_obj.action_invoice(cr,uid,[data['id']])
#raise wizard.except_wizard(_('Error !'), _('Please create an invoice for this sale.'))
# wf_service = netsvc.LocalService("workflow")
# for i in data['ids']:
# wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
return {}
class pos_payment(wizard.interface):
states = {
'init': {
'actions': [],
'actions': [_validate],
'result': {
'type': 'choice',
'next_state': _check,

View File

@ -91,5 +91,4 @@ class refund_order(wizard.interface):
}
refund_order('pos.refund_order')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
"Last-Translator: <>\n"
"POT-Creation-Date: 2009-05-19 14:36+0000\n"
"PO-Revision-Date: 2009-06-05 14:20+0000\n"
"Last-Translator: Olivier (OpenERP) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-06-05 14:24+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
#: view:product.pricelist.item:0
@ -27,8 +28,12 @@ msgstr "Prix de base"
#. module: product
#: help:product.template,standard_price:0
msgid "The cost of the product for accounting stock valuation. It can serves as a base price for supplier price."
msgid ""
"The cost of the product for accounting stock valuation. It can serves as a "
"base price for supplier price."
msgstr ""
"Le coût du produit pour la valorisation comptable du stock. Il peut servir "
"de base pour le prix fournisseur."
#. module: product
#: selection:product.template,type:0
@ -37,8 +42,12 @@ msgstr "Service"
#. module: product
#: help:product.template,purchase_ok:0
msgid "Determine if the product is visible in the list of products within a selection from a purchase order line."
msgstr "Détermine si le produit est visible dans la liste des produits à l'intérieur d'une sélection dans une ligne d'ordre de commande."
msgid ""
"Determine if the product is visible in the list of products within a "
"selection from a purchase order line."
msgstr ""
"Détermine si le produit est visible dans la liste des produits à l'intérieur "
"d'une sélection dans une ligne d'ordre de commande."
#. module: product
#: help:product.supplierinfo,name:0
@ -57,8 +66,12 @@ msgstr "Intervention senior sur site"
#. module: product
#: help:product.supplierinfo,qty:0
msgid "The minimal quantity to purchase for this supplier, expressed in the default unit of measure."
msgstr "La quantité minimum d'achat pour ce fournisseur, exprimée dans l'unité de mesure par défaut"
msgid ""
"The minimal quantity to purchase for this supplier, expressed in the default "
"unit of measure."
msgstr ""
"La quantité minimum d'achat pour ce fournisseur, exprimée dans l'unité de "
"mesure par défaut"
#. module: product
#: field:product.template,weight_net:0
@ -67,13 +80,23 @@ msgstr "Poid net"
#. module: product
#: help:product.product,incoming_qty:0
msgid "Quantities of products that are planned to arrive in selected locations or all internal if none have been selected."
msgid ""
"Quantities of products that are planned to arrive in selected locations or "
"all internal if none have been selected."
msgstr ""
"Quantités de produits qui ont été planifiée pour arriver dans les "
"emplacements sélectionnés ou tous les internes si aucun n'a été sélectionné."
#. module: product
#: help:product.product,virtual_available:0
msgid "Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming."
msgid ""
"Futur stock for this product according to the selected location or all "
"internal if none have been selected. Computed as: Real Stock - Outgoing + "
"Incoming."
msgstr ""
"Stock prévisionnel pour ce produit d'après les emplacements sélectionnés ou "
"tous les internes si aucun n'a été sélectionné. Calculé ainsi: Stock Réel - "
"Sortant + Entrant."
#. module: product
#: field:product.packaging,width:0
@ -82,8 +105,12 @@ msgstr "Largeur"
#. module: product
#: help:product.pricelist.item,product_tmpl_id:0
msgid "Set a template if this rule only apply to a template of product. Keep empty for all products"
msgstr "Mettre un modèle si cette règle n'est applicable que sur un modèle de produit. Laisser vide si c'est pour tous les produits"
msgid ""
"Set a template if this rule only apply to a template of product. Keep empty "
"for all products"
msgstr ""
"Mettre un modèle si cette règle n'est applicable que sur un modèle de "
"produit. Laisser vide si c'est pour tous les produits"
#. module: product
#: field:product.template,procure_method:0
@ -93,12 +120,12 @@ msgstr "Méthode d'appro."
#. module: product
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Modèle invalide pour la définition de l'action."
#. module: product
#: model:process.process,name:product.process_process_productprocess0
msgid "Product Process"
msgstr ""
msgstr "Processus des Produit"
#. module: product
#: help:product.price.type,field:0
@ -154,7 +181,7 @@ msgstr "Société"
#. module: product
#: field:product.template,rental:0
msgid "Rentable Product"
msgstr ""
msgstr "Produit Rentable"
#. module: product
#: field:product.product,lst_price:0
@ -179,8 +206,11 @@ msgstr "Services"
#. module: product
#: help:product.template,list_price:0
msgid "Base price for computing the customer price. Sometimes called the catalog price."
msgstr "Prix de base pour le calcul du prix client. Parfois appelé prix catalogue."
msgid ""
"Base price for computing the customer price. Sometimes called the catalog "
"price."
msgstr ""
"Prix de base pour le calcul du prix client. Parfois appelé prix catalogue."
#. module: product
#: code:addons/product/pricelist.py:0
@ -201,7 +231,7 @@ msgstr "Nom de ce type de prix"
#. module: product
#: help:product.pricelist.version,date_start:0
msgid "Starting date for this pricelist version to be valid."
msgstr ""
msgstr "Date de départ pour la validité de cette liste de prix."
#. module: product
#: field:product.product,incoming_qty:0
@ -226,13 +256,18 @@ msgstr "Ventilateur silencieux"
#. module: product
#: help:product.template,supply_method:0
msgid "Produce will generate production order or tasks, according to the product type. Purchase will trigger purchase orders when requested."
msgstr "La production générera un ordre de production ou une tâche, en fonction du type de produit. Un achat déclenchera un ordre d'achat lorsque ce sera nécessaire"
msgid ""
"Produce will generate production order or tasks, according to the product "
"type. Purchase will trigger purchase orders when requested."
msgstr ""
"La production générera un ordre de production ou une tâche, en fonction du "
"type de produit. Un achat déclenchera un ordre d'achat lorsque ce sera "
"nécessaire"
#. module: product
#: model:process.transition,note:product.process_transition_supplierofproduct0
msgid "You can see the list of suppliers for that product."
msgstr ""
msgstr "Vous pouvez voir la liste des fournisseurs pour ce produit."
#. module: product
#: help:product.packaging,rows:0
@ -282,8 +317,12 @@ msgstr "Catégories des unités de mesure"
#. module: product
#: help:product.pricelist.item,product_id:0
msgid "Set a product if this rule only apply to one product. Keep empty for all products"
msgstr "Indiquer un produit si la règle ne s'applique que sur un seul produit. Laisser vide si elle est appliquée à tous les produits"
msgid ""
"Set a product if this rule only apply to one product. Keep empty for all "
"products"
msgstr ""
"Indiquer un produit si la règle ne s'applique que sur un seul produit. "
"Laisser vide si elle est appliquée à tous les produits"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_type
@ -342,7 +381,7 @@ msgstr "Liste de prix du fournisseur"
#: view:product.packaging:0
#: view:product.product:0
msgid "Pallet Dimension"
msgstr ""
msgstr "Dimension d'une Palette"
#. module: product
#: field:product.pricelist.item,base:0
@ -371,8 +410,14 @@ msgstr "Souris"
#. module: product
#: help:product.template,cost_method:0
msgid "Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."
msgstr "Prix standard: le prix coûtant est fixé et recalculé périodiquement (généralement à la fin de l'année). Prix moyen : le prix coûtant est recalculé à chaque réception de produits"
msgid ""
"Standard Price: the cost price is fixed and recomputed periodically (usually "
"at the end of the year), Average Price: the cost price is recomputed at each "
"reception of products."
msgstr ""
"Prix standard: le prix coûtant est fixé et recalculé périodiquement "
"(généralement à la fin de l'année). Prix moyen : le prix coûtant est "
"recalculé à chaque réception de produits"
#. module: product
#: field:product.pricelist,name:0
@ -422,7 +467,7 @@ msgstr "En production"
#. module: product
#: field:product.category,child_id:0
msgid "Child Categories"
msgstr ""
msgstr "Catégories FillesCommandes de Travail"
#. module: product
#: model:product.category,name:product.product_category_accessories
@ -474,7 +519,7 @@ msgstr "UP"
#. module: product
#: model:product.uom,name:product.product_uom_unit
msgid "PCE"
msgstr ""
msgstr "PCE"
#. module: product
#: model:ir.actions.act_window,name:product.product_pricelist_action2
@ -497,7 +542,7 @@ msgstr "Divers"
#. module: product
#: help:product.pricelist.item,base:0
msgid "The mode for computing the price for this rule."
msgstr ""
msgstr "Le mode pour calculer le prix pour cette règle."
#. module: product
#: model:ir.model,name:product.model_product_ul
@ -532,7 +577,7 @@ msgstr "Délai d'exécution du fournisseur"
#. module: product
#: model:product.pricelist.version,name:product.ver0
msgid "Default Public Pricelist Version"
msgstr ""
msgstr "Version de la Liste de Prix Publique par Défaut"
#. module: product
#: field:product.pricelist.type,key:0
@ -551,8 +596,12 @@ msgstr "Test dapplication de la règle"
#. module: product
#: help:res.partner,property_product_pricelist:0
msgid "This pricelist will be used, instead of the default one, for sales to the current partner"
msgstr "Cette liste de prix sera utilisée au lieu de celle par défaut pour les ventes au partenaire courant."
msgid ""
"This pricelist will be used, instead of the default one, "
"for sales to the current partner"
msgstr ""
"Cette liste de prix sera utilisée au lieu de celle par défaut pour les "
"ventes au partenaire courant."
#. module: product
#: model:ir.model,name:product.model_product_pricelist
@ -579,7 +628,7 @@ msgstr "Autre liste de prix"
#. module: product
#: help:product.template,weight:0
msgid "The gross weight in Kg."
msgstr ""
msgstr "La Masse brute en Kg."
#. module: product
#: selection:product.ul,type:0
@ -593,13 +642,19 @@ msgstr "XML non valide pour l'architecture de la vue"
#. module: product
#: help:product.template,sale_ok:0
msgid "Determine if the product can be visible in the list of product within a selection from a sale order line."
msgstr "Détermine si le produit peut être visible dans la liste des produits à l'intérieur d'une sélection d'une ligne de commande."
msgid ""
"Determine if the product can be visible in the list of product within a "
"selection from a sale order line."
msgstr ""
"Détermine si le produit peut être visible dans la liste des produits à "
"l'intérieur d'une sélection d'une ligne de commande."
#. module: product
#: constraint:product.template:0
msgid "Error: UOS must be in a different category than the UOM"
msgstr "Erreur: l'unité de vente doit appartenir à une catégorie différente que l'unité de mesure"
msgstr ""
"Erreur: l'unité de vente doit appartenir à une catégorie différente que "
"l'unité de mesure"
#. module: product
#: field:product.category,parent_id:0
@ -613,13 +668,21 @@ msgstr "En développement"
#. module: product
#: help:product.pricelist.type,key:0
msgid "Used in the code to select specific prices based on the context. Keep unchanged."
msgstr "Utilisé dans le code pour sélectionner des prix spécifiques calculés en fonction du contexte. Ne pas modifier."
msgid ""
"Used in the code to select specific prices based on the context. Keep "
"unchanged."
msgstr ""
"Utilisé dans le code pour sélectionner des prix spécifiques calculés en "
"fonction du contexte. Ne pas modifier."
#. module: product
#: help:product.product,outgoing_qty:0
msgid "Quantities of products that are planned to leave in selected locations or all internal if none have been selected."
msgid ""
"Quantities of products that are planned to leave in selected locations or "
"all internal if none have been selected."
msgstr ""
"Quantités de produits qui sont planifiés pour partir vers les emplacements "
"sélectionnés ou tous les internes si aucun n'a été sélectionné."
#. module: product
#: field:product.packaging,weight:0
@ -628,8 +691,15 @@ msgstr "Poids total du colis"
#. module: product
#: help:product.template,procure_method:0
msgid "'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."
msgid ""
"'Make to Stock': When needed, take from the stock or wait until re-"
"supplying. 'Make to Order': When needed, purchase or produce for the "
"procurement request."
msgstr ""
"'Production sur Stock': lorsque nécessaire, prend à partir du stock ou "
"attend un réapprovisionnement.\r\n"
"'Production sur Commande': lorsque nécessaire, achète ou produit pour une "
"demande d'approvisionnement."
#. module: product
#: view:product.product:0
@ -650,8 +720,14 @@ msgstr "HDD Seagate 7200.8 80GB"
#. module: product
#: help:product.pricelist.version,active:0
msgid "When a version is duplicated it is set to non active, so that the dates do not overlaps with original version. You should change the dates and reactivate the pricelist"
msgid ""
"When a version is duplicated it is set to non active, so that the dates do "
"not overlaps with original version. You should change the dates and "
"reactivate the pricelist"
msgstr ""
"Lorsqu'une version est dupliquée, il est mis à 'inactif', ainsi, les dates "
"ne se chevauchent pas avec la version originale. Vous devez changer les "
"dates et réactiver la liste de prix."
#. module: product
#: model:product.template,name:product.product_product_hdd3_product_template
@ -708,7 +784,7 @@ msgstr "Type de mesure"
#. module: product
#: model:product.uom.categ,name:product.product_uom_categ_kgm
msgid "Weight"
msgstr ""
msgstr "Masse"
#. module: product
#: model:product.template,name:product.product_product_22_product_template
@ -717,8 +793,12 @@ msgstr "Processeur à la demande"
#. module: product
#: help:product.supplierinfo,product_name:0
msgid "Name of the product for this partner, will be used when printing a request for quotation. Keep empty to use the internal one."
msgstr "Nom du produit pour ce partenaire, il sera utilisé lors de l'impression d'une demande de devis. Laisser vide pour utilisation interne"
msgid ""
"Name of the product for this partner, will be used when printing a request "
"for quotation. Keep empty to use the internal one."
msgstr ""
"Nom du produit pour ce partenaire, il sera utilisé lors de l'impression "
"d'une demande de devis. Laisser vide pour utilisation interne"
#. module: product
#: field:product.template,supply_method:0
@ -770,7 +850,7 @@ msgstr "Descriptions"
#. module: product
#: model:process.transition,name:product.process_transition_supplierofproduct0
msgid "Suppliers of Product"
msgstr ""
msgstr "Fournisseur du Produit"
#. module: product
#: field:product.pricelist.version,date_start:0
@ -784,8 +864,12 @@ msgstr "Propriétés des ventes"
#. module: product
#: help:product.product,qty_available:0
msgid "Current quantities of products in selected locations or all internal if none have been selected."
msgid ""
"Current quantities of products in selected locations or all internal if none "
"have been selected."
msgstr ""
"Quantités actuelles de produit dans les emplacements sélectionnés ou tous "
"les internes si aucun n'a été sélectionné."
#. module: product
#: model:product.template,name:product.product_product_pc1_product_template
@ -804,8 +888,11 @@ msgstr "Catégorie"
#. module: product
#: help:product.pricelist.item,min_quantity:0
msgid "The rule only applies if the partner buys/sells more than this quantity."
msgid ""
"The rule only applies if the partner buys/sells more than this quantity."
msgstr ""
"La règle s'applique seulement si le partenaire achète/vend plus que cette "
"quantité."
#. module: product
#: model:product.template,name:product.product_product_ram_product_template
@ -824,8 +911,12 @@ msgstr "Catégories de produits"
#. module: product
#: help:product.uom,category_id:0
msgid "Unit of Measure of a category can be converted between each others in the same category."
msgid ""
"Unit of Measure of a category can be converted between each others in the "
"same category."
msgstr ""
"Les Unités de mesure d'une catégorie peuvent être convertie entre elles dans "
"la même catégorie."
#. module: product
#: model:ir.model,name:product.model_product_uom
@ -844,8 +935,11 @@ msgstr "PC complet avec périphériques"
#. module: product
#: constraint:product.template:0
msgid "Error: The default UOM and the purchase UOM must be in the same category."
msgstr "Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent faire partie de la même catégorie"
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
"faire partie de la même catégorie"
#. module: product
#: model:product.template,name:product.product_product_mb2_product_template
@ -879,8 +973,15 @@ msgstr "Quantité par colis"
#. module: product
#: help:product.template,uos_id:0
msgid "Used by companies that manages two unit of measure: invoicing and stock management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM."
msgstr "Utilisé par les entreprises qui gèrent deux unités de mesure : gestion des factures et du stock. Par exemple, dans l'industrie alimentaire, vous gérerez un stock de jambon mais facturerez en kg. Laisser vide pour utiliser une unité de mesure par défaut (UP)."
msgid ""
"Used by companies that manages two unit of measure: invoicing and stock "
"management. For example, in food industries, you will manage a stock of ham "
"but invoice in Kg. Keep empty to use the default UOM."
msgstr ""
"Utilisé par les entreprises qui gèrent deux unités de mesure : gestion des "
"factures et du stock. Par exemple, dans l'industrie alimentaire, vous "
"gérerez un stock de jambon mais facturerez en kg. Laisser vide pour utiliser "
"une unité de mesure par défaut (UP)."
#. module: product
#: view:product.product:0
@ -925,7 +1026,7 @@ msgstr "Prix public"
#. module: product
#: field:product.pricelist.item,price_max_margin:0
msgid "Max. Price Margin"
msgstr ""
msgstr "Marge de Prix Max."
#. module: product
#: view:res.partner:0
@ -979,8 +1080,13 @@ msgstr "Information sur le fournisseur du produit"
#. module: product
#: help:product.product,packaging:0
msgid "Gives the different ways to package the same product. This has no impact on the packing order and is mainly used if you use the EDI module."
msgstr "Donne les différentes manières de coliser le même produit. Ceci n'a pas d'impacte sur l'ordre de colisage et est principalement utilisé si vous utilisez le module EDI."
msgid ""
"Gives the different ways to package the same product. This has no impact on "
"the packing order and is mainly used if you use the EDI module."
msgstr ""
"Donne les différentes manières de coliser le même produit. Ceci n'a pas "
"d'impacte sur l'ordre de colisage et est principalement utilisé si vous "
"utilisez le module EDI."
#. module: product
#: field:product.product,price_margin:0
@ -1023,8 +1129,15 @@ msgstr "Unité de mesure secondaire"
#. module: product
#: help:product.template,seller_delay:0
msgid "This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."
msgstr "C'est le temps moyen entre la confirmation de la commande du client et la réception des marchandises pour ce produit et pour le fournisseur par défaut. C'est utilisé par le planificateur pour ordonner les requètes sur base des délais de réordonnement."
msgid ""
"This is the average delay in days between the purchase order confirmation "
"and the reception of goods for this product and for the default supplier. It "
"is used by the scheduler to order requests based on reordering delays."
msgstr ""
"C'est le temps moyen entre la confirmation de la commande du client et la "
"réception des marchandises pour ce produit et pour le fournisseur par "
"défaut. C'est utilisé par le planificateur pour ordonner les requètes sur "
"base des délais de réordonnement."
#. module: product
#: model:product.category,name:product.product_category_4
@ -1045,7 +1158,7 @@ msgstr "La longueur du colis"
#. module: product
#: field:product.pricelist.item,price_min_margin:0
msgid "Min. Price Margin"
msgstr ""
msgstr "Marge de Prix Min."
#. module: product
#: help:product.packaging,ean:0
@ -1107,9 +1220,12 @@ msgstr "Code"
#. module: product
#: help:product.uom,factor_inv:0
msgid "The coefficient for the formula:\n"
msgid ""
"The coefficient for the formula:\n"
"coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
msgstr ""
"Le coefficient pour la formule:\n"
"coeff (unité de base) = 1 (cette unité). Facteur = 1 / Taux."
#. module: product
#: view:product.supplierinfo:0
@ -1129,7 +1245,8 @@ msgstr "Variable"
#. module: product
#: help:product.template,uom_id:0
msgid "Default Unit of Measure used for all stock operation."
msgstr "Unité de mesure par défaut utilisée pour toutes les opérations de stock"
msgstr ""
"Unité de mesure par défaut utilisée pour toutes les opérations de stock"
#. module: product
#: model:ir.model,name:product.model_product_template
@ -1148,8 +1265,12 @@ msgstr "Séquence"
#. module: product
#: help:product.uom,rounding:0
msgid "The computed quantity will be a multiple of this value. Use 1.0 for products that can not be split."
msgid ""
"The computed quantity will be a multiple of this value. Use 1.0 for products "
"that can not be split."
msgstr ""
"La quantité calculée sera un multiple de cette valeur. Utilisez 1.0 pour les "
"produits qui ne peuvent pas être séparés."
#. module: product
#: field:product.packaging,height:0
@ -1164,7 +1285,7 @@ msgstr "PC personnalisble"
#. module: product
#: help:product.pricelist.version,date_end:0
msgid "Ending date for this pricelist version to be valid."
msgstr ""
msgstr "Date de Fin pour la validité de cette liste de prix."
#. module: product
#: field:pricelist.partnerinfo,suppinfo_id:0
@ -1197,7 +1318,8 @@ msgstr "Annuler"
#. module: product
#: help:product.packaging,qty:0
msgid "The total number of products you can put by palet or box."
msgstr "Le nombre maximum de produit que vous pouvez mettre par palette ou par boite"
msgstr ""
"Le nombre maximum de produit que vous pouvez mettre par palette ou par boite"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_item
@ -1245,12 +1367,15 @@ msgstr "Information"
#. module: product
#: view:product.product:0
msgid "Codes"
msgstr ""
msgstr "Codes"
#. module: product
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
"spéciaux !"
#. module: product
#: wizard_field:product.price_list,init,qty4:0
@ -1281,8 +1406,12 @@ msgstr "Lignes de liste de prix"
#. module: product
#: help:product.supplierinfo,product_code:0
msgid "Code of the product for this partner, will be used when printing a request for quotation. Keep empty to use the internal one."
msgstr "Code de produit pour ce partenaire qui sera utilisé lors de l'impression d'un devis. Laisser vide pour utiliser le code interne"
msgid ""
"Code of the product for this partner, will be used when printing a request "
"for quotation. Keep empty to use the internal one."
msgstr ""
"Code de produit pour ce partenaire qui sera utilisé lors de l'impression "
"d'un devis. Laisser vide pour utiliser le code interne"
#. module: product
#: selection:product.template,state:0
@ -1292,7 +1421,7 @@ msgstr "Obsolète"
#. module: product
#: selection:product.ul,type:0
msgid "Pallet"
msgstr ""
msgstr "Palette"
#. module: product
#: field:pricelist.partnerinfo,price:0
@ -1311,7 +1440,10 @@ msgstr "Colis par couche"
#. module: product
#: help:product.template,type:0
msgid "Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no stock management in the system."
msgid ""
"Will change the way procurements are processed. Consumables are stockable "
"products with infinite stock, or for use when you have no stock management "
"in the system."
msgstr ""
#. module: product
@ -1363,11 +1495,14 @@ msgstr "Description du produit"
#. module: product
#: view:product.pricelist.item:0
msgid " ) + "
msgstr ""
msgstr " ) + "
#. module: product
#: help:product.template,sale_delay:0
msgid "This is the average time between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."
msgid ""
"This is the average time between the confirmation of the customer order and "
"the delivery of the finished products. It's the time you promise to your "
"customers."
msgstr ""
#. module: product
@ -1383,7 +1518,7 @@ msgstr "Quantité-3"
#. module: product
#: model:product.ul,name:product.product_ul_box
msgid "Box 20x20x40"
msgstr ""
msgstr "Boîte 20x20x40"
#. module: product
#: selection:product.template,supply_method:0
@ -1404,6 +1539,7 @@ msgstr "Surcharge du prix"
#: constraint:product.pricelist.version:0
msgid "You cannot have 2 pricelist versions that overlap!"
msgstr ""
"Vous ne pouvez pas avoir deux versions de liste de prix qui se chevauchent !"
#. module: product
#: view:product.pricelist.item:0
@ -1460,9 +1596,11 @@ msgstr "Nom"
#. module: product
#: help:product.template,uos_coeff:0
msgid "Coefficient to convert UOM to UOS\n"
msgid ""
"Coefficient to convert UOM to UOS\n"
" uom = uos * coeff"
msgstr "Coefficient de conversion \"unité de mesure\" vers \"unité de vente\""
msgstr ""
"Coefficient de conversion \"unité de mesure\" vers \"unité de vente\""
#. module: product
#: field:product.template,purchase_ok:0
@ -1514,7 +1652,8 @@ msgstr "Le poids d'une palette ou d'une boite de produits remplie"
#. module: product
#: help:product.pricelist.item,price_round:0
msgid "Sets the price so that it is a multiple of this value.\n"
msgid ""
"Sets the price so that it is a multiple of this value.\n"
"Rounding is applied after the discount and before the surcharge.\n"
"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
msgstr ""
@ -1531,7 +1670,8 @@ msgstr ""
#. module: product
#: help:product.uom,factor:0
msgid "The coefficient for the formula:\n"
msgid ""
"The coefficient for the formula:\n"
"1 (base unit) = coeff (this unit). Rate = 1 / Factor."
msgstr ""
@ -1569,8 +1709,16 @@ msgstr "Prix de vente"
#. module: product
#: help:product.template,produce_delay:0
msgid "Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different delays will be summed for all levels and purchase orders."
msgstr "Temps moyen pour produire ce produit. Ceci est seulement pour l'ordre de fabrication et, si il s'agit d'une facture multi-nivaux de matériel, c'est seulement pour le niveau de ce produit. Des délais différents seront sommé pour tous les nivaux et ordres d'approvisionnement."
msgid ""
"Average time to produce this product. This is only for the production order "
"and, if it is a multi-level bill of material, it's only for the level of "
"this product. Different delays will be summed for all levels and purchase "
"orders."
msgstr ""
"Temps moyen pour produire ce produit. Ceci est seulement pour l'ordre de "
"fabrication et, si il s'agit d'une facture multi-nivaux de matériel, c'est "
"seulement pour le niveau de ce produit. Des délais différents seront sommé "
"pour tous les nivaux et ordres d'approvisionnement."
#. module: product
#: wizard_field:product.price_list,init,qty1:0
@ -1589,7 +1737,10 @@ msgstr "Privé"
#. module: product
#: help:product.supplierinfo,delay:0
msgid "Delay in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."
msgid ""
"Delay in days between the confirmation of the purchase order and the "
"reception of the products in your warehouse. Used by the scheduler for "
"automatic computation of the purchase order planning."
msgstr ""
#. module: product
@ -1602,8 +1753,12 @@ msgstr "Unités de mesure"
#. module: product
#: help:product.template,uom_po_id:0
msgid "Default Unit of Measure used for purchase orders. It must in the same category than the default unit of measure."
msgstr "L'unité de mesure par défaut pour les commandes d'achats. Qui doit être dans la même catégorie que l'unité de mesure par défaut."
msgid ""
"Default Unit of Measure used for purchase orders. It must in the same "
"category than the default unit of measure."
msgstr ""
"L'unité de mesure par défaut pour les commandes d'achats. Qui doit être dans "
"la même catégorie que l'unité de mesure par défaut."
#. module: product
#: constraint:product.product:0
@ -1617,8 +1772,13 @@ msgstr "Quantité min."
#. module: product
#: help:product.pricelist.item,categ_id:0
msgid "Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"
msgstr "Indiquer une catégorie de produit si la règle n'est appliquée que sur une catégorie de produits et ses fils. Laisser vide si elle s'applique à tous les produits"
msgid ""
"Set a category of product if this rule only apply to products of a category "
"and his childs. Keep empty for all products"
msgstr ""
"Indiquer une catégorie de produit si la règle n'est appliquée que sur une "
"catégorie de produits et ses fils. Laisser vide si elle s'applique à tous "
"les produits"
#. module: product
#: model:ir.actions.report.xml,name:product.report_product_label
@ -1644,4 +1804,3 @@ msgstr ""
#: field:product.pricelist.item,price_discount:0
msgid "Price Discount"
msgstr "Réduction sur le prix"

View File

@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
@ -25,7 +25,7 @@ import time
import wizard
import netsvc
import pooler
from osv.orm import browse_record
from osv.orm import browse_record, browse_null
merge_form = """<?xml version="1.0"?>
<form string="Merge orders">
@ -45,18 +45,21 @@ ack_form = """<?xml version="1.0"?>
ack_fields = {}
def _mergeOrders(self, cr, uid, data, context):
def _merge_orders(self, cr, uid, data, context):
order_obj = pooler.get_pool(cr.dbname).get('purchase.order')
def make_key(br, fields):
list_key = []
for field in fields:
field_val = getattr(br, field)
if field in ('product_id','move_dest_id', 'account_analytic_id'):
if field in ('product_id', 'move_dest_id', 'account_analytic_id'):
if not field_val:
field_val = False
if isinstance(field_val, browse_record):
field_val = field_val.id
elif isinstance(field_val, browse_null):
field_val = False
elif isinstance(field_val, list):
field_val = ((6, 0, tuple([v.id for v in field_val])),)
list_key.append((field, field_val))
@ -67,6 +70,7 @@ def _mergeOrders(self, cr, uid, data, context):
new_orders = {}
for porder in [order for order in order_obj.browse(cr, uid, data['ids']) if order.state == 'draft']:
order_key = make_key(porder, ('partner_id', 'location_id'))
new_order = new_orders.setdefault(order_key, ({}, []))
new_order[1].append(porder.id)
order_infos = new_order[0]
@ -89,7 +93,7 @@ def _mergeOrders(self, cr, uid, data, context):
if porder.notes:
order_infos['notes'] += ('\n%s' % (porder.notes,))
if porder.origin:
order_infos['origin'] = order_infos['origin'] +' '+ porder.origin
order_infos['origin'] = order_infos['origin'] + ' ' + porder.origin
for order_line in porder.order_line:
line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
@ -103,7 +107,7 @@ def _mergeOrders(self, cr, uid, data, context):
field_val = getattr(order_line, field)
if isinstance(field_val, browse_record):
field_val = field_val.id
o_line[field] = field_val
o_line[field] = field_val
o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
wf_service = netsvc.LocalService("workflow")
@ -120,6 +124,7 @@ def _mergeOrders(self, cr, uid, data, context):
del value['uom_factor']
value.update(dict(key))
order_data['order_line'] = [(0, 0, value) for value in order_data['order_line'].itervalues()]
# create the new order
neworder_id = order_obj.create(cr, uid, order_data)
allorders.append(neworder_id)
@ -130,8 +135,8 @@ def _mergeOrders(self, cr, uid, data, context):
wf_service.trg_validate(uid, 'purchase.order', old_id, 'purchase_cancel', cr)
return {
'domain': "[('id','in', ["+','.join(map(str,allorders))+"])]",
'name': 'Purchase orders',
'domain': "[('id','in', [" + ','.join(map(str, allorders)) + "])]",
'name': 'Purchase Orders',
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'purchase.order',
@ -139,18 +144,18 @@ def _mergeOrders(self, cr, uid, data, context):
'type': 'ir.actions.act_window'
}
class merge_orders(wizard.interface):
states = {
'init' : {
'actions' : [],
'result' : {'type' : 'form', 'arch' : merge_form, 'fields' : merge_fields, 'state' : [('end', 'Cancel'),('merge', 'Merge orders') ]}
'init': {
'actions': [],
'result': {'type': 'form', 'arch' : merge_form, 'fields' : merge_fields, 'state' : [('end', 'Cancel'), ('merge', 'Merge orders') ]}
},
'merge' : {
'actions' : [],
'result' : {'type':'action', 'action':_mergeOrders, 'state':'end'}
'merge': {
'actions': [],
'result': {'type': 'action', 'action': _merge_orders, 'state': 'end'}
},
}
merge_orders("purchase.order.merge")
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -290,7 +290,7 @@
<para style="terp_default_Centre_9">[[ o.name ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ o.date_invoice ]]</para>
<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>

View File

@ -63,8 +63,8 @@ class report_intrastat(osv.osv):
_auto = False
_columns = {
'name': fields.many2one('account.period', 'Period', readonly=True, select=True),
'supply_units': fields.float('Supply Units', readonly=True),
'ref': fields.char('Origin', size=64, readonly=True),
'supply_units':fields.float('Supply Units', readonly=True),
'ref':fields.char('Origin',size=64, readonly=True),
'code': fields.char('Country code', size="2", readonly=True),
'intrastat_id': fields.many2one('report.intrastat.code', 'Intrastat code', readonly=True),
'weight': fields.float('Weight', readonly=True),

View File

@ -1796,7 +1796,7 @@ msgstr "Magasin"
#: selection:stock.move,state:0
#: selection:stock.picking,state:0
msgid "Done"
msgstr "Terminer"
msgstr "Terminé"
#. module: stock
#: model:stock.location,name:stock.stock_location_locations_virtual

View File

@ -49,6 +49,7 @@
<paraStyle name="P10a" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P121" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="1.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"/>
@ -60,20 +61,19 @@
<images/>
<story>
<section>
<blockTable colWidths="201.0,235.0,91.0" repeatRows="1" style="Table1">
<tr>
<td><para style="P6">Location</para></td>
<td><para style="P6">Product</para></td>
<td><para style="P7">Quantity</para></td>
</tr>
</blockTable>
<para style="P41"><font color="white">[[ repeatIn(objects,'o') ]]</font></para>
<para style="P121"><font color="white">[[ repeatIn(objects,'o') ]]</font></para>
<section>
<para style="P41"><font color="white">[[ repeatIn(process(o.id),'ob') ]]</font></para>
<para style="P121"><font color="white">[[ repeatIn(process(o.id),'ob') ]]</font></para>
<blockTable colWidths="202.0,234.0,65.0,25" repeatRows="1" style="Table4">
<tr>
<td><para style="P6">[[ ob['product'] or removeParentNode('blockTable') ]] Location</para></td>
<td><para style="P6">Product</para></td>
<td><para style="P7">Quantity</para></td>
<td><para><font color="white"> </font></para></td>
</tr>
<tr>
<td><para style="P5">[[ ob['location_name'] ]]</para></td>
<td><para style="Standard">[[ ob['product'] or 'No products in this Location !' ]]</para></td>
<td><para><font color="white"> </font></para></td>
<td><para><font color="white"> </font></para></td>
<td><para><font color="white"> </font></para></td>
</tr>
@ -83,27 +83,14 @@
<td><para style="P12">[[ p['prod_qty'] ]]</para></td>
<td><para style="P12">[[ p['uom'] ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="200.0,235.0,60.0,25" style="Table2">
<tr>
<td><para style="P10"></para></td>
<td><para style="P10a">Total : </para></td>
<td><para style="P10">[[ ob['total'] ]]</para></td>
<td><para style="P10">Units</para></td>
</tr>
<tr>
<td><para style="P10"></para></td>
<td><para style="P10"></para></td>
<td><para style="P10"></para></td>
<td><para style="P10"></para></td>
</tr>
<tr>
<td><para style="P10"></para></td>
<td><para style="P10"></para></td>
<td><para style="P10"></para></td>
<td><para style="P10"></para></td>
</tr>
</blockTable>
<para style="P10"></para>
</section>
</section>
<blockTable colWidths="200.0,235.0,60.0,25" style="Table3">

View File

@ -10,11 +10,6 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
@ -24,18 +19,7 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
@ -57,6 +41,7 @@
<paraStyle name="P10c" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P121" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="1.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"/>
@ -69,9 +54,12 @@
<images/>
<story>
<section>
<blockTable colWidths="60.0,190.0,61.0,55.0,59.0,56.0,61.0" repeatRows="1" style="Table1">
<para style="P121"><font color="white">[[ repeatIn(objects,'o') ]]</font></para>
<section>
<para style="P121">[[ repeatIn(process(o.id),'ob') ]]</para>
<blockTable colWidths="60.0,200.0,56.0,55.0,52.0,56.0,68.0" repeatRows="1" style="Table2">
<tr>
<td><para style="P1">Location</para></td>
<td><para style="P1">[[ ob['product'] or removeParentNode('blockTable') ]] Location</para></td>
<td><para style="P1">Product</para></td>
<td><para style="P1">Variants</para></td>
<td><para style="P10a">Quantity</para></td>
@ -79,14 +67,9 @@
<td><para style="P10c">Unit Price</para></td>
<td><para style="P10a">Value</para></td>
</tr>
</blockTable>
<para style="P9">[[ repeatIn(objects,'o') ]]</para>
<section>
<para style="P12">[[ repeatIn(process(o.id),'ob') ]]</para>
<blockTable colWidths="60.0,200.0,56.0,55.0,52.0,56.0,68.0" repeatRows="1" style="Table2">
<tr>
<td><para style="P41">[[ ob['location_name'] ]]</para></td>
<td><para style="Standard">[[ ob['product'] or 'No products in this Location !' ]]</para></td>
<td><para><font color="white"></font></para></td>
<td><para><font color="white"></font></para></td>
<td><para><font color="white"></font></para></td>
<td><para><font color="white"></font></para></td>
@ -94,7 +77,7 @@
<td><para><font color="white"></font></para></td>
</tr>
<tr>
<td><para style="P7">[[ repeatIn(ob['product'],'p') ]]</para></td>
<td><para style="P121">[[ repeatIn(ob['product'],'p') ]]</para></td>
<td><para style="P12">[[ p['prod_name'] ]]</para></td>
<td><para style="P4">[[ p['variants'] ]]</para></td>
<td><para style="P10b">[[ p['prod_qty'] ]]</para></td>
@ -102,9 +85,7 @@
<td><para style="P10b">[[ p['price'] ]]</para></td>
<td><para style="P10b">[[ p['price_value'] ]]</para></td>
</tr>
</blockTable>
<blockTable colWidths="60.0,200.0,56.0,55.0,52.0,56.0,68.0" style="Table4">
<tr>
<tr>
<td><para style="P8"></para></td>
<td><para style="P8">Total:</para></td>
<td><para style="P8"></para></td>
@ -115,9 +96,6 @@
</tr>
</blockTable>
<para style="P11"><font color="white"> </font></para>
<para style="P11"><font color="white"> </font></para>
<para style="P11"><font color="white"> </font></para>
<para style="P11"><font color="white"> </font></para>
</section>
</section>
<blockTable colWidths="180,60,61.0,55.0,59.0,56.0,68.0" style="Table3">
@ -128,7 +106,7 @@
<td><para style="P8"></para></td>
<td><para style="P8"></para></td>
<td><para style="P8"></para></td>
<td><para style="P8a"><u>[[ grand_total_price() ]]</u></para></td>
<td><para style="P8a">[[ grand_total_price() ]]</para></td>
</tr>
</blockTable>
</story>

View File

@ -10,45 +10,16 @@
<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"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<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"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#d4d4d4" start="1,0" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
@ -68,6 +39,7 @@
<paraStyle name="P102" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P121" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="1.0"/>
<paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P14" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
@ -80,13 +52,13 @@
</stylesheet>
<images/>
<story>
<para style="P1">
<font color="white"> </font>
</para>
<section>
<blockTable colWidths="80,35.0,140.0,50.0,50.0,42.0,56.0,58.0" repeatRows="1" style="Table1">
<tr>
<td><para style="P2">Location</para></td>
<para style="P121"><font color="white">[[ repeatIn(objects,'o') ]] </font></para>
<section>
<para style="P121"><font color="white">[[ repeatIn(process(o.id),'ob') ]]</font></para>
<blockTable colWidths="80,35.0,140.0,50.0,50.0,42.0,56.0,58.0" style="Table4">
<tr>
<td><para style="P2">[[ ob['product'] or removeParentNode('blockTable') ]] Location</para></td>
<td><para style="P2">Code</para></td>
<td><para style="P2">Product</para></td>
<td><para style="P2">Variants</para></td>
@ -94,16 +66,11 @@
<td><para style="P4">UoM</para></td>
<td><para style="P3">UnitPrice</para></td>
<td><para style="P3">Value</para></td>
</tr>
</blockTable>
<para>[[repeatIn(objects,'o')]]</para>
<section>
<para style="P12">[[ repeatIn(process(o.id),'ob') ]]</para>
<blockTable colWidths="80,35.0,140.0,50.0,50.0,42.0,56.0,58.0" repeatRows="1" style="Table4">
</tr>
<tr>
<td><para style="P102">[[ ob['location_name'] ]]</para></td>
<td><para style="Standard"><font color="white"></font></para></td>
<td><para style="Standard">[[ ob['product'] or 'No products in this Location' ]]</para></td>
<td><para style="Standard"><font color="white"></font></para></td>
<td><para style="Standard"><font color="white"></font></para></td>
<td><para style="Standard"><font color="white"></font></para></td>
<td><para style="Standard"><font color="white"></font></para></td>
@ -120,36 +87,29 @@
<td><para style="P12">[[ p['price'] ]]</para></td>
<td><para style="P12">[[ p['price_value'] ]]</para></td>
</tr>
</blockTable>
<para style="P10">
<font color="white"> </font>
</para>
<blockTable colWidths="80,35.0,140.0,50.0,50.0,42.0,56.0,58.0" style="Table2">
<tr>
<td><para style="P5"></para></td>
<tr>
<td><para style="P5"><font color="white"> </font></para></td>
<td><para style="P5">Total:</para></td>
<td><para style="P5"></para></td>
<td><para style="P5"></para></td>
<td><para style="P5"></para></td>
<td><para style="P5"></para></td>
<td><para style="P5"></para></td>
<td><para style="P5"><font color="white"> </font></para></td>
<td><para style="P5"><font color="white"> </font></para></td>
<td><para style="P5"><font color="white"> </font></para></td>
<td><para style="P5"><font color="white"> </font></para></td>
<td><para style="P5"><font color="white"> </font></para></td>
<td><para style="P5a"><u>[[ price_total() ]]</u></para></td>
</tr>
</blockTable>
<para style="P1"><font color="white"> </font></para>
<para style="P1"><font color="white"> </font></para>
</section>
</section>
<blockTable colWidths="80,35.0,140.0,50.0,50.0,42.0,56.0,58.0" style="Table3">
<tr>
<td><para style="P5">Grand Total:</para></td>
<td><para style="P5"></para></td>
<td><para style="P5"></para></td>
<td><para style="P5"></para></td>
<td><para style="P5"></para></td>
<td><para style="P5"></para></td>
<td><para style="P5"></para></td>
<td><para style="P5a"><u>[[ grand_total_price() ]]</u></para></td>
<td><para style="P5"><font color="white"> </font></para></td>
<td><para style="P5"><font color="white"> </font></para></td>
<td><para style="P5"><font color="white"> </font></para></td>
<td><para style="P5"><font color="white"> </font></para></td>
<td><para style="P5"><font color="white"> </font></para></td>
<td><para style="P5"><font color="white"> </font></para></td>
<td><para style="P5a">[[ grand_total_price() ]]</para></td>
</tr>
</blockTable>
</story>

View File

@ -785,20 +785,26 @@ class stock_production_lot(osv.osv):
if 'location_id' not in context:
locations = self.pool.get('stock.location').search(cr, uid, [('usage','=','internal')], context=context)
else:
locations = [context['location_id']]
locations = context['location_id'] and [context['location_id']] or []
if isinstance(ids, (int, long)):
ids = [ids]
res = {}.fromkeys(ids, 0.0)
cr.execute('''select
prodlot_id,
sum(name)
from
stock_report_prodlots
where
location_id in ('''+','.join(map(str, locations))+''') and
prodlot_id in ('''+','.join(map(str, ids))+''')
group by
prodlot_id
''')
res.update(dict(cr.fetchall()))
if locations:
cr.execute('''select
prodlot_id,
sum(name)
from
stock_report_prodlots
where
location_id in ('''+','.join(map(str, locations))+''') and
prodlot_id in ('''+','.join(map(str, ids))+''')
group by
prodlot_id
''')
res.update(dict(cr.fetchall()))
return res
def _stock_search(self, cr, uid, obj, name, args):
@ -975,10 +981,12 @@ class stock_move(osv.osv):
ON stock_move (location_id, location_dest_id, product_id, state)')
cursor.commit()
def onchange_lot_id(self, cr, uid, context, prodlot_id=False,product_qty=False, loc_id=False):
def onchange_lot_id(self, cr, uid, context=None, prodlot_id=False, product_qty=False, loc_id=False):
if not prodlot_id or not loc_id:
return {}
prodlot = self.pool.get('stock.production.lot').browse(cr, uid, prodlot_id)
ctx = context and context.copy() or {}
ctx['location_id'] = loc_id
prodlot = self.pool.get('stock.production.lot').browse(cr, uid, prodlot_id, ctx)
location=self.pool.get('stock.location').browse(cr,uid,loc_id)
warning={}
if (location.usage == 'internal') and (product_qty > (prodlot.stock_available or 0.0)):

View File

@ -77,6 +77,7 @@ def _track_lines(self, cr, uid, data, context):
'product_uos_qty': uos_qty,
}
new_move = []
production_ids = []
for idx in range(int(move.product_qty//quantity)):
if idx:
current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})