improved_view

bzr revid: fp@tinyerp.com-20081126155520-x3xo4zz408wobboh

diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py
index 881b759..7c2350f 100644 (file)
--- a/addons/crm_configuration/__terp__.py
+++ b/addons/crm_configuration/__terp__.py
@@ -78,7 +78,7 @@ meetings, eso.
 #         "crm_phonecall_data.xml",
 #         "crm_phonecall_menu.xml",
          "security/ir.model.access.csv",
-         "process/crm_configuration_process.xml",
+#         "process/crm_configuration_process.xml",
     ],
     "active": False,
     "installable": True

diff --git a/addons/custom/corporate_defaults.xml b/addons/custom/corporate_defaults.xml
deleted file mode 100644 (file)
index cef5acd..0000000
--- a/addons/custom/corporate_defaults.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<corporate-header>
-    <corporation type="zoom" name="company_id">
-        <rml_header1 type="field" name="rml_header1"/>
-        <rml_footer1 type="field" name="rml_footer1"/>
-        <rml_footer2 type="field" name="rml_footer2"/>
-        <title type="field" name="partner_id.title"/>
-        <name type="field" name="partner_id.name"/>
-        <address type="zoom" name="partner_id.address">
-            <street type="field" name="street"/>
-            <zip type="field" name="zip"/>
-            <city type="field" name="city"/>
-            <state type="field" name="state_id.name"/>
-            <country type="field" name="country_id.name"/>
-            <phone type="field" name="phone"/>
-            <email type="field" name="email"/>
-        </address>
-    </corporation>
-    <user>
-        <name type="field" name="name"/>
-        <signature type="field" name="signature"/>
-    </user>
-</corporate-header>

