pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merging from the trunk

Browse Source 
bzr revid: mga@tinyerp.com-20081203144325-d4zlg60ah3nvancf
This commit is contained in:
Mantavya Gajjar
2008-12-03 20:13:25 +05:30
parent b3425d9c98 1a6932bf7d
commit d3300fe816
8 changed files with 190 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/.project
-17
View File
@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>openobject-addons</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.python.pydev.pythonNature</nature>
</natures>
</projectDescription>
addons/delivery/delivery_view.xml
+1 -2
View File
@@ -125,8 +125,7 @@
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<separator string="Notes" position="before">
<field name="id" invisible="True"/>
<field name="carrier_id" context="{'order_id':id}"/>
<field name="carrier_id"/>
</separator>
</field>
</record>
addons/delivery/sale.py
-4
View File
@@ -25,12 +25,8 @@ from osv import fields,osv
# Overloaded sale_order to manage carriers :
class sale_order(osv.osv):
_name = "sale.order"
_inherit = 'sale.order'
_description = "Sale Order"
_columns = {
'id': fields.integer('ID', readonly=True,invisible=True),
'carrier_id':fields.many2one("delivery.carrier","Delivery method", help="Complete this field if you plan to invoice the shipping based on packings made."),
}
addons/mrp_repair/report/order.rml
+175 -226
View File
@@ -10,7 +10,7 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="AddressTable">
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
@@ -48,19 +48,28 @@
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
</blockTableStyle>
<blockTableStyle id="HeadingTable">
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" 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"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table7">
<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"/>
@@ -68,81 +77,58 @@
<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="Table8">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table9">
<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">
<blockTableStyle id="Table10">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="3,2"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockTableStyle id="Table11">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table8">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica-Oblique" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P4" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P7" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P14" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P15" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P16" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P17" fontName="Helvetica"/>
<paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11"/>
<paraStyle name="P19" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
<paraStyle name="P20" fontName="Helvetica-Oblique" fontSize="2.0" leading="3"/>
<paraStyle name="P21" fontName="Helvetica-Oblique" fontSize="2.0" leading="3"/>
<paraStyle name="P22" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
<paraStyle name="P23" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P24" fontName="Helvetica" fontSize="2.0" leading="3"/>
<paraStyle name="P25" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/>
<paraStyle name="P26" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="P27" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P28" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P29" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P30" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P31" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P4" fontName="Helvetica-Oblique" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P7" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P9" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P13" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P16" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P17" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P18" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P20" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P21" fontName="Helvetica"/>
<paraStyle name="P22" fontName="Times-Roman"/>
<paraStyle name="P23" fontName="Times-Roman"/>
<paraStyle name="P24" fontName="Helvetica-Oblique" fontSize="2.0" leading="3"/>
<paraStyle name="P25" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" alignment="RIGHT"/>
<paraStyle name="P26" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
<paraStyle name="P27" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P28" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
<paraStyle name="P29" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
<paraStyle name="P30" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
<paraStyle name="P31" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P32" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P33" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P34" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P35" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P36" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P37" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P38" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P39" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P40" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P41" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P33" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -180,271 +166,234 @@
</stylesheet>
<images/>
<story>
<para style="P9">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="265.0,51.0,225.0" style="AddressTable">
<para style="P11">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="265.0,51.0,225.0" style="Table1">
<tr>
<td>
<para style="P10">Shipping address :</para>
<para style="P1">[[ o.partner_id.name ]]</para>
<para style="P1">[[ o.address_id.title or '' ]] [[ o.address_id.name ]]</para>
<para style="P1">[[ o.address_id.street ]]</para>
<para style="P1">[[ o.address_id.street2 or '' ]]</para>
<para style="P1">[[ o.address_id.city or '' ]] [[ o.address_id.zip or '' ]]</para>
<para style="P1">[[ o.address_id.state_id and o.address_id.state_id.name or '' ]] [[ o.address_id.country_id and o.address_id.country_id.name or '' ]]</para>
<para style="P1">
<para style="P5">Shipping address :</para>
<para style="P3">[[ o.partner_id.name ]]</para>
<para style="P3">[[ o.address_id.title or '' ]] [[ o.address_id.name ]]</para>
<para style="P3">[[ o.address_id.street ]]</para>
<para style="P3">[[ o.address_id.street2 or '' ]]</para>
<para style="P3">[[ o.address_id.city or '' ]] [[ o.address_id.zip or '' ]]</para>
<para style="P3">[[ o.address_id.state_id and o.address_id.state_id.name or '' ]] [[ o.address_id.country_id and o.address_id.country_id.name or '' ]]</para>
<para style="P3">
<font color="white"> </font>
</para>
<para style="P10">Invoice address :[[ o.partner_id and o.partner_id.property_payment_term.name and removeParentNode('para')]]</para>
<para style="P1">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
<para style="P1">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
<para style="P12">Invoice address :[[ o.partner_id and o.partner_id.property_payment_term.name ]]</para>
<para style="P3">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
<para style="P3">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
</td>
<td>
<para style="P9">
<para style="P11">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P1">[[ o.partner_id.name ]]</para>
<para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['name'] ]]</para>
<para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['street'] ]]</para>
<para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['zip'] ]] [[ o.partner_id and adr_get(o.partner_id, 'default')['city'] ]]</para>
<para style="P18">[[ o.partner_id and adr_get(o.partner_id, 'default')['country_id'] and adr_get(o.partner_id, 'default')['country_id'][1] ]]</para>
<para style="P3">[[ o.partner_id.name ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['name'] ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['street'] ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['zip'] ]][[ o.partner_id and adr_get(o.partner_id, 'default')['city'] ]]</para>
<para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['country_id'] and adr_get(o.partner_id, 'default')['country_id'][1] ]]</para>
<para style="P3">
<font color="white"> </font>
</para>
<para style="P3">
<font color="white"> </font>
</para>
<para style="P3">
<font color="white"> </font>
</para>
<para style="P3">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<para style="P11">
<font color="white"> </font>
</para>
<para style="P9">
<font color="white"> </font>
</para>
<para style="P7">
<para style="P7">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]]Repair Quotation <font face="Helvetica">N° : [[ o.name ]]</font></para>
<para style="P8">[[ o.state=='draft' and removeParentNode('para') ]]Repair Order N° : [[ o.name ]]</para>
<para style="P10">
<font color="white"> </font>
</para>
<para style="P6">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]]Repair Quotation N° : [[ o.name ]]</para>
<para style="P26">[[ o.state=='draft' and removeParentNode('para') ]]Repair Order N° : [[ o.name ]]</para>
<para style="P8">
<font color="white"> </font>
</para>
<para style="P5">
<para style="P6">
<font color="white"> </font>
</para>
<blockTable colWidths="130.0,136.0,136.0,136.0" style="Table2">
<tr>
<td>
<para style="P12">Product to Repair </para>
<para style="P14">Product to Repair </para>
</td>
<td>
<para style="P12">Lot Number</para>
<para style="P14">Lot Number</para>
</td>
<td>
<para style="P12">Guarantee Limit </para>
<para style="P14">Guarantee Limit </para>
</td>
<td>
<para style="P12">Printing Date</para>
<para style="P14">Printing Date</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="130.0,136.0,136.0,136.0" style="Table3">
<tr>
<td>
<para style="P13">[[ o.product_id.name or '' ]]</para>
<para style="P15">[[ o.product_id.name or '' ]]</para>
</td>
<td>
<para style="P13">[[ o.prodlot_id.name or '' ]]</para>
<para style="P15">[[ o.prodlot_id.name or ' ' ]]</para>
</td>
<td>
<para style="P13">[[ time.strftime('%d/%m/%Y', time.strptime(o.guarantee_limit, '%Y-%m-%d')) ]]</para>
<para style="P15">[[ time.strftime('%d/%m/%Y', time.strptime(o.guarantee_limit, '%Y-%m-%d')) ]]</para>
</td>
<td>
<para style="P13">[[ time.strftime('%d/%m/%Y') ]]</para>
<para style="P15">[[ time.strftime('%d/%m/%Y')]] </para>
</td>
</tr>
</blockTable>
<para style="P9">
<para style="P11">
<font color="white"> </font>
</para>
<para style="P9">
<para style="P11">
<font color="white"> </font>
</para>
<blockTable colWidths="120.0,140.0,100.0,80.0,80.0" repeatRows="1" style="HeadingTable">
<blockTable colWidths="165.0,165.0,71.0,70.0,64.0" repeatRows="1" style="Table4">
<tr>
<td>
<para style="P11">Description</para>
<para style="P13">Description</para>
</td>
<td>
<para style="P11">VAT</para>
<para style="P13">VAT</para>
</td>
<td>
<para style="P14">Quantity</para>
<para style="P16">Quantity</para>
</td>
<td>
<para style="P15">Unit Price</para>
<para style="P17">Unit Price</para>
</td>
<td>
<para style="P16">Price</para>
<para style="P18">Price</para>
</td>
</tr>
</blockTable>
<section>
<para style="P32">
<font color="white"> </font>
</para>
<para style="P33">Operation Line(s)</para>
<blockTable colWidths="537.0" style="Table6">
<para style="P32"/>
<para style="P31">Operation Line(s)</para>
<blockTable colWidths="26.0,142.0,153.0,95.0,52.0,69.0" style="Table5">
<tr>
<td>
<para style="P4">[[ repeatIn(o.operations,'line') ]]</para>
<blockTable colWidths="120.0,140.0,100.0,80.0,80.0" style="Table7">
<tr>
<td>
<para style="P1">[[ line.name ]]</para>
</td>
<td>
<para style="P31">[[ ', '.join(map(lambda x: x.name, line.tax_id)) or '0.00' ]]</para>
</td>
<td>
<para style="P31">[[ line.product_uom_qty or '0.00' ]] [[ line.product_uom.name ]]</para>
</td>
<td>
<para style="P28">[[ line.price_unit ]]</para>
</td>
<td>
<para style="P29">[[ line.price_subtotal ]]</para>
</td>
</tr>
</blockTable>
<para style="P25">
<font color="white"> </font>
</para>
<para style="P4">[[ repeatIn(o.operations,'line') ]] </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 ]]</para>
</td>
<td>
<para style="P27">[[ ','.join(map( lambda x: x.name, line.tax_id)) or '0.00' ]]</para>
</td>
<td>
<para style="P19">[[ line.product_uom_qty or '0.00' ]] [[ line.product_uom.name ]] </para>
</td>
<td>
<para style="P1">[[ line.price_unit ]]</para>
</td>
<td>
<para style="P2">[[ line.price_subtotal ]]</para>
</td>
</tr>
</blockTable>
<para style="P34">
<font color="white"> </font>
</para>
</section>
<para style="P22">Fees Line(s)</para>
<blockTable colWidths="539.0" style="Table8">
<tr>
<td>
<para style="P23">[[ repeatIn(o.fees_lines,'fees') ]]</para>
<blockTable colWidths="120.0,140.0,100.0,80.0,80.0" style="Table9">
<tr>
<td>
<para style="P1">[[ fees.name ]]</para>
</td>
<td>
<para style="P31">[[ ', '.join(map(lambda x: x.name, fees.tax_id)) or '0.00' ]]</para>
</td>
<td>
<para style="P31">[[ fees.product_uom_qty or '0.00' ]] [[ fees.product_uom.name ]] </para>
</td>
<td>
<para style="P28">[[ fees.price_unit ]]</para>
</td>
<td>
<para style="P29">[[ fees.price_subtotal ]]</para>
</td>
</tr>
</blockTable>
<para style="P24">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<para style="P21">
<font color="white"> </font>
</para>
<para style="P26">Fees Line(s)</para>
<para style="P20">
<font color="white"> </font>
</para>
<blockTable colWidths="410.0,59.0,50.0,22.0" style="Table4">
<tr>
<td>
<para style="p1">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P35">Net Total :</para>
</td>
<td>
<para style="P27">[[ o.amount_untaxed or '0.00' ]]</para>
</td>
<td>
<para style="P30">[[ o.pricelist_id.currency_id.name ]]</para>
</td>
</tr>
<blockTable colWidths="28.0,145.0,150.0,96.0,51.0,69.0" style="Table6">
<tr>
<td>
<para style="p1">
<font color="white"> </font>
</para>
<para style="P20">[[ repeatIn(o.fees_lines,'fees') ]]</para>
</td>
<td>
<para style="P35">Taxes :</para>
<para style="P3">[[ fees.name ]]</para>
</td>
<td>
<para style="P27">[[ o.amount_tax or '0.00' ]]</para>
<para style="P27">[[ ','.join(map( lambda x: x.name, fees.tax_id)) or '0.00' ]]</para>
</td>
<td>
<para style="P30">[[ o.pricelist_id.currency_id.name ]]</para>
<para style="P19">[[ fees.product_uom_qty or '0.00' ]] [[ fees.product_uom.name ]] </para>
</td>
<td>
<para style="P1">[[ fees.price_unit ]]</para>
</td>
<td>
<para style="P2">[[ fees.price_subtotal ]]</para>
</td>
</tr>
</blockTable>
<para style="P24">
<font color="white"> </font>
</para>
<para style="P24">
<font color="white"> </font>
</para>
<blockTable colWidths="444.0,61.0,34.0" style="Table9">
<tr>
<td>
<para style="P1">
<font color="white"> </font>
</para>
<para style="P28">Net Total :</para>
</td>
<td>
<para style="P35">Total :</para>
<para style="P29">[[ o.amount_untaxed or '0.00' ]]</para>
</td>
<td>
<para style="P27">[[ total(o) ]] </para>
</td>
<td>
<para style="P30">[[ o.pricelist_id.currency_id.name ]]</para>
<para style="P29">[[ o.pricelist_id.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="444.0,61.0,34.0" style="Table10">
<tr>
<td>
<para style="P1">
<font color="white"> </font>
</para>
<para style="P28">Taxes:</para>
</td>
<td>
<para style="P35">
<font color="white"> </font>
</para>
<para style="P29">[[ o.amount_tax or '0.00']]</para>
</td>
<td>
<para style="P27">
<font color="white"> </font>
</para>
<para style="P29">[[ o.pricelist_id.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="444.0,61.0,34.0" style="Table11">
<tr>
<td>
<para style="P28">Total :</para>
</td>
<td>
<para style="P30">
<font color="white"> </font>
</para>
<para style="P30">[[ total(o) ]]</para>
</td>
<td>
<para style="P29">[[ o.pricelist_id.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="492.0" style="Table1">
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="534.0" style="Table8">
<tr>
<td>
<para style="P1">[[ format(o.quotation_notes or '') ]]</para>
<para style="P3">[[ format(o.quotation_notes or '') ]]</para>
</td>
</tr>
</blockTable>
<para style="P17">
<para style="P21">
<font color="white"> </font>
</para>
</story>
</document>
</document>
addons/project/project.py
+9 -15
View File
@@ -246,6 +246,15 @@ class task(osv.osv):
#_sql_constraints = [
# ('remaining_hours', 'CHECK (remaining_hours>=0)', 'Please increase and review remaining hours ! It can not be smaller than 0.'),
#]
def _button_dummy(self, cr, uid, ids, context={}):
tot_work=0
for obj in self.browse(cr,uid,ids):
for work in obj.work_ids:
tot_work+=work.hours
final_val = obj.planned_hours - tot_work
self.write(cr,uid,ids[0],{'remaining_hours':final_val})
return True
def copy(self, cr, uid, id, default={},context={}):
default = default or {}
@@ -408,23 +417,8 @@ class project_work(osv.osv):
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S')
}
_order = "date desc"
def create(self, cr, uid, vals, *args, **kwargs):
if 'task_id' in vals:
cr.execute('update project_task set remaining_hours=remaining_hours+%.2f where id=%d', (-vals.get('hours',0.0), vals['task_id']))
return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
def write(self, cr, uid, ids,vals,context={}):
for work in self.browse(cr, uid, ids, context):
cr.execute('update project_task set remaining_hours=remaining_hours+%.2f+(%.2f) where id=%d', (-vals.get('hours',0.0), work.hours, work.task_id.id))
return super(project_work,self).write(cr, uid, ids, vals, context)
def unlink(self, cr, uid, ids, *args, **kwargs):
for work in self.browse(cr, uid, ids):
cr.execute('update project_task set remaining_hours=remaining_hours+%.2f where id=%d', (work.hours, work.task_id.id))
return super(project_work,self).unlink(cr, uid, ids,*args, **kwargs)
project_work()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/project/project_demo.xml
+1 -1
View File
@@ -89,7 +89,7 @@
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project_project_21"/>
<field name="name">Internal testing + Software Install</field>
<field name="date_deadline">2007-06-06</field>
<field name="date_deadline">2008-06-06</field>
</record>
<record id="project_task_188" model="project.task">
<field name="sequence">17</field>
addons/project/project_view.xml
+3 -2
View File
@@ -220,7 +220,8 @@
widget="float_time"
on_change="onchange_planned(planned_hours,effective_hours)"/>
<field name="delay_hours" widget="float_time"/>
<field name="remaining_hours" select="2" widget="float_time"/>
<field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="1"/>
<button name="_button_dummy" string="Compute" type="object" colspan="1"/>
<field name="effective_hours" widget="float_time"/>
<field colspan="4" name="description" nolabel="1" select="2"/>
@@ -507,6 +508,6 @@
<act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form" view_type="form"/>
<act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
</data>
</openerp>
addons/project/wizard/task_delegate.py
+1
View File
@@ -83,6 +83,7 @@ class wizard_delegate(wizard.interface):
'planned_hours': task.remaining_hours,
'planned_hours_me': 1.0,
'prefix': 'CHECK: '+ (task.name or ''),
'include_info': 1,
'state': 'pending'
}