merges

bzr revid: nch@tinyerp.com-20081104054645-pqtvoho3hiyjb2yf

4 files changed, 157 insertions, 97 deletions

diff --git a/addons/analytic_user_function/__init__.py b/addons/analytic_user_function/__init__.py
index c0f4bdd4e89..c9f859a71f9 100644
--- a/addons/analytic_user_function/__init__.py
+++ b/addons/analytic_user_function/__init__.py
@@ -1,4 +1,24 @@
 # -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 import analytic_user_function
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_user_function/__terp__.py b/addons/analytic_user_function/__terp__.py
index 1a71adee8d6..f68543b29a5 100644
--- a/addons/analytic_user_function/__terp__.py
+++ b/addons/analytic_user_function/__terp__.py
@@ -1,4 +1,24 @@
 # -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 {
     "name" : "Analytic User Function",
     "version" : "1.0",
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 0d5e2200265..46924169a37 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -1,4 +1,24 @@
 # -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 from osv import fields,osv
 from osv import orm
 
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 340d255f182..1f7f0c07b10 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -1,109 +1,109 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<!-- analytic_user_funct_grid views -->
-		<record model="ir.ui.view" id="analytic_user_funct_grid_tree">
-			<field name="name">analytic_user_funct_grid.tree</field>
-			<field name="model">analytic_user_funct_grid</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="User's Product for this Analytic Account" editable="bottom">
-					<field name="user_id" required="1"/>
-					<field name="product_id" required="1" />
-				</tree>
-			</field>
-		</record>
+        <!-- analytic_user_funct_grid views -->
+        <record model="ir.ui.view" id="analytic_user_funct_grid_tree">
+            <field name="name">analytic_user_funct_grid.tree</field>
+            <field name="model">analytic_user_funct_grid</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="User's Product for this Analytic Account" editable="bottom">
+                    <field name="user_id" required="1"/>
+                    <field name="product_id" required="1" />
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="analytic_user_funct_grid_form">
-			<field name="name">analytic_user_funct_grid.form</field>
-			<field name="model">analytic_user_funct_grid</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="User's Product for this Analytic Account">
-					<field name="user_id" required="1"/>
-					<field name="product_id" required="1"/>
-				</form>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="analytic_user_funct_grid_form">
+            <field name="name">analytic_user_funct_grid.form</field>
+            <field name="model">analytic_user_funct_grid</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="User's Product for this Analytic Account">
+                    <field name="user_id" required="1"/>
+                    <field name="product_id" required="1"/>
+                </form>
+            </field>
+        </record>
 
-		<!-- account.analytic.account inherited view -->
-		<record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
-			<field name="name">account.analytic.account.form</field>
-			<field name="model">account.analytic.account</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook/page" position="after">
-					<page string="Users/Products Rel.">
-						<field name="user_product_ids" colspan="4" nolabel="1"/>
-					</page>
-				</xpath>
-			</field>
-		</record>
+        <!-- account.analytic.account inherited view -->
+        <record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
+            <field name="name">account.analytic.account.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page" position="after">
+                    <page string="Users/Products Rel.">
+                        <field name="user_product_ids" colspan="4" nolabel="1"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
 
-		<!-- hr_timesheet_sheet.sheet inherited view -->
-		<record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
-			<field name="name">hr.timesheet.sheet.form</field>
-			<field name="model">hr_timesheet_sheet.sheet</field>
-			<field name="type">form</field>
-			<field name="priority" eval="18"/>
-			<field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
-					<field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)"/>
-				</xpath>
-			</field>
-		</record>
+        <!-- hr_timesheet_sheet.sheet inherited view -->
+        <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
+            <field name="name">hr.timesheet.sheet.form</field>
+            <field name="model">hr_timesheet_sheet.sheet</field>
+            <field name="type">form</field>
+            <field name="priority" eval="18"/>
+            <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
+                    <field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)"/>
+                </xpath>
+            </field>
+        </record>
 
-		<!-- hr.analytic.timesheet inherited views -->
-		<record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
-			<field name="name">hr.analytic.timesheet.form</field>
-			<field name="model">hr.analytic.timesheet</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
-			<field name="arch" type="xml">
-				<xpath expr="/form/field[@name='account_id']" position="replace">
-					<field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/>
-				</xpath>
-			</field>
-		</record>
+        <!-- hr.analytic.timesheet inherited views -->
+        <record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
+            <field name="name">hr.analytic.timesheet.form</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/field[@name='account_id']" position="replace">
+                    <field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/>
+                </xpath>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
-			<field name="name">hr.analytic.timesheet.form</field>
-			<field name="model">hr.analytic.timesheet</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
-			<field name="arch" type="xml">
-				<xpath expr="/form/field[@name='user_id']" position="replace">
-					<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
-				</xpath>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
+            <field name="name">hr.analytic.timesheet.form</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/field[@name='user_id']" position="replace">
+                    <field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
+                </xpath>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="hr_timesheet_line_tree_inherit">
-			<field name="name">hr.analytic.timesheet.tree</field>
-			<field name="model">hr.analytic.timesheet</field>
-			<field name="type">tree</field>
-			<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
-			<field name="arch" type="xml">
-				<xpath expr="/tree/field[@name='account_id']" position="replace">
-					<field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/>
-				</xpath>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="hr_timesheet_line_tree_inherit">
+            <field name="name">hr.analytic.timesheet.tree</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="/tree/field[@name='account_id']" position="replace">
+                    <field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/>
+                </xpath>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="hr_timesheet_line_tree_inherit_2">
-			<field name="name">hr.analytic.timesheet.tree</field>
-			<field name="model">hr.analytic.timesheet</field>
-			<field name="type">tree</field>
-			<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
-			<field name="arch" type="xml">
-				<xpath expr="/tree/field[@name='user_id']" position="replace">
-					<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
-				</xpath>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="hr_timesheet_line_tree_inherit_2">
+            <field name="name">hr.analytic.timesheet.tree</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="/tree/field[@name='user_id']" position="replace">
+                    <field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
+                </xpath>
+            </field>
+        </record>
 
-	</data>
+    </data>
 </openerp>