diff --git a/addons/custom/corporate_defaults.xsl b/addons/custom/corporate_defaults.xsl
deleted file mode 100644 (file)
index 71d940c..0000000
--- a/addons/custom/corporate_defaults.xsl
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version = '1.0' encoding="utf-8"?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-       <xsl:variable name="signature" select="//corporate-header/user/signature"/>
-       <xsl:variable name="title">Tiny ERP Report</xsl:variable>
-       <xsl:variable name="leftMargin">1cm</xsl:variable>
-       <xsl:variable name="rightMargin">1cm</xsl:variable>
-       <xsl:variable name="topMargin">1cm</xsl:variable>
-       <xsl:variable name="bottomMargin">1cm</xsl:variable>
-       <xsl:variable name="pageSize">21cm,29.7cm</xsl:variable>
-
-       <xsl:variable name="page_format">a4_letter</xsl:variable>
-
-       <xsl:template name="first_page_graphics_corporation">
-               <!--logo-->
-               <setFont name="Helvetica" size="14"/>
-               <fill color="black"/>
-               <stroke color="black"/>
-               <drawString x="1cm" y="27.6cm"><xsl:value-of select="//corporate-header/corporation/name"/></drawString>
-               <lines>1cm 25.4cm 20cm 25.4cm</lines>
-<!--           <lines>1cm 25.7cm 7cm 25.7cm</lines>-->
-
-               <setFont name="Helvetica" size="10"/>
-               <drawRightString x="1cm" y="27.5cm"><xsl:value-of select="//corporate-header/corporation/rml_header1"/></drawRightString>
-               <drawString x="1cm" y="27cm"><xsl:value-of select="//corporate-header/corporation/address/street"/></drawString>
-               <drawString x="1cm" y="26.5cm">
-                       <xsl:value-of select="//corporate-header/corporation/address/zip"/>
-                       <xsl:text> </xsl:text>
-                       <xsl:value-of select="//corporate-header/corporation/address/city"/>
-                       <xsl:text> - </xsl:text>
-                       <xsl:value-of select="//corporate-header/corporation/address/country"/>
-               </drawString>
-               <drawString x="1cm" y="26cm">Phone:</drawString>
-               <drawRightString x="7cm" y="26cm"><xsl:value-of select="//corporate-header/corporation/address/phone"/></drawRightString>
-               <drawString x="1cm" y="25.5cm">Mail:</drawString>
-               <drawRightString x="7cm" y="25.5cm"><xsl:value-of select="//corporate-header/corporation/address/email"/></drawRightString>
- 
-
-               <!--page bottom-->
-               
-               <lines>1.5cm 1.2cm 19.9cm 1.2cm</lines>
-               <drawCentredString x="10.5cm" y="1.7cm"><xsl:value-of select="//corporate-header/corporation/rml_footer1"/></drawCentredString>
-               <drawCentredString x="10.5cm" y="1.25cm"><xsl:value-of select="//corporate-header/corporation/rml_footer2"/></drawCentredString>
-               <drawCentredString x="10.5cm" y="0.8cm">Your contact : <xsl:value-of select="//corporate-header/user/name"/></drawCentredString>
-       
-       </xsl:template>
-       
-
-       <xsl:template name="other_pages_graphics_corporation">
-               <!--logo-->
-               <setFont name="Helvetica" size="14"/>
-               <fill color="black"/>
-               <stroke color="black"/>
-               <drawString x="1cm" y="27.6cm"><xsl:value-of select="//corporate-header/corporation/name"/></drawString>
-               <lines>1cm 25.4cm 20cm 25.4cm</lines>
-<!--           <lines>1cm 25.7cm 7cm 25.7cm</lines>-->
-
-               <setFont name="Helvetica" size="10"/>
-               <drawRightString x="1cm" y="27.5cm"><xsl:value-of select="//corporate-header/corporation/rml_header1"/></drawRightString>
-               <drawString x="1cm" y="27cm"><xsl:value-of select="//corporate-header/corporation/address/street"/></drawString>
-               <drawString x="1cm" y="26.5cm">
-                       <xsl:value-of select="//corporate-header/corporation/address/zip"/>
-                       <xsl:text> </xsl:text>
-                       <xsl:value-of select="//corporate-header/corporation/address/city"/>
-                       <xsl:text> - </xsl:text>
-                       <xsl:value-of select="//corporate-header/corporation/address/country"/>
-               </drawString>
-               <drawString x="1cm" y="26cm">Phone:</drawString>
-               <drawRightString x="7cm" y="26cm"><xsl:value-of select="//corporate-header/corporation/address/phone"/></drawRightString>
-               <drawString x="1cm" y="25.5cm">Mail:</drawString>
-               <drawRightString x="7cm" y="25.5cm"><xsl:value-of select="//corporate-header/corporation/address/email"/></drawRightString>
-
-               <!--page bottom-->
-               
-               <lines>1.5cm 1.2cm 19.9cm 1.2cm</lines>
-               <drawCentredString x="10.5cm" y="1.7cm"><xsl:value-of select="//corporate-header/corporation/rml_footer1"/></drawCentredString>
-               <drawCentredString x="10.5cm" y="1.25cm"><xsl:value-of select="//corporate-header/corporation/rml_footer2"/></drawCentredString>
-<!--           <drawCentredString x="10.5cm" y="0.8cm">Your contact : <xsl:value-of select="//corporate-header/user/name"/></drawCentredString>-->
-       </xsl:template>
-
-       <xsl:template name="first_page_frames">
-               <xsl:if test="$page_format='a4_normal'">
-                       <frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="22.0cm"/>
-               </xsl:if>
-
-               <xsl:if test="$page_format='a4_letter'">
-                       <frame id="address" x1="11cm" y1="21.5cm" width="6cm" height="4cm"/>
-                       <frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="17.5cm"/>
-               </xsl:if>
-       </xsl:template>
-
-       <xsl:template name="other_pages_frames">
-               <frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="22cm"/>
-       </xsl:template>
-
-</xsl:stylesheet>

