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

merge

Browse Source 
bzr revid: fp@tinyerp.com-20090304154924-p4xlq6nsefe3kfm6
This commit is contained in:
Fabien Pinckaers
2009-03-04 16:49:24 +01:00
parent af94f5356a 1b55876e7e
commit 445cb82263
9 changed files with 168 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_balance.py
+1 -1
View File
@@ -57,7 +57,7 @@ class account_balance(report_sxw.rml_parse):
def get_periods(self, form):
result=''
if form.has_key('periods'):
if form.has_key('periods') and form['periods'][0][2]:
period_ids = ",".join([str(x) for x in form['periods'][0][2] if x])
self.cr.execute("select name from account_period where id in (%s)" % (period_ids))
res=self.cr.fetchall()
addons/account/wizard/wizard_pay_invoice.py
+3 -3
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$
#
@@ -111,8 +111,8 @@ def _get_period(self, cr, uid, data, context={}):
if len(ids):
period_id = ids[0]
invoice = pool.get('account.invoice').browse(cr, uid, data['id'], context)
if invoice.state == 'draft':
raise wizard.except_wizard(_('Error !'), _('Can not pay draft invoice.'))
if invoice.state in ['draft', 'proforma2', 'cancel']:
raise wizard.except_wizard(_('Error !'), _('Can not pay draft/proforma/cancel invoice.'))
return {
'period_id': period_id,
'amount': invoice.residual,
addons/base_vat/partner.py
+2 -1
View File
@@ -47,7 +47,8 @@ class res_partner(osv.osv):
continue #FIXME return False? empty vat numbre is invalid?
vat_country, vat_number = partner.vat[:2].lower(), partner.vat[2:]
if vat_number.find(' ') != -1:
return False
check = getattr(self, 'check_vat_' + vat_country, lambda vn: False)
if not check(vat_number):
return False
addons/hr_contract/hr_contract.py
-3
View File
@@ -39,11 +39,8 @@ class hr_employee(osv.osv):
_inherit = "hr.employee"
_columns = {
'manager' : fields.boolean('Manager'),
'soc_security' : fields.char('Social security number', size=50, select=True),
'medic_exam' : fields.date('Medical examination date'),
'audiens_num' : fields.char('AUDIENS Number', size=30),
'nationality' : fields.many2one('res.country', 'Nationality'),
'birth_date' : fields.date('Birth Date'),
'place_of_birth' : fields.char('Place of Birth', size=30),
'marital_status' : fields.many2one('hr.employee.marital.status', 'Marital Status'),
'children' : fields.integer('Number of children'),
addons/hr_contract/hr_contract_view.xml
-3
View File
@@ -109,11 +109,8 @@
</page>
<page string="Miscelleanous">
<field name="manager" select="1"/>
<field name="soc_security" select="1"/>
<field name="medic_exam" select="1"/>
<field name="audiens_num"/>
<field name="nationality"/>
<field name="birth_date"/>
<field name="place_of_birth"/>
<field name="marital_status"/>
<field name="children"/>
addons/l10n_fr/l10n_fr_pcg_account_report.xml
-11
View File
@@ -55,17 +55,6 @@
<field eval="1" name="active"/>
<field eval="&quot;&quot;&quot;indicator&quot;&quot;&quot;" name="type"/>
</record>
<record id="account_report_report_resultatdexploitation0" model="account.report.report">
<field eval="0" name="disp_tree"/>
<field eval="&quot;&quot;&quot;041&quot;&quot;&quot;" name="code"/>
<field eval="&quot;&quot;&quot;RESULTAT D'EXPLOITATION&quot;&quot;&quot;" name="name"/>
<field eval="420" name="sequence"/>
<field eval="&quot;&quot;&quot;report('035')+report('036')+report('037')+report('038')-report('039')-report('040')&quot;&quot;&quot;" name="expression"/>
<field model="account.report.report" name="parent_id" search="[('name','=','SOLDES INTERMEDIAIRES DE GESTION (Détaillés)')]"/>
<field eval="0" name="disp_graph"/>
<field eval="1" name="active"/>
<field eval="&quot;&quot;&quot;indicator&quot;&quot;&quot;" name="type"/>
</record>
<record id="account_report_report_resultatdexploitation1" model="account.report.report">
<field eval="0" name="disp_tree"/>
<field eval="&quot;&quot;&quot;041&quot;&quot;&quot;" name="code"/>
addons/mrp/mrp_report.xml
+3 -3
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<report auto="True" header="False" id="report_bom_structure" model="mrp.bom" name="bom.structure" rml="mrp/report/bom_structure.rml" string="BOM Structure"/>
<report
id="report_mrp_production_report"
string="Production Order"
@@ -12,6 +12,6 @@
rml="mrp/report/order.rml"
auto="False"
/>
</data>
</openerp>
addons/mrp/report/bom_structure.rml
+137 -2
View File
@@ -1,3 +1,138 @@
<?xml version="1.0"?>
<document filename="test.pdf"><template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="57.0" y1="57.0" width="498" height="678"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Table1"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="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"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" fontName="Times-Roman" alignment="LEFT"/><paraStyle name="P2" fontName="Times-Roman" fontSize="16.0" leading="20" alignment="CENTER"/><paraStyle name="P3" fontName="Times-Roman" alignment="LEFT"/><paraStyle name="P4" fontName="Times-Roman" fontSize="13.0" leading="16" alignment="LEFT"/><paraStyle name="P5" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/><paraStyle name="P6" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/><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"/></stylesheet><images/><story><para style="P2">BOM Structure</para><para style="P1"><font color="white"> </font></para><section><para style="P5"><font face="Times-Roman">[[ repeatIn(objects, 'o') ]]</font></para><blockTable colWidths="157.0,151.0,85.0,50.0,56.0" style="Table1"><tr><td><para style="P3">BOM</para></td><td><para style="P3">Product Name</para></td><td><para style="P3">Quantity</para></td><td><para style="P3">UoM</para></td><td><para style="P3">Code</para></td></tr><tr><td><para style="P6"><font face="Times-Roman">[[ o.name ]]</font></para></td><td><para style="P3">[[ o.product_id.name ]]</para></td><td><para style="P3">[[ o.product_qty ]]</para></td><td><para style="P3">[[ o.product_uom.name ]]</para></td><td><para style="P3">[[ o.code ]]</para></td></tr><tr><td><para style="P3">[[ repeatIn(o.bom_lines, 'l') ]]</para><para style="P3">- [[ l.name ]]</para></td><td><para style="P3">[[ l.product_id.name ]]</para></td><td><para style="P3">[[ l.product_qty ]]</para></td><td><para style="P3">[[ l.product_uom.name ]]</para></td><td><para style="P3">[[ l.code ]]</para></td></tr></blockTable><para style="P1"><font color="white"> </font></para></section></story></document>
<document filename="test.pdf">
<template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="498" height="678"/>
</pageTemplate>
</template>
<stylesheet>
<blockTableStyle id="Standard_Outline">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<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"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<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"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<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"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="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" fontSize="6.0" leading="8" alignment="LEFT"/>
<paraStyle name="Table Heading" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="CENTER"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_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-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="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_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_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="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_remove_space" fontName="Times-Roman" fontSize="2.0" leading="3" spaceBefore="0.0" spaceAfter="0.0"/>
</stylesheet>
<images/>
<story>
<para style="terp_header_Centre">BOM Structure</para>
<section>
<para style="terp_default_9">[[ repeatIn(objects, 'o') ]]</para>
<blockTable colWidths="166.0,208.0,79.0,55.0" style="Table3">
<tr>
<td>
<para style="terp_tblheader_General">BOM</para>
</td>
<td>
<para style="terp_tblheader_General">Product Name</para>
</td>
<td>
<para style="terp_tblheader_General_Right">Quantity</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Code</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="166.0,208.0,79.0,55.0" style="Table4">
<tr>
<td>
<para style="terp_default_9">[[ o.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ o.product_id.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.product_qty ]] [[ o.product_uom.name ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ o.code ]]</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_9">[[ repeatIn(o.bom_lines, 'l') ]]</para>
<blockTable colWidths="166.0,208.0,79.0,55.0" style="Table1">
<tr>
<td>
<para style="P1">- [[ l.name ]]</para>
</td>
<td>
<para style="P1">[[ l.product_id.name ]]</para>
</td>
<td>
<para style="P2">[[ l.product_qty ]] [[ l.product_uom.name ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ l.code ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_remove_space">
<font color="white"> </font>
</para>
</section>
</section>
</story>
</document>
addons/report_sale/report_sale_view.xml
+22 -3
View File
@@ -149,9 +149,28 @@
<field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
</record>
<menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="report_sale.next_id_81"/>
<record id="view_so_pipeline_graph" model="ir.ui.view">
<field name="name">sale.order.dashboard.graph</field>
<field name="model">sale.order</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Sales by State" type="bar">
<field name="state"/>
<field name="amount_total"/>
</graph>
</field>
</record>
<record id="action_so_pipeline" model="ir.actions.act_window">
<field name="name">Sales by State</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="view_id" ref="view_so_pipeline_graph"/>
<field name="domain">[('state','&lt;&gt;','done')]</field>
</record>
</data>
</openerp>