Skip to content

Commit

Permalink
Merge branch 'master' of ssh://[email protected]/ecosoft-odoo/sqp.git
Browse files Browse the repository at this point in the history
  • Loading branch information
@kittiu
kittiu committed Dec 19, 2015
2 parents 80c5f46 + 93779fb commit 8953026
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions jrxml_reports/custom_reports/sqp_super_mo_form.jrxml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Supper Mo" language="groovy" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="1.996500000000026"/>
<property name="ireport.x" value="0"/>
<property name="ireport.x" value="716"/>
<property name="ireport.y" value="384"/>
<property name="OPENERP_RELATIONS" value="[&quot;product_lines&quot;]"/>
<import value="org.apache.commons.codec.binary.Base64"/>
Expand Down Expand Up @@ -636,14 +636,14 @@ Code]]></text>
<textElement textAlignment="Center" verticalAlignment="Middle" lineSpacing="Single">
<font fontName="Monospaced" size="9" isBold="false" pdfFontName="Garuda-Bold.ttf" pdfEncoding="Identity-H" isPdfEmbedded="false"/>
</textElement>
<text><![CDATA[บ่าย]]></text>
<text><![CDATA[PU]]></text>
</staticText>
<staticText>
<reportElement style="table" mode="Opaque" x="579" y="22" width="29" height="20" backcolor="#B5E7D3"/>
<textElement textAlignment="Center" verticalAlignment="Middle" lineSpacing="Single">
<font fontName="Monospaced" size="9" isBold="false" pdfFontName="Garuda-Bold.ttf" pdfEncoding="Identity-H" isPdfEmbedded="false"/>
</textElement>
<text><![CDATA[เช้า]]></text>
<text><![CDATA[PIR]]></text>
</staticText>
</band>
</groupHeader>
Expand Down Expand Up @@ -947,12 +947,12 @@ Code]]></text>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.000" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="608" y="0" width="29" height="15" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$F{bom_product_type} == "panel" && $F{mat_insulation_choice} == "PIR"]]></printWhenExpression>
<printWhenExpression><![CDATA[$F{bom_product_type} == "panel" && $F{mat_insulation_choice} == "PU"]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
<font fontName="Monospaced" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Garuda-Bold.ttf" pdfEncoding="Identity-H" isPdfEmbedded="false"/>
</textElement>
<textFieldExpression class="java.lang.Number"><![CDATA[$F{line5_inject2}]]></textFieldExpression>
<textFieldExpression class="java.lang.Number"><![CDATA[$F{line1_inject1}*1.12]]></textFieldExpression>
</textField>
<line>
<reportElement positionType="FixRelativeToBottom" x="0" y="15" width="802" height="1"/>
Expand Down
14 changes: 7 additions & 7 deletions jrxml_reports/custom_reports/sqp_super_mo_form_2.jrxml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Supper Mo" language="groovy" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="2.9230756500000363"/>
<property name="ireport.x" value="222"/>
<property name="ireport.y" value="2050"/>
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="476"/>
<property name="ireport.y" value="127"/>
<property name="OPENERP_RELATIONS" value="[&quot;product_lines&quot;]"/>
<import value="org.apache.commons.codec.binary.Base64"/>
<style name="table" lineSpacing="Single">
Expand Down Expand Up @@ -636,14 +636,14 @@ Code]]></text>
<textElement textAlignment="Center" verticalAlignment="Middle" lineSpacing="Single">
<font fontName="Monospaced" size="9" isBold="false" pdfFontName="Garuda-Bold.ttf" pdfEncoding="Identity-H" isPdfEmbedded="false"/>
</textElement>
<text><![CDATA[บ่าย]]></text>
<text><![CDATA[PU]]></text>
</staticText>
<staticText>
<reportElement style="table" mode="Opaque" x="579" y="22" width="29" height="20" backcolor="#B5E7D3"/>
<textElement textAlignment="Center" verticalAlignment="Middle" lineSpacing="Single">
<font fontName="Monospaced" size="9" isBold="false" pdfFontName="Garuda-Bold.ttf" pdfEncoding="Identity-H" isPdfEmbedded="false"/>
</textElement>
<text><![CDATA[เช้า]]></text>
<text><![CDATA[PIR]]></text>
</staticText>
</band>
</groupHeader>
Expand Down Expand Up @@ -947,12 +947,12 @@ Code]]></text>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.000" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="608" y="0" width="29" height="15" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$F{bom_product_type} == "panel" && $F{mat_insulation_choice} == "PIR"]]></printWhenExpression>
<printWhenExpression><![CDATA[$F{bom_product_type} == "panel" && $F{mat_insulation_choice} == "PU"]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
<font fontName="Monospaced" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Garuda-Bold.ttf" pdfEncoding="Identity-H" isPdfEmbedded="false"/>
</textElement>
<textFieldExpression class="java.lang.Number"><![CDATA[$F{line5_inject2}]]></textFieldExpression>
<textFieldExpression class="java.lang.Number"><![CDATA[$F{line1_inject1}*1.12]]></textFieldExpression>
</textField>
<line>
<reportElement positionType="FixRelativeToBottom" x="0" y="15" width="802" height="1"/>
Expand Down
6 changes: 3 additions & 3 deletions jrxml_reports/custom_reports/sqp_supply_list_form.jrxml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Supply List" language="groovy" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="1.3636363636363689"/>
<property name="ireport.x" value="83"/>
<property name="ireport.x" value="12"/>
<property name="ireport.y" value="0"/>
<property name="OPENERP_RELATIONS" value="[&quot;move_lines&quot;]"/>
<import value="org.apache.commons.codec.binary.Base64"/>
Expand Down Expand Up @@ -200,14 +200,14 @@
</textElement>
<text><![CDATA[หน่วยงาน / Project : ]]></text>
</staticText>
<textField>
<textField isStretchWithOverflow="true">
<reportElement mode="Transparent" x="98" y="0" width="194" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
<font fontName="Monospaced" size="9" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Garuda-Bold.ttf" pdfEncoding="Identity-H" isPdfEmbedded="false"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{Supplier Name}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="98" y="21" width="194" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
<font fontName="Monospaced" size="9" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Garuda-Bold.ttf" pdfEncoding="Identity-H" isPdfEmbedded="false"/>
Expand Down
2 changes: 1 addition & 1 deletion rml_reports/purchase/request_quotation.rml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
</td>
<td>
<para style="terp_default_Right_9">
[[ formatLang(order_line.product_qty )]] [[ (order_line.product_uom and order_line.product_uom.name) or '' ]]
[[ '%.2f' % order_line.product_qty]] [[ (order_line.product_uom and order_line.product_uom.name) or '' ]]
</para>
</td>
</tr>
Expand Down

0 comments on commit 8953026

Please sign in to comment.