diff --git a/addons/custom/corporate_sxw_header.xml b/addons/custom/corporate_sxw_header.xml
deleted file mode 100644 (file)
index 2f6f885..0000000
--- a/addons/custom/corporate_sxw_header.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-styles xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" office:version="1.0">
-    <office:font-decls>
-        <style:font-decl style:name="Helvetica" fo:font-family="Helvetica"/>
-        <style:font-decl style:name="Times" fo:font-family="Times"/>
-        <style:font-decl style:name="Helvetica1" fo:font-family="Helvetica" style:font-family-generic="swiss"/>
-        <style:font-decl style:name="Monospace" fo:font-family="Monospace" style:font-pitch="fixed"/>
-        <style:font-decl style:name="DejaVu Sans" fo:font-family="&apos;DejaVu Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
-    </office:font-decls>
-    <office:styles>
-        <style:default-style style:family="graphics">
-            <style:properties draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false" style:use-window-font-color="true" fo:font-size="12pt" fo:language="en" fo:country="IN" style:letter-kerning="true" style:font-size-asian="10.5pt" style:language-asian="zxx" style:country-asian="none" style:font-size-complex="12pt" style:language-complex="zxx" style:country-complex="none">
-                <style:tab-stops/>
-            </style:properties>
-        </style:default-style>
-        <style:default-style style:family="paragraph">
-            <style:properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page" style:use-window-font-color="true" style:font-name="Times" fo:font-size="12pt" fo:language="en" fo:country="IN" style:letter-kerning="true" style:font-name-asian="DejaVu Sans" style:font-size-asian="10.5pt" style:language-asian="zxx" style:country-asian="none" style:font-name-complex="DejaVu Sans" style:font-size-complex="12pt" style:language-complex="zxx" style:country-complex="none" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"/>
-        </style:default-style>
-        <style:default-style style:family="table">
-            <style:properties table:border-model="collapsing"/>
-        </style:default-style>
-        <style:default-style style:family="table-row">
-            <style:properties fo:keep-together="always"/>
-        </style:default-style>
-        <style:style style:name="Standard" style:family="paragraph" style:class="text"/>
-        <style:style style:name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text">
-            <style:properties fo:margin-top="0cm" fo:margin-bottom="0.212cm"/>
-        </style:style>
-        <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text body" style:class="text">
-            <style:properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" fo:keep-with-next="true" style:font-name="Helvetica" fo:font-size="14pt" style:font-name-asian="DejaVu Sans" style:font-size-asian="14pt" style:font-name-complex="DejaVu Sans" style:font-size-complex="14pt"/>
-        </style:style>
-        <style:style style:name="List" style:family="paragraph" style:parent-style-name="Text body" style:class="list">
-            <style:properties style:font-name="Times" style:font-size-asian="12pt"/>
-        </style:style>
-        <style:style style:name="Header" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
-            <style:properties text:number-lines="false" text:line-number="0" fo:color="#0000ff" style:font-size-asian="10.5pt">
-                <style:tab-stops>
-                    <style:tab-stop style:position="8.498cm" style:type="center"/>
-                    <style:tab-stop style:position="16.999cm" style:type="right"/>
-                </style:tab-stops>
-            </style:properties>
-        </style:style>
-        <style:style style:name="Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
-            <style:properties text:number-lines="false" text:line-number="0">
-                <style:tab-stops>
-                    <style:tab-stop style:position="8.498cm" style:type="center"/>
-                    <style:tab-stop style:position="16.999cm" style:type="right"/>
-                </style:tab-stops>
-            </style:properties>
-        </style:style>
-        <style:style style:name="Table Contents" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
-            <style:properties text:number-lines="false" text:line-number="0"/>
-        </style:style>
-        <style:style style:name="Table Heading" style:family="paragraph" style:parent-style-name="Table Contents" style:class="extra">
-            <style:properties fo:text-align="center" style:justify-single-word="false" text:number-lines="false" text:line-number="0" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
-        </style:style>
-        <style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
-            <style:properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" text:number-lines="false" text:line-number="0" style:font-name="Times" fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-size-complex="12pt" style:font-style-complex="italic"/>
-        </style:style>
-        <style:style style:name="Index" style:family="paragraph" style:parent-style-name="Standard" style:class="index">
-            <style:properties text:number-lines="false" text:line-number="0" style:font-name="Times" style:font-size-asian="12pt"/>
-        </style:style>
-        <style:style style:name="Footnote Symbol" style:family="text"/>
-        <style:style style:name="Endnote Symbol" style:family="text"/>
-        <style:style style:name="Graphics" style:family="graphics">
-            <style:properties text:anchor-type="paragraph" svg:x="0cm" svg:y="0cm" style:wrap="dynamic" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="center" style:horizontal-rel="paragraph"/>
-        </style:style>
-        <text:outline-style>
-            <text:outline-level-style text:level="1" style:num-format="">
-                <style:properties text:min-label-distance="0.381cm"/>
-            </text:outline-level-style>
-            <text:outline-level-style text:level="2" style:num-format="">
-                <style:properties text:min-label-distance="0.381cm"/>
-            </text:outline-level-style>
-            <text:outline-level-style text:level="3" style:num-format="">
-                <style:properties text:min-label-distance="0.381cm"/>
-            </text:outline-level-style>
-            <text:outline-level-style text:level="4" style:num-format="">
-                <style:properties text:min-label-distance="0.381cm"/>
-            </text:outline-level-style>
-            <text:outline-level-style text:level="5" style:num-format="">
-                <style:properties text:min-label-distance="0.381cm"/>
-            </text:outline-level-style>
-            <text:outline-level-style text:level="6" style:num-format="">
-                <style:properties text:min-label-distance="0.381cm"/>
-            </text:outline-level-style>
-            <text:outline-level-style text:level="7" style:num-format="">
-                <style:properties text:min-label-distance="0.381cm"/>
-            </text:outline-level-style>
-            <text:outline-level-style text:level="8" style:num-format="">
-                <style:properties text:min-label-distance="0.381cm"/>
-            </text:outline-level-style>
-            <text:outline-level-style text:level="9" style:num-format="">
-                <style:properties text:min-label-distance="0.381cm"/>
-            </text:outline-level-style>
-            <text:outline-level-style text:level="10" style:num-format="">
-                <style:properties text:min-label-distance="0.381cm"/>
-            </text:outline-level-style>
-        </text:outline-style>
-        <text:footnotes-configuration text:citation-style-name="Footnote Symbol" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="page"/>
-        <text:endnotes-configuration text:citation-style-name="Endnote Symbol" text:master-page-name="Endnote" style:num-format="1" text:start-value="0"/>
-        <text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/>
-    </office:styles>
-    <office:automatic-styles>
-        <style:style style:name="Table2" style:family="table">
-            <style:properties style:width="16.999cm" table:align="margins"/>
-        </style:style>
-        <style:style style:name="Table2.A" style:family="table-column">
-            <style:properties style:column-width="4.235cm" style:rel-column-width="16329*"/>
-        </style:style>
-        <style:style style:name="Table2.B" style:family="table-column">
-            <style:properties style:column-width="12.764cm" style:rel-column-width="49206*"/>
-        </style:style>
-        <style:style style:name="Table2.A1" style:family="table-cell">
-            <style:properties fo:vertical-align="bottom" fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.018cm solid #000000"/>
-        </style:style>
-        <style:style style:name="Table3" style:family="table">
-            <style:properties style:width="7.936cm" table:align="left"/>
-        </style:style>
-        <style:style style:name="Table3.A" style:family="table-column">
-            <style:properties style:column-width="1.933cm"/>
-        </style:style>
-        <style:style style:name="Table3.B" style:family="table-column">
-            <style:properties style:column-width="6.003cm"/>
-        </style:style>
-        <style:style style:name="Table3.A1" style:family="table-cell">
-            <style:properties fo:vertical-align="bottom" fo:padding="0.097cm" fo:border="none"/>
-        </style:style>
-        <style:style style:name="Table3.A2" style:family="table-cell">
-            <style:properties fo:vertical-align="bottom" fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.018cm solid #000000"/>
-        </style:style>
-        <style:style style:name="Table1" style:family="table">
-            <style:properties style:width="16.999cm" table:align="margins"/>
-        </style:style>
-        <style:style style:name="Table1.A" style:family="table-column">
-            <style:properties style:column-width="16.999cm" style:rel-column-width="65535*"/>
-        </style:style>
-        <style:style style:name="Table1.A1" style:family="table-cell">
-            <style:properties fo:background-color="transparent" fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" fo:border-top="0.018cm solid #000000" fo:border-bottom="none">
-                <style:background-image/>
-            </style:properties>
-        </style:style>
-        <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Header">
-            <style:properties fo:color="#0000ff" style:font-name="Helvetica1" fo:font-size="30pt" style:font-name-asian="Monospace" style:font-size-asian="30pt" style:font-name-complex="Monospace" style:font-size-complex="30pt"/>
-        </style:style>
-        <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Table Contents">
-            <style:properties fo:text-align="end" style:justify-single-word="false" fo:color="#0000ff" style:font-name="Helvetica1" fo:font-size="10pt" style:font-name-asian="Monospace" style:font-size-asian="10pt" style:font-name-complex="Monospace" style:font-size-complex="10pt"/>
-        </style:style>
-        <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Header">
-            <style:properties style:font-name="Monospace" fo:font-size="10pt" style:font-name-asian="Monospace" style:font-size-asian="10pt" style:font-name-complex="Monospace" style:font-size-complex="10pt"/>
-        </style:style>
-        <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Table Contents">
-            <style:properties fo:color="#0000ff" style:font-name="Helvetica1" fo:font-size="10pt" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-        </style:style>
-        <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Table Contents">
-            <style:properties fo:text-align="end" style:justify-single-word="false" fo:color="#0000ff" style:font-name="Monospace" fo:font-size="10pt" style:font-name-asian="Monospace" style:font-size-asian="10pt" style:font-name-complex="Monospace" style:font-size-complex="10pt"/>
-        </style:style>
-        <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Header">
-            <style:properties style:font-name="Helvetica1" fo:font-size="10pt" style:font-size-asian="8.75pt" style:font-size-complex="10pt"/>
-        </style:style>
-        <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Footer">
-            <style:properties fo:text-align="center" style:justify-single-word="false" fo:color="#0000ff" style:font-name="Helvetica1" fo:font-size="10pt" style:font-name-asian="Monospace" style:font-size-asian="10pt" style:font-name-complex="Monospace" style:font-size-complex="10pt"/>
-        </style:style>
-        <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Footer">
-            <style:properties fo:text-align="center" style:justify-single-word="false" style:font-name="Helvetica1" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
-        </style:style>
-        <style:style style:name="T1" style:family="text">
-            <style:properties fo:color="#0000ff"/>
-        </style:style>
-        <style:style style:name="T2" style:family="text">
-            <style:properties fo:color="#0000ff" fo:font-size="10pt" style:font-name-asian="Monospace" style:font-size-asian="10pt" style:font-name-complex="Monospace" style:font-size-complex="10pt"/>
-        </style:style>
-        <style:page-master style:name="pm1">
-            <style:properties fo:page-width="20.999cm" fo:page-height="29.699cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:footnote-max-height="0cm">
-                <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
-            </style:properties>
-            <style:header-style>
-                <style:properties fo:min-height="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-bottom="0.499cm"/>
-            </style:header-style>
-            <style:footer-style>
-                <style:properties fo:min-height="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.499cm"/>
-            </style:footer-style>
-        </style:page-master>
-        <style:page-master style:name="pm2">
-            <style:properties fo:page-width="20.999cm" fo:page-height="29.699cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:footnote-max-height="0cm">
-                <style:footnote-sep style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
-            </style:properties>
-            <style:header-style/>
-            <style:footer-style/>
-        </style:page-master>
-    </office:automatic-styles>
-    <office:master-styles>
-        <style:master-page style:name="Standard" style:page-master-name="pm1">
-            <style:header>
-                <table:table table:name="Table2" table:style-name="Table2">
-                    <table:table-column table:style-name="Table2.A"/>
-                    <table:table-column table:style-name="Table2.B"/>
-                    <table:table-row>
-                        <table:table-cell table:style-name="Table2.A1" table:value-type="string">
-                            <text:p text:style-name="P1">[[ company.partner_id.name ]]</text:p>
-                        </table:table-cell>
-                        <table:table-cell table:style-name="Table2.A1" table:value-type="string">
-                            <text:p text:style-name="P2">[[ company.rml_header1 ]]</text:p>
-                        </table:table-cell>
-                    </table:table-row>
-                </table:table>
-                <text:p text:style-name="P3">[[ company.partner_id.address and company.partner_id.address[0].street ]]</text:p>
-                <text:p text:style-name="P3">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</text:p>
-                <table:table table:name="Table3" table:style-name="Table3">
-                    <table:table-column table:style-name="Table3.A"/>
-                    <table:table-column table:style-name="Table3.B"/>
-                    <table:table-row>
-                        <table:table-cell table:style-name="Table3.A1" table:value-type="string">
-                            <text:p text:style-name="P4">Phone :</text:p>
-                        </table:table-cell>
-                        <table:table-cell table:style-name="Table3.A1" table:value-type="string">
-                            <text:p text:style-name="P5">[[ company.partner_id.address and company.partner_id.address[0].phone ]]</text:p>
-                        </table:table-cell>
-                    </table:table-row>
-                    <table:table-row>
-                        <table:table-cell table:style-name="Table3.A2" table:value-type="string">
-                            <text:p text:style-name="P4">Mail :</text:p>
-                        </table:table-cell>
-                        <table:table-cell table:style-name="Table3.A2" table:value-type="string">
-                            <text:p text:style-name="P5">[[ company.partner_id.address and company.partner_id.address[0].email ]]</text:p>
-                        </table:table-cell>
-                    </table:table-row>
-                </table:table>
-                <text:p text:style-name="P6"/>
-            </style:header>
-            <style:footer>
-                <table:table table:name="Table1" table:style-name="Table1">
-                    <table:table-column table:style-name="Table1.A"/>
-                    <table:table-row>
-                        <table:table-cell table:style-name="Table1.A1" table:value-type="string">
-                            <text:p text:style-name="P7">[[ company.rml_footer1 ]]</text:p>
-                            <text:p text:style-name="P7">[[ company.rml_footer2 ]]</text:p>
-                            <text:p text:style-name="P7">Contact : [[ user.name ]]</text:p>
-                        </table:table-cell>
-                    </table:table-row>
-                </table:table>
-            </style:footer>
-        </style:master-page>
-        <style:master-page style:name="Endnote" style:page-master-name="pm2"/>
-    </office:master-styles>
-</office:document-styles>

diff --git a/addons/custom/custom.py b/addons/custom/custom.py
index 0fc394d..c14e4dc 100644 (file)
--- a/addons/custom/custom.py
+++ b/addons/custom/custom.py
@@ -22,16 +22,15 @@
 
 from osv import osv, fields
 
-#class custom_material(osv.osv):
-#   _name = 'network.material'
-#   _inherit = 'network.material'
-#   _columns = {
-#   }
-#   _defaults = {
-#   }
-#custom_material()
+class metalfut_quality(osv.osv):
+    _name = 'metalfut.quality'
+    _columns = {
+        'name': fields.char('Name', size=32),
+        'agr_nbr': fields.char('Agregation Ref', size=16),
+        'fut_nbr': fields.integer('Fut number')
 
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    }
+    _defaults = {
+    }
+ metalfut_quality()
 

diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 3001ac6..c79aae1 100644 (file)
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -4,7 +4,6 @@
     <record id="group_hr_manager" model="res.groups">
         <field name="name">Human Resources / Manager</field>
     </record>
-    
     <record id="group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>

diff --git a/addons/hr_attendance/__terp__.py b/addons/hr_attendance/__terp__.py
index a3145e6..10abc85 100644 (file)
--- a/addons/hr_attendance/__terp__.py
+++ b/addons/hr_attendance/__terp__.py
@@ -28,10 +28,11 @@
     "depends" : ["base","hr",],
     "demo_xml" : ["hr_attendance_demo.xml"],
     "update_xml" : [
+       "security/hr_security.xml",
        "hr_attendance_view.xml",
        "hr_attendance_wizard.xml",
        "hr_attendance_report.xml",
-          "security/ir.model.access.csv",
+       "security/ir.model.access.csv"
     ],
     "active": False,
     "installable": True,

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 45d1126..5ff3c92 100644 (file)
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -48,7 +48,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"/>
+        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"
+            groups="group_hr_attendance"/>
         <menuitem action="open_view_attendance" id="menu_open_view_attendance"
             parent="menu_hr_attendance" groups="hr.group_hr_manager"/>
         

diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index 707e63a..27dbe06 100644 (file)
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -5,7 +5,8 @@
                <wizard id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>
                <wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.timesheet.attendance.report" string="Print Attendance Error Report"/>
 
-        <menuitem action="si_so" id="menu_si_so" parent="menu_hr_attendance" type="wizard"/>
+        <menuitem action="si_so" id="menu_si_so" parent="menu_hr_attendance" type="wizard"
+            groups="group_hr_attendance"/>
         
     </data>
 </openerp>

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 37b53c1..7792fae 100644 (file)
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -11,9 +11,9 @@
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="name"/>
-                    <field name="total_attendance"/>
+                    <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
                     <field name="total_timesheet"/>
-                    <field name="total_difference"/>
+                    <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -58,8 +58,8 @@
                     <field name="sheet_id" select="1"/>
                     <field name="name" select="1"/>
                     <field name="total_timesheet"/>
-                    <field name="total_attendance"/>
-                    <field name="total_difference"/>
+                    <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
+                    <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
                 </form>
             </field>
         </record>
@@ -74,8 +74,8 @@
                     <field name="sheet_id"/>
                     <field name="name"/>
                     <field name="total_timesheet" sum="Total Timesheet"/>
-                    <field name="total_attendance" sum="Total Attendance"/>
-                    <field name="total_difference" sum="Total Difference"/>
+                    <field name="total_attendance" sum="Total Attendance" groups="hr_attendance.group_hr_attendance"/>
+                    <field name="total_difference" sum="Total Difference" groups="hr_attendance.group_hr_attendance"/>
                 </tree>
             </field>
         </record>
@@ -102,21 +102,21 @@
                                 <button icon="gtk-media-next" name="date_next" string="" type="object"/>
                             </group>
                             
-                            <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1">
+                            <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="hr_attendance.group_hr_attendance">
                                 <tree string="Attendances">
                                     <field name="name"/>
                                     <field name="action"/>
                                     <field invisible="1" name="employee_id"/>
                                 </tree>
                             </field>
-                            <group col="1" colspan="1">
+                            <group col="1" colspan="1" groups="hr_attendance.group_hr_attendance">
                                 <button name="sign_in" string="Sign In" type="object"/>
                                 <button name="sign_out" string="Sign Out" type="object"/>
                             </group>
                             
                             
-                            <field name="state_attendance"/>
-                            <field name="total_attendance_day" widget="float_time"/>
+                            <field name="state_attendance" groups="hr_attendance.group_hr_attendance"/>
+                            <field name="total_attendance_day" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
                             <field colspan="4" context="date=date_current,user_id=user_id" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet">
                                     <field invisible="1" name="date"/>
@@ -140,9 +140,9 @@
                             <field colspan="4" name="period_ids" nolabel="1">
                                 <tree colors="red:total_difference&lt;=0.1;blue:total_difference&gt;=0.1" string="Period">
                                     <field name="name"/>
-                                    <field name="total_attendance" widget="float_time"/>
+                                    <field name="total_attendance" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
                                     <field name="total_timesheet" widget="float_time"/>
-                                    <field name="total_difference" widget="float_time"/>
+                                    <field name="total_difference" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
                                 </tree>
                             </field>
                             <field name="total_attendance" widget="float_time"/>

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 3f61259..dd7552d 100644 (file)
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -518,7 +518,11 @@
             <field name="view_mode">gantt,tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('ready','confirmed','in_production'))]</field>
         </record>
-        <menuitem action="mrp_production_action2_gantt" id="menu_production_orders_start_gantt" parent="menu_mrp_production_action"/>
+        <menuitem
+            action="mrp_production_action2_gantt"
+            id="menu_production_orders_start_gantt"
+            parent="menu_mrp_production_action"
+            sequence="20"/>
 
         <record id="mrp_production_action2" model="ir.actions.act_window">
             <field name="name">Production Orders To Start</field>

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 10e8d06..9b92f22 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -28,7 +28,7 @@
                             <field name="active" select="2"/>
                             <field name="planned_hours" widget="float_time"/>
                             <field name="effective_hours" widget="float_time"/>
-                            <field name="category_id" select="2"/>
+                            <field name="category_id" select="2" context="{'default_name':name}"/>
                             <newline/>
                             <separator colspan="4" string="Project's members"/>
                             <field colspan="4" name="members" nolabel="1"/>