Merge lp:~dr.dran/domsense-agilebg-addons/account_analytics_deferred_6_0 into lp:domsense-agilebg-addons/6.1

[Franco Tampieri]

Modificato il modulo account_analytics_deferred_choice in modo da poter associale la medesima funzione alle account.move e alle account.move.lines

[Leonardo Pistone (lepistone)]

Conflicts, let's do that again )

review: Disapprove

[lp:~dr.dran/domsense-agilebg-addons/account_analytics_deferred_6_0]

139. By Franco Tampieri on 2012-05-21

[Fix] A problem on the enrty lines view
[Add] The possibility to add an entry line without an account deferred_analytics_id that didn't permit to the system to raise a exception

[Lorenzo Battistini (elbati)]

It has been proposed to be merged into lp:domsense-agilebg-addons while should be lp:domsense-agilebg-addons/6.0 I think

review: Disapprove

[Lorenzo Battistini (elbati)]

Ah, here it is https://code.launchpad.net/~dr.dran/domsense-agilebg-addons/account_analytics_deferred_6_0/+merge/105060

Unmerged revisions

139. By Franco Tampieri on 2012-05-21

[Fix] A problem on the enrty lines view
[Add] The possibility to add an entry line without an account deferred_analytics_id that didn't permit to the system to raise a exception

138. By Franco Tampieri on 2012-05-08

[Fix] Corretti bugs minori di interfaccia

137. By Franco Tampieri on 2012-05-08

[ADD] Added the deferred Analytic choice to the account.move and account move.line

136. By Lorenzo Battistini on 2012-03-25

[MERGE] aggiunto il partner nel wizard di scelta del template per inserirlo nei move generati

135. By Franco Tampieri <email address hidden> on 2012-03-15

Added menu icons

134. By Lorenzo Battistini on 2012-02-24

[ADD] sale_double_validation

133. By Lorenzo Battistini on 2012-02-24

[FIX] avoiding record creation when missing required fields

132. By Lorenzo Battistini on 2012-02-24

[FIX] super_calendar constraint

131. By Lorenzo Battistini on 2012-02-24

[ADD] account_analytic_deferred_choice analytic_move hr_expense_analytic_deferred_choice purchase_analytic_deferred_choice

130. By Lorenzo Battistini on 2012-02-21

[FIX] confusing menu items

=== added directory 'account_analytic_deferred_choice'
=== renamed directory 'account_analytic_deferred_choice' => 'account_analytic_deferred_choice.moved'
=== added file 'account_analytic_deferred_choice/AUTHORS.txt'
--- account_analytic_deferred_choice/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ account_analytic_deferred_choice/AUTHORS.txt	2012-05-21 16:22:21 +0000
@@ -0,0 +1,3 @@
+Lorenzo Battistini <[e-mail]>
+Leonardo Pistone <[e-mail]>
+Franco Tampieri <[e-mail]>

=== added file 'account_analytic_deferred_choice/__init__.py'
--- account_analytic_deferred_choice/__init__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_deferred_choice/__init__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import invoice
+import analytic

=== added file 'account_analytic_deferred_choice/__openerp__.py'
--- account_analytic_deferred_choice/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_deferred_choice/__openerp__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': "Analytic Deferred Choice for Invoices",
+    'version': '0.1',
+    'category': 'Generic Modules/Accounting',
+    'description': """User can assign the invoice amount to one or more analytic accounts, subsequently (or previously) to invoice confirmation.
+    The invoice has a new field, containing the analytic plan to be used. The related button generates tha analytic lines, related to the invoice. The invoice lines have new fields too, containing the analytic plan. If the line's field is not filled, the invoice's one is used.
+    On the invoice form, another button allows to delete the previously generated analytic lines.
+    Every analytic line contains a reference to the invoice line that generated it.""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['account_analytic_plans'],
+    "init_xml" : [],
+    "update_xml" : [
+        'account_invoice_view.xml',
+        'project_view.xml',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added file 'account_analytic_deferred_choice/account_invoice_view.xml'
--- account_analytic_deferred_choice/account_invoice_view.xml	1970-01-01 00:00:00 +0000
+++ account_analytic_deferred_choice/account_invoice_view.xml	2012-05-21 16:22:21 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="invoice_supplier_form" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.form</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"></field>
+            <field name="arch" type="xml">
+                <field name="move_id" position="after">
+                    <group colspan="2" col="4" groups="analytic.group_analytic_accounting">
+                        <field name="deferred_analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+                        <button name="create_analytic_lines" type="object" string="Create analytic lines" groups="account.group_account_user"/>
+                        <button name="delete_analytic_lines" type="object" string="Delete analytic lines" groups="account.group_account_user"/>
+                    </group>
+                </field>
+                <page string="Payments" position="after">
+                    <page string="Deferred analytic lines" groups="account.group_account_user">
+                        <field name="deferred_line_ids" nolabel="1" colspan="4"/>
+                    </page>
+                </page>
+            </field>
+        </record>
+
+        <record id="invoice_form" model="ir.ui.view">
+            <field name="name">account.invoice.form</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_form"></field>
+            <field name="arch" type="xml">
+                <field name="move_id" position="after">
+                    <group colspan="2" col="4" groups="analytic.group_analytic_accounting">
+                        <field name="deferred_analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+                        <button name="create_analytic_lines" type="object" string="Create analytic lines" groups="account.group_account_user"/>
+                        <button name="delete_analytic_lines" type="object" string="Delete analytic lines" groups="account.group_account_user"/>
+                    </group>
+                </field>
+                <page string="Payments" position="after">
+                    <page string="Deferred analytic lines" groups="account.group_account_user">
+                        <field name="deferred_line_ids" nolabel="1" colspan="4"/>
+                    </page>
+                </page>
+            </field>
+        </record>
+
+        <record id="view_invoice_line_form" model="ir.ui.view">
+            <field name="name">account.invoice.line.form</field>
+            <field name="model">account.invoice.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_analytic_plans.view_invoice_line_form_inherit"></field>
+            <field name="arch" type="xml">
+                <field name="analytics_id" position="after">
+                    <field name="deferred_analytics_id" groups="analytic.group_analytic_accounting" domain="[('plan_id','&lt;&gt;',False)]"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="account_move_deferred_form" model="ir.ui.view">
+            <field name="name">account.move.deferred.form</field>
+            <field name="model">account.move</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_move_form"></field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@string='Journal Items']/field[@name='line_id']/form/notebook/page[@string='Information']/group/field[@name='analytic_account_id']" position="after">
+                    <field name="deferred_analytics_id" groups="analytic.group_analytic_accounting" domain="[('plan_id','&lt;&gt;',False)]"/>
+                </xpath>
+                <xpath expr="/form/notebook/page[@string='Journal Items']/field[@name='line_id']/tree/field[@name='analytic_account_id']" position="after">
+                    <field name="deferred_analytics_id" groups="analytic.group_analytic_accounting" domain="[('plan_id','&lt;&gt;',False)]"/>
+                </xpath>
+                <page string="Journal Items" position="after">
+                    <page string="Deferred analytic lines" groups="account.group_account_user">
+                        <group colspan="2" col="4" groups="analytic.group_analytic_accounting">
+                            <field name="deferred_analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+                            <button name="create_analytic_lines" type="object" string="Create analytic lines" groups="account.group_account_user"/>
+                            <button name="delete_analytic_lines" type="object" string="Delete analytic lines" groups="account.group_account_user"/>
+                        </group>
+                        <newline/>
+                        <field name="deferred_line_ids" nolabel="1" colspan="4"/>
+                    </page>
+                </page>
+            </field>
+        </record>
+
+
+    </data>
+</openerp>

=== added file 'account_analytic_deferred_choice/analytic.py'
--- account_analytic_deferred_choice/analytic.py	1970-01-01 00:00:00 +0000
+++ account_analytic_deferred_choice/analytic.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+
+    _columns = {
+        'deferred_invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True),
+        'deferred_invoice_id': fields.related('deferred_invoice_line_id', 'invoice_id', type="many2one",
+            relation="account.invoice", string="Invoice", store=False, readonly=True),
+        'deferred_account_move_line_id': fields.many2one('account.move.line', 'Account Entry Line', readonly=True),
+        'deferred_account_move_id': fields.related('deferred_account_move_line_id', 'move_id', type="many2one",
+            relation="account.move", string="Account Entry", store=False, readonly=True),
+        }
+
+account_analytic_line()

=== added directory 'account_analytic_deferred_choice/i18n'
=== added file 'account_analytic_deferred_choice/i18n/it.mo'
Binary files account_analytic_deferred_choice/i18n/it.mo	1970-01-01 00:00:00 +0000 and account_analytic_deferred_choice/i18n/it.mo	2012-05-21 16:22:21 +0000 differ
=== added file 'account_analytic_deferred_choice/i18n/it.po'
--- account_analytic_deferred_choice/i18n/it.po	1970-01-01 00:00:00 +0000
+++ account_analytic_deferred_choice/i18n/it.po	2012-05-21 16:22:21 +0000
@@ -0,0 +1,193 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_analytic_deferred_choice
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.4\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2012-05-08 08:09+0000\n"
+"PO-Revision-Date: 2012-05-08 10:24+0100\n"
+"Last-Translator: Franco Tampieri <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: account_analytic_deferred_choice
+#: constraint:account.move:0
+msgid "You cannot create entries on different periods/journals in the same move"
+msgstr "Non si possono creare scritture in sezionali differenti con una stessa registrazione."
+
+#. module: account_analytic_deferred_choice
+#: view:account.invoice:0
+#: view:account.move:0
+msgid "Create analytic lines"
+msgstr "Crea righe analitiche"
+
+#. module: account_analytic_deferred_choice
+#: code:addons/account_analytic_deferred_choice/invoice.py:69
+#: code:addons/account_analytic_deferred_choice/invoice.py:148
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr "E' necessario definite un giornale analitico per il sezionale '%s'!"
+
+#. module: account_analytic_deferred_choice
+#: code:addons/account_analytic_deferred_choice/invoice.py:63
+#, python-format
+msgid "Analytic lines yet generated for invoice %s. Remove them first"
+msgstr "Righe analitiche già generate per la fattura %s. Rimuoverle prima di crearne altre"
+
+#. module: account_analytic_deferred_choice
+#: code:addons/account_analytic_deferred_choice/invoice.py:142
+#, python-format
+msgid "Analytic lines yet generated for Account Entry %s. Remove them first"
+msgstr "Righe analitiche già generate per il Movimento %s. Rimuoverle prima di crearne altre"
+
+#. module: account_analytic_deferred_choice
+#: model:ir.module.module,description:account_analytic_deferred_choice.module_meta_information
+msgid ""
+"User can assign the invoice amount to one or more analytic accounts, subsequently (or previously) to invoice confirmation.\n"
+"    The invoice has a new field, containing the analytic plan to be used. The related button generates tha analytic lines, related to the invoice. The invoice lines have new fields too, containing the analytic plan. If the line's field is not filled, the invoice's one is used.\n"
+"    On the invoice form, another button allows to delete the previously generated analytic lines.\n"
+"    Every analytic line contains a reference to the invoice line that generated it."
+msgstr ""
+"User can assign the invoice amount to one or more analytic accounts, subsequently (or previously) to invoice confirmation.\n"
+"    The invoice has a new field, containing the analytic plan to be used. The related button generates tha analytic lines, related to the invoice. The invoice lines have new fields too, containing the analytic plan. If the line's field is not filled, the invoice's one is used.\n"
+"    On the invoice form, another button allows to delete the previously generated analytic lines.\n"
+"    Every analytic line contains a reference to the invoice line that generated it."
+
+#. module: account_analytic_deferred_choice
+#: model:ir.model,name:account_analytic_deferred_choice.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Linea conto analitico"
+
+#. module: account_analytic_deferred_choice
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "Non si puo' inserire una voce per una registrazione su un conto chiuso."
+
+#. module: account_analytic_deferred_choice
+#: field:account.invoice,deferred_analytics_id:0
+#: field:account.invoice.line,deferred_analytics_id:0
+#: field:account.move,deferred_analytics_id:0
+#: field:account.move.line,deferred_analytics_id:0
+msgid "Deferred Analytic Distribution"
+msgstr "Distribuzione analitica differita"
+
+#. module: account_analytic_deferred_choice
+#: code:addons/account_analytic_deferred_choice/invoice.py:66
+#, python-format
+msgid "Invoice %s and line %s have no Deferred Analytic Distribution"
+msgstr "La fattura %s e la riga %s non hanno una distribuzione analitica differita"
+
+#. module: account_analytic_deferred_choice
+#: model:ir.module.module,shortdesc:account_analytic_deferred_choice.module_meta_information
+msgid "Analytic Deferred Choice for Invoices"
+msgstr "Scelta analitica differita per le fatture"
+
+#. module: account_analytic_deferred_choice
+#: view:account.move:0
+#: model:ir.model,name:account_analytic_deferred_choice.model_account_move_line
+msgid "Journal Items"
+msgstr "Voci sezionale"
+
+#. module: account_analytic_deferred_choice
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "L'azienda deve essere la stessa per il periodo ed il conto ad essa correlato."
+
+#. module: account_analytic_deferred_choice
+#: code:addons/account_analytic_deferred_choice/invoice.py:145
+#, python-format
+msgid "Account Entry %s and line %s have no Deferred Analytic Distribution"
+msgstr "Il Movimento Sezionale %s e la riga %s non hanno una distribuzione analitica differita"
+
+#. module: account_analytic_deferred_choice
+#: field:account.invoice,deferred_line_ids:0
+#: field:account.invoice.line,deferred_line_ids:0
+#: field:account.move,deferred_line_ids:0
+#: field:account.move.line,deferred_line_ids:0
+msgid "Analytic Lines"
+msgstr "Righe analitiche"
+
+#. module: account_analytic_deferred_choice
+#: constraint:account.move:0
+#: constraint:account.move.line:0
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr "La data del Movimento Sezionale non è inclusa nel periodo definito!"
+
+#. module: account_analytic_deferred_choice
+#: field:account.analytic.line,deferred_account_move_line_id:0
+msgid "Account Entry Line"
+msgstr "Linea Movimento Sezionale"
+
+#. module: account_analytic_deferred_choice
+#: constraint:account.move:0
+msgid "You cannot create more than one move per period on centralized journal"
+msgstr "Non si puo' creare piu' di un movimento per periodo su un sezionale centralizzato"
+
+#. module: account_analytic_deferred_choice
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Valore di credito o debito errato nella registrazione contabile !"
+
+#. module: account_analytic_deferred_choice
+#: view:account.invoice:0
+msgid "Payments"
+msgstr "Pagamenti"
+
+#. module: account_analytic_deferred_choice
+#: code:addons/account_analytic_deferred_choice/invoice.py:62
+#: code:addons/account_analytic_deferred_choice/invoice.py:66
+#: code:addons/account_analytic_deferred_choice/invoice.py:141
+#: code:addons/account_analytic_deferred_choice/invoice.py:145
+#, python-format
+msgid "Error"
+msgstr "Errore"
+
+#. module: account_analytic_deferred_choice
+#: view:account.invoice:0
+#: view:account.move:0
+msgid "Deferred analytic lines"
+msgstr "Righe analitiche differite"
+
+#. module: account_analytic_deferred_choice
+#: view:account.invoice:0
+#: view:account.move:0
+msgid "Delete analytic lines"
+msgstr "Rimuovi righe analitiche"
+
+#. module: account_analytic_deferred_choice
+#: view:account.analytic.line:0
+#: field:account.analytic.line,deferred_account_move_id:0
+#: model:ir.model,name:account_analytic_deferred_choice.model_account_move
+msgid "Account Entry"
+msgstr "Movimento Sezionale"
+
+#. module: account_analytic_deferred_choice
+#: code:addons/account_analytic_deferred_choice/invoice.py:69
+#: code:addons/account_analytic_deferred_choice/invoice.py:148
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "Nessun giornale analitico!"
+
+#. module: account_analytic_deferred_choice
+#: field:account.analytic.line,deferred_invoice_line_id:0
+#: model:ir.model,name:account_analytic_deferred_choice.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Riga fattura"
+
+#. module: account_analytic_deferred_choice
+#: view:account.analytic.line:0
+#: field:account.analytic.line,deferred_invoice_id:0
+#: model:ir.model,name:account_analytic_deferred_choice.model_account_invoice
+msgid "Invoice"
+msgstr "Fattura"
+
+#. module: account_analytic_deferred_choice
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "Non si possono inserire movimenti in un conto di tipo \"vista\""
+

=== added file 'account_analytic_deferred_choice/invoice.py'
--- account_analytic_deferred_choice/invoice.py	1970-01-01 00:00:00 +0000
+++ account_analytic_deferred_choice/invoice.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,183 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+from osv import orm
+
+class account_invoice(osv.osv):
+
+    _inherit = 'account.invoice'
+
+    def _get_deferred_analytic_lines(self, cr, uid, ids, field_name, arg, context=None):
+        res={}
+        for invoice in self.browse(cr, uid, ids):
+            analytic_lines = []
+            for line in invoice.invoice_line:
+                try:
+                    if line.deferred_line_ids:
+                        analytic_lines.extend([x.id for x in line.deferred_line_ids])
+                except orm.except_orm, e:
+                    if e.name != 'AccessError':
+                        raise e
+            res[invoice.id] = analytic_lines
+        return res
+
+    _columns={
+        'deferred_analytics_id': fields.many2one('account.analytic.plan.instance', 'Deferred Analytic Distribution'),
+        'deferred_line_ids': fields.function(_get_deferred_analytic_lines, type='one2many', obj='account.analytic.line', method=True, string='Analytic Lines'),
+        }
+
+    def delete_analytic_lines(self, cr, uid, ids, context=None):
+        analytic_line_obj = self.pool.get('account.analytic.line')
+        for invoice in self.browse(cr, uid, ids):
+            for line in invoice.deferred_line_ids:
+                line.unlink()
+        return True
+
+    def create_analytic_lines(self, cr, uid, ids, context=None):
+        analytic_line_obj = self.pool.get('account.analytic.line')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        for invoice in self.browse(cr, uid, ids):
+            if invoice.deferred_line_ids:
+                raise osv.except_osv(_('Error'),
+                    _('Analytic lines yet generated for invoice %s. Remove them first') % invoice.name)
+            for inv_line in invoice.invoice_line:
+                if not inv_line.deferred_analytics_id and not invoice.deferred_analytics_id:
+                    raise osv.except_osv(_('Error'),_('Invoice %s and line %s have no Deferred Analytic Distribution')
+                        % (invoice.name or '', inv_line.name))
+                if not invoice.journal_id.analytic_journal_id:
+                   raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (invoice.journal_id.name,))
+                if inv_line.deferred_analytics_id:
+                    deferred_analytics_id = inv_line.deferred_analytics_id
+                else:
+                    deferred_analytics_id = invoice.deferred_analytics_id
+                for plan_line in deferred_analytics_id.account_ids:
+                    amount = inv_line.price_subtotal * (plan_line.rate / 100)
+                    if invoice.type in ('in_invoice', 'out_refund'):
+                        amount = - amount
+                    al_vals={
+                        'name': inv_line.name,
+                        'account_id': plan_line.analytic_account_id.id,
+                        'unit_amount': inv_line.quantity,
+                        'product_id': inv_line.product_id and inv_line.product_id.id or False,
+                        'product_uom_id': inv_line.uos_id and inv_line.uos_id.id or False,
+                        'amount': amount,
+                        'journal_id': invoice.journal_id.analytic_journal_id.id,
+                        'percentage': plan_line.rate,
+                        'deferred_invoice_line_id': inv_line.id,
+                        'general_account_id': inv_line.account_id.id,
+                    }
+                    al_id = analytic_line_obj.create(cr, uid, al_vals, context=context)
+        return True
+
+account_invoice()
+
+class account_invoice_line(osv.osv):
+
+    _inherit = 'account.invoice.line'
+
+    _columns={
+        # TODO is it possible to have editable?
+        'deferred_analytics_id': fields.many2one('account.analytic.plan.instance', 'Deferred Analytic Distribution'),
+        'deferred_line_ids': fields.one2many('account.analytic.line', 'deferred_invoice_line_id', 'Analytic Lines'),
+        }
+
+account_invoice_line()
+
+class account_move(osv.osv):
+
+    _inherit = 'account.move'
+
+    def _get_deferred_analytic_lines(self, cr, uid, ids, field_name, arg, context=None):
+        res={}
+        for move in self.browse(cr, uid, ids):
+            analytic_lines = []
+            for line in move.line_id:
+                try:
+                    if line.deferred_line_ids:
+                        analytic_lines.extend([x.id for x in line.deferred_line_ids])
+                except orm.except_orm, e:
+                    if e.name != 'AccessError':
+                        raise e
+            res[move.id] = analytic_lines
+        return res
+
+    _columns={
+        'deferred_analytics_id': fields.many2one('account.analytic.plan.instance', 'Deferred Analytic Distribution'),
+        'deferred_line_ids': fields.function(_get_deferred_analytic_lines, type='one2many', obj='account.analytic.line', method=True, string='Analytic Lines'),
+        }
+
+    def delete_analytic_lines(self, cr, uid, ids, context=None):
+        analytic_line_obj = self.pool.get('account.analytic.line')
+        for move in self.browse(cr, uid, ids):
+            for line in move.deferred_line_ids:
+                line.unlink()
+        return True
+
+    def create_analytic_lines(self, cr, uid, ids, context=None):
+        analytic_line_obj = self.pool.get('account.analytic.line')
+        for move in self.browse(cr, uid, ids):
+            if move.deferred_line_ids:
+                raise osv.except_osv(_('Error'),
+                    _('Analytic lines yet generated for Account Entry %s. Remove them first') % move.name)
+            for move_line in move.line_id:
+                if not move_line.deferred_analytics_id and not move.deferred_analytics_id:
+                    continue
+                if not move.journal_id.analytic_journal_id:
+                   raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (invoice.journal_id.name,))
+                if move_line.deferred_analytics_id:
+                    deferred_analytics_id = move_line.deferred_analytics_id
+                else:
+                    deferred_analytics_id = move.deferred_analytics_id
+                for plan_line in deferred_analytics_id.account_ids:
+                    if move_line.credit:
+                        amount = move_line.credit * (plan_line.rate / 100)
+                    if move_line.debit:
+                        amount = - move_line.debit * (plan_line.rate / 100)
+                    al_vals={
+                        'name': move_line.name,
+                        'account_id': plan_line.analytic_account_id.id,
+                        'unit_amount': False,
+                        'product_id': False,
+                        'product_uom_id': False,
+                        'amount': amount,
+                        'journal_id': move.journal_id.analytic_journal_id.id,
+                        'percentage': plan_line.rate,
+                        'deferred_account_move_line_id': move_line.id,
+                        'general_account_id': move_line.account_id.id,
+                    }
+                    al_id = analytic_line_obj.create(cr, uid, al_vals, context=context)
+        return True
+
+account_move()
+
+class account_move_line(osv.osv):
+
+    _inherit = 'account.move.line'
+
+    _columns={
+        'deferred_analytics_id': fields.many2one('account.analytic.plan.instance', 'Deferred Analytic Distribution'),
+        'deferred_line_ids': fields.one2many('account.analytic.line', 'deferred_account_move_line_id', 'Analytic Lines'),
+        }
+
+account_move_line()
\ No newline at end of file

=== added file 'account_analytic_deferred_choice/project_view.xml'
--- account_analytic_deferred_choice/project_view.xml	1970-01-01 00:00:00 +0000
+++ account_analytic_deferred_choice/project_view.xml	2012-05-21 16:22:21 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_account_analytic_line_form" model="ir.ui.view">
+            <field name="name">account.analytic.line.form</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_analytic_line_form"></field>
+            <field name="arch" type="xml">
+                <field name="move_id" position="after">
+                    <separator colspan="2" string="Invoice"/>
+                    <field name="deferred_invoice_id"/>
+                    <field name="deferred_invoice_line_id"/>
+                    <separator colspan="2" string="Account Entry"/>
+                    <field name="deferred_account_move_id"/>
+                    <field name="deferred_account_move_line_id"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'account_analytic_distribution_menu'
=== renamed directory 'account_analytic_distribution_menu' => 'account_analytic_distribution_menu.moved'
=== added file 'account_analytic_distribution_menu/AUTHORS.txt'
--- account_analytic_distribution_menu/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ account_analytic_distribution_menu/AUTHORS.txt	2012-05-21 16:22:21 +0000
@@ -0,0 +1,2 @@
+Leonardo Pistone <[e-mail]>
+Lorenzo Battistini <[e-mail]>

=== added file 'account_analytic_distribution_menu/__init__.py'
--- account_analytic_distribution_menu/__init__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_distribution_menu/__init__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import account_analytic_plans

=== added file 'account_analytic_distribution_menu/__openerp__.py'
--- account_analytic_distribution_menu/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_distribution_menu/__openerp__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': "Account Analytic Distribution Menu",
+    'version': '0.1',
+    'category'  : 'Accounting & Finance',
+    'complexity': "easy",
+    'description': """
+Account Analytic Distribution Menu
+
+This little module adds a menuitem to see all the analytic distributions
+in the system""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['account_analytic_plans'],
+    "init_xml" : [],
+    "update_xml" : [
+        'account_distribution.xml',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added file 'account_analytic_distribution_menu/account_analytic_plans.py'
--- account_analytic_distribution_menu/account_analytic_plans.py	1970-01-01 00:00:00 +0000
+++ account_analytic_distribution_menu/account_analytic_plans.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class account_analytic_plan_instance(osv.osv):
+    
+    _inherit = "account.analytic.plan.instance"
+    
+    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        if context is None:
+            context = {}
+        this = self.browse(cr, uid, ids[0], context=context)
+        if this.plan_id and not vals.has_key('plan_id'):
+            vals['plan_id'] = this.plan_id.id
+        return super(account_analytic_plan_instance, self).write(cr, uid, ids, vals, context=context)
+
+account_analytic_plan_instance()

=== added file 'account_analytic_distribution_menu/account_distribution.xml'
--- account_analytic_distribution_menu/account_distribution.xml	1970-01-01 00:00:00 +0000
+++ account_analytic_distribution_menu/account_distribution.xml	2012-05-21 16:22:21 +0000
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+    
+    <record model="ir.ui.view" id="account_analytic_plan_instance_form">
+        <field name="name">account.analytic.plan.instance.form</field>
+        <field name="model">account.analytic.plan.instance</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="account_analytic_plans.account_analytic_plan_instance_form"></field>
+        <field name="arch" type="xml">
+            <field name="account_ids" nolabel="1" colspan="4" position="replace">
+                <field name="account_ids" nolabel="1" colspan="4" />
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="account_analytic_plan_instance_line_form">
+        <field name="name">account.analytic.plan.instance.line.form</field>
+        <field name="model">account.analytic.plan.instance.line</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="account_analytic_plans.account_analytic_plan_instance_line_form"></field>
+        <field name="arch" type="xml">
+            <field name="plan_id" position="replace"/>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="account_analytic_plan_instance_line_tree">
+        <field name="name">account.analytic.plan.instance.line.tree</field>
+        <field name="model">account.analytic.plan.instance.line</field>
+        <field name="inherit_id" ref="account_analytic_plans.account_analytic_plan_instance_line_tree"></field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <field name="plan_id" position="replace"/>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="account_analytic_plan_instance_action">
+        <field name="name">Analytic Distribution's Models</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">account.analytic.plan.instance</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    
+     <menuitem
+         parent="account_analytic_plans.menu_account_analytic_multi_plan_action"
+         id="menu_account_analytic_plan_instance"
+         action="account_analytic_plan_instance_action"/>
+</data>
+</openerp>

=== modified file 'account_invoice_template/account_invoice_template.py'
=== modified file 'account_move_template/__openerp__.py'
--- account_move_template/__openerp__.py	2012-02-18 10:13:35 +0000
+++ account_move_template/__openerp__.py	2012-05-21 16:22:21 +0000
@@ -33,7 +33,11 @@
     'author': 'Agile Business Group & Domsense',
     'website': 'http://www.agilebg.com',
     'license': 'AGPL-3',
+<<<<<<< TREE
     "depends" : ['account_accountant', 'analytic'],
+=======
+    "depends" : ['account_accountant'],
+>>>>>>> MERGE-SOURCE
     "init_xml" : [],
     "update_xml" : [
         'move_template.xml',

=== modified file 'account_move_template/wizard/select_template.py'
--- account_move_template/wizard/select_template.py	2012-03-25 09:53:44 +0000
+++ account_move_template/wizard/select_template.py	2012-05-21 16:22:21 +0000
@@ -28,7 +28,12 @@
 
     _name = "wizard.select.move.template"
     _columns = {
+<<<<<<< TREE
         'template_id': fields.many2one('account.move.template', 'Move Template', required=True),'partner_id': fields.many2one('res.partner', 'Partner'),
+=======
+        'template_id': fields.many2one('account.move.template', 'Move Template', required=True),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+>>>>>>> MERGE-SOURCE
         'line_ids': fields.one2many('wizard.select.move.template.line', 'template_id', 'Lines'),
         'state': fields.selection([
             ('template_selected','Template selected'),
@@ -75,11 +80,14 @@
         template_obj = self.pool.get('account.move.template')
         template_line_obj = self.pool.get('account.move.template.line')
         account_period_obj = self.pool.get('account.period')
-        
-        
         mod_obj = self.pool.get('ir.model.data')
         wizard =  self.browse(cr, uid, ids, context=context)[0]
+<<<<<<< TREE
         if not template_obj.check_zero_lines(cr, uid, wizard):
+=======
+        partner_id=wizard.partner_id.id
+        if not self.check_zero_lines(cr, uid, wizard):
+>>>>>>> MERGE-SOURCE
             raise osv.except_osv(_('Error !'), _('At least one amount has to be non-zero!'))
         input_lines = {}
 
@@ -96,15 +104,27 @@
         moves={}
         for line in wizard.template_id.template_line_ids:
             if line.journal_id.id not in moves:
+<<<<<<< TREE
                 moves[line.journal_id.id]=self._make_move(
                     cr,uid,wizard.template_id.name,period_id,line.journal_id.id, wizard.partner_id.id)
+=======
+                moves[line.journal_id.id]=self._make_move(cr,uid,wizard.template_id.name,period_id,line.journal_id.id,partner_id)
+>>>>>>> MERGE-SOURCE
         
+<<<<<<< TREE
             id_line=self._make_move_line(cr,uid,line,computed_lines,moves[line.journal_id.id],period_id,
                 wizard.partner_id.id)
+=======
+            id_line=self._make_move_line(cr,uid,line,computed_lines,moves[line.journal_id.id],period_id,partner_id)
+>>>>>>> MERGE-SOURCE
             if wizard.template_id.cross_journals :
                 trans_account_id=wizard.template_id.transitory_acc_id.id
+<<<<<<< TREE
                 id_trans_line=self._make_transitory_move_line(cr,uid,line,computed_lines,
                     moves[line.journal_id.id],period_id,trans_account_id, wizard.partner_id.id)
+=======
+                id_trans_line=self._make_transitory_move_line(cr,uid,line,computed_lines,moves[line.journal_id.id],period_id,trans_account_id,partner_id)
+>>>>>>> MERGE-SOURCE
         
         return {
             'domain': "[('id','in', "+str(moves.values())+")]",
@@ -116,7 +136,11 @@
             'target': 'current',
         }
     #'res_id': moves.values() or False,
+<<<<<<< TREE
     def _make_move(self, cr, uid,ref,period_id,journal_id, partner_id):
+=======
+    def _make_move(self, cr, uid,ref,period_id,journal_id,partner_id):
+>>>>>>> MERGE-SOURCE
         account_move_obj = self.pool.get('account.move')
         move_id = account_move_obj.create(cr, uid, {
             'ref': ref,
@@ -126,7 +150,11 @@
         })
         return move_id
         
+<<<<<<< TREE
     def _make_move_line(self,cr,uid,line,computed_lines,move_id,period_id, partner_id):
+=======
+    def _make_move_line(self,cr,uid,line,computed_lines,move_id,period_id,partner_id):
+>>>>>>> MERGE-SOURCE
         account_move_line_obj = self.pool.get('account.move.line')
         analytic_account_id = False
         if line.analytic_account_id:
@@ -153,8 +181,12 @@
         id_line = account_move_line_obj.create(cr, uid, val)
         return id_line
     
+<<<<<<< TREE
     def _make_transitory_move_line(
         self,cr,uid,line,computed_lines,move_id,period_id,trans_account_id, partner_id):
+=======
+    def _make_transitory_move_line(self,cr,uid,line,computed_lines,move_id,period_id,trans_account_id,partner_id):
+>>>>>>> MERGE-SOURCE
         account_move_line_obj = self.pool.get('account.move.line')
         analytic_account_id = False
         if line.analytic_account_id:

=== modified file 'account_move_template/wizard/select_template.xml'
--- account_move_template/wizard/select_template.xml	2012-03-25 09:53:44 +0000
+++ account_move_template/wizard/select_template.xml	2012-05-21 16:22:21 +0000
@@ -8,6 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Move Template" >
+<<<<<<< TREE
                     <group col="2" width="600" height="500">
                         <field name="template_id" attrs="{'invisible':[('state','=','template_selected')]}"/>
                         <field name="partner_id" attrs="{'invisible':[('state','=','template_selected')]}"/>
@@ -18,6 +19,14 @@
                         <newline/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel" />
                         <field name="state" invisible="1"/>
+=======
+                    <group col="2">
+                        <field name="template_id" on_change="on_change_template_id(template_id)"/>
+                        <field name="partner_id"/>
+                        <field name="line_ids" colspan="2" nolabel="1" width="600" height="500"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="load_template" string="Load" type="object"/>
+>>>>>>> MERGE-SOURCE
                     </group>
                 </form>
             </field>

=== added directory 'analytic_move'
=== renamed directory 'analytic_move' => 'analytic_move.moved'
=== added file 'analytic_move/AUTHORS.txt'
--- analytic_move/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ analytic_move/AUTHORS.txt	2012-05-21 16:22:21 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'analytic_move/__init__.py'
--- analytic_move/__init__.py	1970-01-01 00:00:00 +0000
+++ analytic_move/__init__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import analytic

=== added file 'analytic_move/__openerp__.py'
--- analytic_move/__openerp__.py	1970-01-01 00:00:00 +0000
+++ analytic_move/__openerp__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': "Analytic Move",
+    'version': '0.1',
+    'category': 'Generic Modules/Accounting',
+    'description': """When user manually creates analytic lines, he is now able to track source and destination of the amounts. That is, if user moves amounts from an account to another, he can see where those amounts come from.
+    This is achieved by the 'analytic move' object, that allows to group analytic lines.""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['analytic', 'account'],
+    "init_xml" : [],
+    "update_xml" : [
+        'analytic_view.xml',
+        'security/ir.model.access.csv',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added file 'analytic_move/analytic.py'
--- analytic_move/analytic.py	1970-01-01 00:00:00 +0000
+++ analytic_move/analytic.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class account_analytic_move(osv.osv):
+    _name = 'account.analytic.move'
+    _description = 'Analytic Move'
+    
+    _columns = {
+        'name': fields.char('Name', size=64, required=True),
+        'line_ids': fields.one2many('account.analytic.line', 'analytic_move_id', 'Analytic Lines'),
+        }
+account_analytic_move()
+
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+    _columns = {
+        'analytic_move_id': fields.many2one('account.analytic.move', 'Analytic Move'),
+        }
+account_analytic_line()

=== added file 'analytic_move/analytic_view.xml'
--- analytic_move/analytic_view.xml	1970-01-01 00:00:00 +0000
+++ analytic_move/analytic_view.xml	2012-05-21 16:22:21 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_account_analytic_line_form" model="ir.ui.view">
+            <field name="name">account.analytic.line.form</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_analytic_line_form"></field>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="analytic_move_id"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_account_analytic_line_tree" model="ir.ui.view">
+            <field name="name">account.analytic.line.tree</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="account.view_account_analytic_line_tree"></field>
+            <field name="arch" type="xml">
+                <field name="user_id" position="after">
+                    <field name="analytic_move_id"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_account_analytic_move_form" model="ir.ui.view">
+            <field name="name">account.analytic.move.form</field>
+            <field name="model">account.analytic.move</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Move">
+                    <field name="name"/>
+                    <newline/>
+                    <field name="line_ids" nolabel="1" colspan="4">
+                        <tree string="Analytic Entries">
+                            <field name="date"/>
+                            <field name="name"/>
+                            <field name="journal_id"/>
+                            <field name="amount" sum="Total"/>
+                            <field name="account_id"/>                         
+                        </tree>
+                        <form string="Analytic Entry">
+                            <group colspan="4" col="6">
+                                <field name="name"/>
+                                <field name="ref"/>
+                                <field name="account_id"/>
+                                <field name="journal_id"/>
+                                <field name="date"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
+                            </group>
+                            <group colspan="2" col="4">
+                                <separator string="Amount" colspan="4"/>
+                                <field name="amount" colspan="4"/>
+                                <field name="amount_currency" colspan="2"/>
+                                <field name="currency_id" colspan="2" nolabel="1"/>
+                            </group>
+                        </form>
+                    </field>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_account_analytic_move_search" model="ir.ui.view">
+            <field name="name">account.analytic.move.search</field>
+            <field name="model">account.analytic.move</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Analytic Moves">
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
+        
+        <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
+            <field name="name">Analytic Journal Entries</field>
+            <field name="res_model">account.analytic.move</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="action_account_analytic_journal_open_form"
+            id="account_analytic_journal_entries"
+            parent="account.menu_finance_entries"/>
+    </data>
+</openerp>

=== added directory 'analytic_move/i18n'
=== added file 'analytic_move/i18n/it.po'
--- analytic_move/i18n/it.po	1970-01-01 00:00:00 +0000
+++ analytic_move/i18n/it.po	2012-05-21 16:22:21 +0000
@@ -0,0 +1,70 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* analytic_move
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-12-09 10:28+0000\n"
+"PO-Revision-Date: 2011-12-09 11:37+0100\n"
+"Last-Translator: Lorenzo Battistini <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: analytic_move
+#: view:account.analytic.move:0
+msgid "Total"
+msgstr "Totale"
+
+#. module: analytic_move
+#: model:ir.model,name:analytic_move.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Voce conto analitico"
+
+#. module: analytic_move
+#: field:account.analytic.move,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: analytic_move
+#: field:account.analytic.move,line_ids:0
+msgid "Analytic Lines"
+msgstr "Righe analitiche"
+
+#. module: analytic_move
+#: model:ir.actions.act_window,name:analytic_move.action_account_analytic_journal_open_form
+#: model:ir.ui.menu,name:analytic_move.account_analytic_journal_entries
+msgid "Analytic Journal Entries"
+msgstr "Registrazioni analitiche"
+
+#. module: analytic_move
+#: field:account.analytic.line,analytic_move_id:0
+#: view:account.analytic.move:0
+#: model:ir.model,name:analytic_move.model_account_analytic_move
+msgid "Analytic Move"
+msgstr "Movimento analitico"
+
+#. module: analytic_move
+#: view:account.analytic.move:0
+msgid "Analytic Moves"
+msgstr "Movimenti analitici"
+
+#. module: analytic_move
+#: view:account.analytic.move:0
+msgid "Amount"
+msgstr "Importo"
+
+#. module: analytic_move
+#: view:account.analytic.move:0
+msgid "Analytic Entry"
+msgstr "Registrazione analitica"
+
+#. module: analytic_move
+#: view:account.analytic.move:0
+msgid "Analytic Entries"
+msgstr "Registrazioni analitiche"
+

=== added directory 'analytic_move/security'
=== added file 'analytic_move/security/ir.model.access.csv'
--- analytic_move/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ analytic_move/security/ir.model.access.csv	2012-05-21 16:22:21 +0000
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+group_analytic_accounting,group_analytic_accounting,model_account_analytic_move,analytic.group_analytic_accounting,1,1,1,1

=== added directory 'hr_expense_analytic_deferred_choice'
=== renamed directory 'hr_expense_analytic_deferred_choice' => 'hr_expense_analytic_deferred_choice.moved'
=== added file 'hr_expense_analytic_deferred_choice/AUTHORS.txt'
--- hr_expense_analytic_deferred_choice/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ hr_expense_analytic_deferred_choice/AUTHORS.txt	2012-05-21 16:22:21 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'hr_expense_analytic_deferred_choice/__init__.py'
--- hr_expense_analytic_deferred_choice/__init__.py	1970-01-01 00:00:00 +0000
+++ hr_expense_analytic_deferred_choice/__init__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import hr_expense
+import analytic

=== added file 'hr_expense_analytic_deferred_choice/__openerp__.py'
--- hr_expense_analytic_deferred_choice/__openerp__.py	1970-01-01 00:00:00 +0000
+++ hr_expense_analytic_deferred_choice/__openerp__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': "Analytic Deferred Choice for Expenses",
+    'version': '0.1',
+    'category': 'Generic Modules/Human Resources',
+    'description': """User can assign the expense amount to one or more analytic accounts, subsequently (or previously) to expense confirmation.
+    The expense has a new field, containing the analytic plan to be used. The related button generates tha analytic lines, related to the expense. The expense lines have new fields too, containing the analytic plan. If the line's field is not filled, the expense's one is used.
+    On the expense form, another button allows to delete the previously generated analytic lines.
+    Every analytic line contains a reference to the expense line that generated it.""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['account_analytic_plans', 'hr_analytic_plans'],
+    "init_xml" : [],
+    "update_xml" : [
+        'hr_expense_view.xml',
+        'project_view.xml',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added file 'hr_expense_analytic_deferred_choice/analytic.py'
--- hr_expense_analytic_deferred_choice/analytic.py	1970-01-01 00:00:00 +0000
+++ hr_expense_analytic_deferred_choice/analytic.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+
+    _columns = {
+        'deferred_expense_line_id': fields.many2one('hr.expense.line', 'Expense Line', readonly=True),
+        'deferred_expense_id': fields.related('deferred_expense_line_id', 'expense_id', type="many2one",
+            relation="hr.expense.expense", string="Expense", store=False, readonly=True),
+        }
+
+account_analytic_line()

=== added file 'hr_expense_analytic_deferred_choice/hr_expense.py'
--- hr_expense_analytic_deferred_choice/hr_expense.py	1970-01-01 00:00:00 +0000
+++ hr_expense_analytic_deferred_choice/hr_expense.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+from osv import orm
+
+class hr_expense(osv.osv):
+    
+    _inherit = 'hr.expense.expense'
+    
+    def _get_deferred_analytic_lines(self, cr, uid, ids, field_name, arg, context=None):
+        res={}
+        for expense in self.browse(cr, uid, ids):
+            analytic_lines = []
+            for line in expense.line_ids:
+                try:
+                    if line.deferred_line_ids:
+                        analytic_lines.extend([x.id for x in line.deferred_line_ids])
+                except orm.except_orm, e:
+                    if e.name != 'AccessError':
+                        raise e
+            res[expense.id] = analytic_lines
+        return res
+    
+    _columns={
+        'deferred_analytics_id': fields.many2one('account.analytic.plan.instance', 'Deferred Analytic Distribution'),
+        'deferred_line_ids': fields.function(_get_deferred_analytic_lines, type='one2many',
+            obj='account.analytic.line', method=True, string='Analytic Lines'),
+        }
+
+    def delete_analytic_lines(self, cr, uid, ids, context=None):
+        analytic_line_obj = self.pool.get('account.analytic.line')
+        for expense in self.browse(cr, uid, ids):
+            for line in expense.deferred_line_ids:
+                line.unlink()
+        return True
+
+    def create_analytic_lines(self, cr, uid, ids, context=None):
+        analytic_line_obj = self.pool.get('account.analytic.line')
+        journal_obj = self.pool.get('account.journal')
+        expense_line_obj = self.pool.get('hr.expense.line')
+        for expense in self.browse(cr, uid, ids):
+            journal_ids = journal_obj.search(cr, uid, [
+                ('type', '=','purchase'),('company_id', '=', expense.company_id.id)], limit=1)
+            if not journal_ids:
+                raise osv.except_osv(_('Error !'),
+                    _('There is no purchase journal defined for this company: "%s" (id:%d)')
+                        % (expense.company_id.name, expensecompany_id.id))
+            journal  = journal_obj.browse(cr, uid, journal_ids[0])
+            if not journal.analytic_journal_id:
+                raise osv.except_osv(_('No Analytic Journal !'),
+                    _("You have to define an analytic journal on the '%s' journal!") % (journal.name))
+            if not journal.default_debit_account_id:
+                raise osv.except_osv(_('No Debit Account !'),
+                    _("You have to define a default debit account on the '%s' journal!") % (journal.name))
+            if expense.deferred_line_ids:
+                raise osv.except_osv(_('Error'),
+                    _('Analytic lines yet generated for expense %s. Remove them first') % expense.name)
+            for line in expense.line_ids:
+                if not line.deferred_analytics_id and not expense.deferred_analytics_id:
+                    raise osv.except_osv(_('Error'),_('Expense %s and line %s have no Deferred Analytic Distribution')
+                        % (expense.name or '', line.name))
+                if line.deferred_analytics_id:
+                    deferred_analytics_id = line.deferred_analytics_id
+                else:
+                    deferred_analytics_id = expense.deferred_analytics_id
+                for plan_line in deferred_analytics_id.account_ids:
+                    amount = - line.total_amount * (plan_line.rate / 100)
+                    al_vals={
+                        'name': line.name,
+                        'account_id': plan_line.analytic_account_id.id,
+                        'unit_amount': line.unit_quantity,
+                        'product_id': line.product_id and line.product_id.id or False,
+                        'product_uom_id': line.uom_id and line.uom_id.id or False,
+                        'amount': amount,
+                        'journal_id': journal.analytic_journal_id.id,
+                        'percentage': plan_line.rate,
+                        'deferred_expense_line_id': line.id,
+                        'general_account_id': journal.default_debit_account_id.id,
+                    }
+                    al_id = analytic_line_obj.create(cr, uid, al_vals, context=context)
+        return True
+        
+hr_expense()
+
+class hr_expense_line(osv.osv):
+    
+    _inherit = 'hr.expense.line'
+    
+    _columns={
+        'deferred_analytics_id': fields.many2one('account.analytic.plan.instance', 'Deferred Analytic Distribution'),
+        'deferred_line_ids': fields.one2many('account.analytic.line', 'deferred_expense_line_id',
+            'Analytic Lines'),
+        }
+        
+hr_expense_line()

=== added file 'hr_expense_analytic_deferred_choice/hr_expense_view.xml'
--- hr_expense_analytic_deferred_choice/hr_expense_view.xml	1970-01-01 00:00:00 +0000
+++ hr_expense_analytic_deferred_choice/hr_expense_view.xml	2012-05-21 16:22:21 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_expenses_form" model="ir.ui.view">
+            <field name="name">hr.expense.form</field>
+            <field name="type">form</field>
+            <field name="model">hr.expense.expense</field>
+            <field name="inherit_id" ref="hr_expense.view_expenses_form"></field>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <group colspan="2" col="4" groups="analytic.group_analytic_accounting">
+                        <field name="deferred_analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+                        <button name="create_analytic_lines" type="object" string="Create analytic lines" groups="account.group_account_user"/>
+                        <button name="delete_analytic_lines" type="object" string="Delete analytic lines" groups="account.group_account_user"/>
+                    </group>
+                </field>
+                <page string="Other Info" position="after">
+                    <page string="Deferred analytic lines" groups="account.group_account_user">
+                        <field name="deferred_line_ids" nolabel="1" colspan="4"/>
+                    </page>
+                </page>
+            </field>
+        </record>
+        <record id="view_expenses_form_distribution_id" model="ir.ui.view">
+            <field name="name">hr.expense.form.distribution_id</field>
+            <field name="type">form</field>
+            <field name="model">hr.expense.expense</field>
+            <field name="inherit_id" ref="hr_analytic_plans.view_expenses_form"></field>
+            <field name="arch" type="xml">
+                <field name="distribution_id" position="after">
+                    <field name="deferred_analytics_id" groups="analytic.group_analytic_accounting" domain="[('plan_id','&lt;&gt;',False)]"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'hr_expense_analytic_deferred_choice/i18n'
=== added file 'hr_expense_analytic_deferred_choice/i18n/it.po'
--- hr_expense_analytic_deferred_choice/i18n/it.po	1970-01-01 00:00:00 +0000
+++ hr_expense_analytic_deferred_choice/i18n/it.po	2012-05-21 16:22:21 +0000
@@ -0,0 +1,140 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_expense_analytic_deferred_choice
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-12-09 10:29+0000\n"
+"PO-Revision-Date: 2011-12-09 11:49+0100\n"
+"Last-Translator: Lorenzo Battistini <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: hr_expense_analytic_deferred_choice
+#: code:addons/hr_expense_analytic_deferred_choice/hr_expense.py:70
+#, python-format
+msgid "You have to define a default debit account on the '%s' journal!"
+msgstr "E' necessario definire un conto di debito di default per il sezionale '%s'!"
+
+#. module: hr_expense_analytic_deferred_choice
+#: model:ir.model,name:hr_expense_analytic_deferred_choice.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Voce conto analitico"
+
+#. module: hr_expense_analytic_deferred_choice
+#: field:account.analytic.line,deferred_expense_line_id:0
+#: model:ir.model,name:hr_expense_analytic_deferred_choice.model_hr_expense_line
+msgid "Expense Line"
+msgstr "Riga spesa"
+
+#. module: hr_expense_analytic_deferred_choice
+#: field:hr.expense.expense,deferred_line_ids:0
+#: field:hr.expense.line,deferred_line_ids:0
+msgid "Analytic Lines"
+msgstr "Righe analitiche"
+
+#. module: hr_expense_analytic_deferred_choice
+#: code:addons/hr_expense_analytic_deferred_choice/hr_expense.py:66
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "Nessun giornale analitico!"
+
+#. module: hr_expense_analytic_deferred_choice
+#: view:hr.expense.expense:0
+msgid "Other Info"
+msgstr "Altre informazioni"
+
+#. module: hr_expense_analytic_deferred_choice
+#: view:hr.expense.expense:0
+msgid "Create analytic lines"
+msgstr "Crea righe analitiche"
+
+#. module: hr_expense_analytic_deferred_choice
+#: model:ir.module.module,description:hr_expense_analytic_deferred_choice.module_meta_information
+msgid ""
+"User can assign the expense amount to one or more analytic accounts, subsequently (or previously) to expense confirmation.\n"
+"    The expense has a new field, containing the analytic plan to be used. The related button generates tha analytic lines, related to the expense. The expense lines have new fields too, containing the analytic plan. If the line's field is not filled, the expense's one is used.\n"
+"    On the expense form, another button allows to delete the previously generated analytic lines.\n"
+"    Every analytic line contains a reference to the expense line that generated it."
+msgstr ""
+"User can assign the expense amount to one or more analytic accounts, subsequently (or previously) to expense confirmation.\n"
+"    The expense has a new field, containing the analytic plan to be used. The related button generates tha analytic lines, related to the expense. The expense lines have new fields too, containing the analytic plan. If the line's field is not filled, the expense's one is used.\n"
+"    On the expense form, another button allows to delete the previously generated analytic lines.\n"
+"    Every analytic line contains a reference to the expense line that generated it."
+
+#. module: hr_expense_analytic_deferred_choice
+#: code:addons/hr_expense_analytic_deferred_choice/hr_expense.py:76
+#, python-format
+msgid "Expense %s and line %s have no Deferred Analytic Distribution"
+msgstr "La spesa %s e la riga %s non hanno una distribuzione analitica differita"
+
+#. module: hr_expense_analytic_deferred_choice
+#: code:addons/hr_expense_analytic_deferred_choice/hr_expense.py:62
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr "Non c'è un sezionale d'acquisto definito per questa azienda: \"%s\" (id:%d)"
+
+#. module: hr_expense_analytic_deferred_choice
+#: code:addons/hr_expense_analytic_deferred_choice/hr_expense.py:67
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr "E' necessario definite un giornale analitico per il sezionale '%s'!"
+
+#. module: hr_expense_analytic_deferred_choice
+#: code:addons/hr_expense_analytic_deferred_choice/hr_expense.py:73
+#, python-format
+msgid "Analytic lines yet generated for expense %s. Remove them first"
+msgstr "Righe analitiche già generate per la fattura %s. Rimuoverle prima di crearne altre"
+
+#. module: hr_expense_analytic_deferred_choice
+#: view:hr.expense.expense:0
+msgid "Delete analytic lines"
+msgstr "Rimuovi righe analitiche"
+
+#. module: hr_expense_analytic_deferred_choice
+#: code:addons/hr_expense_analytic_deferred_choice/hr_expense.py:72
+#: code:addons/hr_expense_analytic_deferred_choice/hr_expense.py:76
+#, python-format
+msgid "Error"
+msgstr "Errore"
+
+#. module: hr_expense_analytic_deferred_choice
+#: view:hr.expense.expense:0
+msgid "Deferred analytic lines"
+msgstr "Righe analitiche differite"
+
+#. module: hr_expense_analytic_deferred_choice
+#: code:addons/hr_expense_analytic_deferred_choice/hr_expense.py:61
+#, python-format
+msgid "Error !"
+msgstr "Errore !"
+
+#. module: hr_expense_analytic_deferred_choice
+#: view:account.analytic.line:0
+#: field:account.analytic.line,deferred_expense_id:0
+#: model:ir.model,name:hr_expense_analytic_deferred_choice.model_hr_expense_expense
+msgid "Expense"
+msgstr "Spesa"
+
+#. module: hr_expense_analytic_deferred_choice
+#: model:ir.module.module,shortdesc:hr_expense_analytic_deferred_choice.module_meta_information
+msgid "Analytic Deferred Choice for Expenses"
+msgstr "Scelta analitica differita per i rimborsi spese"
+
+#. module: hr_expense_analytic_deferred_choice
+#: code:addons/hr_expense_analytic_deferred_choice/hr_expense.py:69
+#, python-format
+msgid "No Debit Account !"
+msgstr "Nessun conto di debito!"
+
+#. module: hr_expense_analytic_deferred_choice
+#: field:hr.expense.expense,deferred_analytics_id:0
+#: field:hr.expense.line,deferred_analytics_id:0
+msgid "Deferred Analytic Distribution"
+msgstr "Distribuzione analitica differita"
+

=== added file 'hr_expense_analytic_deferred_choice/project_view.xml'
--- hr_expense_analytic_deferred_choice/project_view.xml	1970-01-01 00:00:00 +0000
+++ hr_expense_analytic_deferred_choice/project_view.xml	2012-05-21 16:22:21 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_account_analytic_line_form" model="ir.ui.view">
+            <field name="name">account.analytic.line.form</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_analytic_line_form"></field>
+            <field name="arch" type="xml">
+                <field name="move_id" position="after">
+                    <separator colspan="2" string="Expense"/>
+                    <field name="deferred_expense_id"/>
+                    <field name="deferred_expense_line_id"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'project_issue_customer_view/data'
=== renamed directory 'project_issue_customer_view/data' => 'project_issue_customer_view/data.moved'
=== added file 'project_issue_customer_view/data/tickets-icon-hover.png'
Binary files project_issue_customer_view/data/tickets-icon-hover.png	1970-01-01 00:00:00 +0000 and project_issue_customer_view/data/tickets-icon-hover.png	2012-05-21 16:22:21 +0000 differ
=== added file 'project_issue_customer_view/data/tickets-icon.png'
Binary files project_issue_customer_view/data/tickets-icon.png	1970-01-01 00:00:00 +0000 and project_issue_customer_view/data/tickets-icon.png	2012-05-21 16:22:21 +0000 differ
=== modified file 'project_issue_customer_view/project_issue_menu.xml'
--- project_issue_customer_view/project_issue_menu.xml	2012-03-31 15:46:16 +0000
+++ project_issue_customer_view/project_issue_menu.xml	2012-05-21 16:22:21 +0000
@@ -25,9 +25,15 @@
         <field name="act_window_id" ref="action_project_ticket"/>
     </record>
 
+<<<<<<< TREE
     <menuitem name="Support" id="menu_customer_support"
 	      web_icon="data/tickets-icon.png"
               web_icon_hover="data/tickets-icon-hover.png" action="action_project_ticket"/>
+=======
+    <menuitem name="Support" id="menu_customer_support"
+                    web_icon="data/tickets-icon.png"
+                    web_icon_hover="data/tickets-icon-hover.png"/>
+>>>>>>> MERGE-SOURCE
     <menuitem name="Tickets" id="menu_customer_ticket" parent="menu_customer_support"/>
     <menuitem name="Tickets" id="menu_customer_ticket_list"  parent="menu_customer_ticket"
             action="action_project_ticket" sequence="5"/>

=== added directory 'purchase_analytic_deferred_choice'
=== renamed directory 'purchase_analytic_deferred_choice' => 'purchase_analytic_deferred_choice.moved'
=== added file 'purchase_analytic_deferred_choice/AUTHORS.txt'
--- purchase_analytic_deferred_choice/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ purchase_analytic_deferred_choice/AUTHORS.txt	2012-05-21 16:22:21 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'purchase_analytic_deferred_choice/__init__.py'
--- purchase_analytic_deferred_choice/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_analytic_deferred_choice/__init__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import purchase_order
+import analytic

=== added file 'purchase_analytic_deferred_choice/__openerp__.py'
--- purchase_analytic_deferred_choice/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_analytic_deferred_choice/__openerp__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': "Analytic Deferred Choice for Purchase Orders",
+    'version': '0.1',
+    'category': 'Generic Modules/Sales & Purchases',
+    'description': """User can assign the invoice amount to one or more analytic accounts, subsequently (or previously) to purchase order confirmation.
+    The purchase order has a new field, containing the analytic plan to be used. The related button generates tha analytic lines, related to the order. The order lines have new fields too, containing the analytic plan. If the line's field is not filled, the order's one is used.
+    On the order form, another button allows to delete the previously generated analytic lines.
+    Every analytic line contains a reference to the order line that generated it.""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['account_analytic_plans', 'purchase', 'purchase_analytic_plans'],
+    "init_xml" : [],
+    "update_xml" : [
+        'purchase_order_view.xml',
+        'project_view.xml',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added file 'purchase_analytic_deferred_choice/analytic.py'
--- purchase_analytic_deferred_choice/analytic.py	1970-01-01 00:00:00 +0000
+++ purchase_analytic_deferred_choice/analytic.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+
+    _columns = {
+        'deferred_purchase_order_line_id': fields.many2one('purchase.order.line', 'Purchase Order Line', readonly=True),
+        'deferred_purchase_order_id': fields.related('deferred_purchase_order_line_id', 'order_id', type="many2one",
+            relation="purchase.order", string="Purchase Order", store=False, readonly=True),
+        }
+
+account_analytic_line()

=== added directory 'purchase_analytic_deferred_choice/i18n'
=== added file 'purchase_analytic_deferred_choice/i18n/it.po'
--- purchase_analytic_deferred_choice/i18n/it.po	1970-01-01 00:00:00 +0000
+++ purchase_analytic_deferred_choice/i18n/it.po	2012-05-21 16:22:21 +0000
@@ -0,0 +1,150 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_analytic_deferred_choice
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-12-09 10:28+0000\n"
+"PO-Revision-Date: 2011-12-09 11:47+0100\n"
+"Last-Translator: Lorenzo Battistini <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: purchase_analytic_deferred_choice
+#: field:account.analytic.line,deferred_purchase_order_line_id:0
+#: model:ir.model,name:purchase_analytic_deferred_choice.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "Riga ordine d'acquisto"
+
+#. module: purchase_analytic_deferred_choice
+#: view:purchase.order:0
+msgid "Create analytic lines"
+msgstr "Crea righe analitiche"
+
+#. module: purchase_analytic_deferred_choice
+#: code:addons/purchase_analytic_deferred_choice/purchase_order.py:67
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr "E' necessario definite un giornale analitico per il sezionale '%s'!"
+
+#. module: purchase_analytic_deferred_choice
+#: code:addons/purchase_analytic_deferred_choice/purchase_order.py:70
+#, python-format
+msgid "You have to define a default debit account on the '%s' journal!"
+msgstr "E' necessario definire un conto di debito di default per il sezionale '%s'!"
+
+#. module: purchase_analytic_deferred_choice
+#: model:ir.module.module,shortdesc:purchase_analytic_deferred_choice.module_meta_information
+msgid "Analytic Deferred Choice for Purchase Orders"
+msgstr "Scelta analitica differita per gli ordini d'acquisto"
+
+#. module: purchase_analytic_deferred_choice
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Il riferimento ordine deve essere unico!"
+
+#. module: purchase_analytic_deferred_choice
+#: model:ir.model,name:purchase_analytic_deferred_choice.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Voce conto analitico"
+
+#. module: purchase_analytic_deferred_choice
+#: code:addons/purchase_analytic_deferred_choice/purchase_order.py:62
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr "Non c'è un sezionale d'acquisto definito per questa azienda: \"%s\" (id:%d)"
+
+#. module: purchase_analytic_deferred_choice
+#: field:purchase.order,deferred_analytics_id:0
+#: field:purchase.order.line,deferred_analytics_id:0
+msgid "Deferred Analytic Distribution"
+msgstr "Distribuzione analitica differita"
+
+#. module: purchase_analytic_deferred_choice
+#: view:purchase.order:0
+msgid "Notes"
+msgstr "Note"
+
+#. module: purchase_analytic_deferred_choice
+#: field:purchase.order,deferred_line_ids:0
+#: field:purchase.order.line,deferred_line_ids:0
+msgid "Analytic Lines"
+msgstr "Righe analitiche"
+
+#. module: purchase_analytic_deferred_choice
+#: code:addons/purchase_analytic_deferred_choice/purchase_order.py:73
+#, python-format
+msgid "Analytic lines yet generated for order %s. Remove them first"
+msgstr "Righe analitiche già generate per la fattura %s. Rimuoverle prima di crearne altre"
+
+#. module: purchase_analytic_deferred_choice
+#: view:account.analytic.line:0
+#: field:account.analytic.line,deferred_purchase_order_id:0
+#: model:ir.model,name:purchase_analytic_deferred_choice.model_purchase_order
+msgid "Purchase Order"
+msgstr "Ordine d'acquisto"
+
+#. module: purchase_analytic_deferred_choice
+#: code:addons/purchase_analytic_deferred_choice/purchase_order.py:72
+#: code:addons/purchase_analytic_deferred_choice/purchase_order.py:76
+#, python-format
+msgid "Error"
+msgstr "Errore"
+
+#. module: purchase_analytic_deferred_choice
+#: code:addons/purchase_analytic_deferred_choice/purchase_order.py:61
+#, python-format
+msgid "Error !"
+msgstr "Errore !"
+
+#. module: purchase_analytic_deferred_choice
+#: view:purchase.order:0
+msgid "Deferred analytic lines"
+msgstr "Righe analitiche differite"
+
+#. module: purchase_analytic_deferred_choice
+#: view:purchase.order:0
+msgid "Delete analytic lines"
+msgstr "Rimuovi righe analitiche"
+
+#. module: purchase_analytic_deferred_choice
+#: view:purchase.order:0
+msgid "Analytic lines"
+msgstr "Righe analitiche"
+
+#. module: purchase_analytic_deferred_choice
+#: code:addons/purchase_analytic_deferred_choice/purchase_order.py:66
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "Nessun giornale analitico!"
+
+#. module: purchase_analytic_deferred_choice
+#: code:addons/purchase_analytic_deferred_choice/purchase_order.py:69
+#, python-format
+msgid "No Debit Account !"
+msgstr "Nessun conto di debito!"
+
+#. module: purchase_analytic_deferred_choice
+#: model:ir.module.module,description:purchase_analytic_deferred_choice.module_meta_information
+msgid ""
+"User can assign the invoice amount to one or more analytic accounts, subsequently (or previously) to purchase order confirmation.\n"
+"    The purchase order has a new field, containing the analytic plan to be used. The related button generates tha analytic lines, related to the order. The order lines have new fields too, containing the analytic plan. If the line's field is not filled, the order's one is used.\n"
+"    On the order form, another button allows to delete the previously generated analytic lines.\n"
+"    Every analytic line contains a reference to the order line that generated it."
+msgstr ""
+"User can assign the invoice amount to one or more analytic accounts, subsequently (or previously) to purchase order confirmation.\n"
+"    The purchase order has a new field, containing the analytic plan to be used. The related button generates tha analytic lines, related to the order. The order lines have new fields too, containing the analytic plan. If the line's field is not filled, the order's one is used.\n"
+"    On the order form, another button allows to delete the previously generated analytic lines.\n"
+"    Every analytic line contains a reference to the order line that generated it."
+
+#. module: purchase_analytic_deferred_choice
+#: code:addons/purchase_analytic_deferred_choice/purchase_order.py:76
+#, python-format
+msgid "Order %s and line %s have no Deferred Analytic Distribution"
+msgstr "L'ordine %s e la riga %s non hanno una distribuzione analitica differita"
+

=== added file 'purchase_analytic_deferred_choice/project_view.xml'
--- purchase_analytic_deferred_choice/project_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_analytic_deferred_choice/project_view.xml	2012-05-21 16:22:21 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_account_analytic_line_form" model="ir.ui.view">
+            <field name="name">account.analytic.line.form</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_analytic_line_form"></field>
+            <field name="arch" type="xml">
+                <field name="move_id" position="after">
+                    <separator colspan="2" string="Purchase Order"/>
+                    <field name="deferred_purchase_order_id"/>
+                    <field name="deferred_purchase_order_line_id"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'purchase_analytic_deferred_choice/purchase_order.py'
--- purchase_analytic_deferred_choice/purchase_order.py	1970-01-01 00:00:00 +0000
+++ purchase_analytic_deferred_choice/purchase_order.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+from osv import orm
+
+class purchase_order(osv.osv):
+    
+    _inherit = 'purchase.order'
+    
+    def _get_deferred_analytic_lines(self, cr, uid, ids, field_name, arg, context=None):
+        res={}
+        for po in self.browse(cr, uid, ids):
+            analytic_lines = []
+            for line in po.order_line:
+                try:
+                    if line.deferred_line_ids:
+                        analytic_lines.extend([x.id for x in line.deferred_line_ids])
+                except orm.except_orm, e:
+                    if e.name != 'AccessError':
+                        raise e
+            res[po.id] = analytic_lines
+        return res
+    
+    _columns={
+        'deferred_analytics_id': fields.many2one('account.analytic.plan.instance', 'Deferred Analytic Distribution'),
+        'deferred_line_ids': fields.function(_get_deferred_analytic_lines, type='one2many',
+            obj='account.analytic.line', method=True, string='Analytic Lines'),
+        }
+
+    def delete_analytic_lines(self, cr, uid, ids, context=None):
+        analytic_line_obj = self.pool.get('account.analytic.line')
+        for po in self.browse(cr, uid, ids):
+            for line in po.deferred_line_ids:
+                line.unlink()
+        return True
+
+    def create_analytic_lines(self, cr, uid, ids, context=None):
+        analytic_line_obj = self.pool.get('account.analytic.line')
+        journal_obj = self.pool.get('account.journal')
+        po_line_obj = self.pool.get('purchase.order.line')
+        for po in self.browse(cr, uid, ids):
+            journal_ids = journal_obj.search(cr, uid, [
+                ('type', '=','purchase'),('company_id', '=', po.company_id.id)], limit=1)
+            if not journal_ids:
+                raise osv.except_osv(_('Error !'),
+                    _('There is no purchase journal defined for this company: "%s" (id:%d)')
+                        % (po.company_id.name, po.company_id.id))
+            journal  = journal_obj.browse(cr, uid, journal_ids[0])
+            if not journal.analytic_journal_id:
+                raise osv.except_osv(_('No Analytic Journal !'),
+                    _("You have to define an analytic journal on the '%s' journal!") % (journal.name))
+            if not journal.default_debit_account_id:
+                raise osv.except_osv(_('No Debit Account !'),
+                    _("You have to define a default debit account on the '%s' journal!") % (journal.name))
+            if po.deferred_line_ids:
+                raise osv.except_osv(_('Error'),
+                    _('Analytic lines yet generated for order %s. Remove them first') % po.name)
+            for po_line in po.order_line:
+                if not po_line.deferred_analytics_id and not po.deferred_analytics_id:
+                    raise osv.except_osv(_('Error'),_('Order %s and line %s have no Deferred Analytic Distribution')
+                        % (po.name or '', po_line.name))
+                if po_line.deferred_analytics_id:
+                    deferred_analytics_id = po_line.deferred_analytics_id
+                else:
+                    deferred_analytics_id = po.deferred_analytics_id
+                for plan_line in deferred_analytics_id.account_ids:
+                    amount = - po_line.price_subtotal * (plan_line.rate / 100)
+                    al_vals={
+                        'name': po_line.name,
+                        'account_id': plan_line.analytic_account_id.id,
+                        'unit_amount': po_line.product_qty,
+                        'product_id': po_line.product_id and po_line.product_id.id or False,
+                        'product_uom_id': po_line.product_uom and po_line.product_uom.id or False,
+                        'amount': amount,
+                        'journal_id': journal.analytic_journal_id.id,
+                        'percentage': plan_line.rate,
+                        'deferred_purchase_order_line_id': po_line.id,
+                        'general_account_id': journal.default_debit_account_id.id,
+                    }
+                    al_id = analytic_line_obj.create(cr, uid, al_vals, context=context)
+        return True
+        
+purchase_order()
+
+class purchase_order_line(osv.osv):
+    
+    _inherit = 'purchase.order.line'
+    
+    _columns={
+        'deferred_analytics_id': fields.many2one('account.analytic.plan.instance', 'Deferred Analytic Distribution'),
+        'deferred_line_ids': fields.one2many('account.analytic.line', 'deferred_purchase_order_line_id',
+            'Analytic Lines'),
+        }
+        
+purchase_order_line()

=== added file 'purchase_analytic_deferred_choice/purchase_order_view.xml'
--- purchase_analytic_deferred_choice/purchase_order_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_analytic_deferred_choice/purchase_order_view.xml	2012-05-21 16:22:21 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="purchase_order_form" model="ir.ui.view">
+            <field name="name">purchase.order.form</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"></field>
+            <field name="arch" type="xml">
+                <field name="fiscal_position" position="after">
+                    <separator string="Analytic lines" colspan="2"/>
+                    <group colspan="2" col="4" groups="analytic.group_analytic_accounting">
+                        <field name="deferred_analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+                        <button name="create_analytic_lines" type="object" string="Create analytic lines"/>
+                        <button name="delete_analytic_lines" type="object" string="Delete analytic lines"/>
+                    </group>
+                </field>
+                <page string="Notes" position="after">
+                    <page string="Deferred analytic lines" groups="account.group_account_user">
+                        <field name="deferred_line_ids" nolabel="1" colspan="4"/>
+                    </page>
+                </page>
+            </field>
+        </record>
+
+        <record id="purchase_order_line_form" model="ir.ui.view">
+            <field name="name">purchase.order.line.form</field>
+            <field name="model">purchase.order.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase_analytic_plans.purchase_order_line_form_inherit"></field>
+            <field name="arch" type="xml">
+                <field name="analytics_id" position="after">
+                    <field name="deferred_analytics_id" groups="analytic.group_analytic_accounting" domain="[('plan_id','&lt;&gt;',False)]"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'sale_double_validation'
=== renamed directory 'sale_double_validation' => 'sale_double_validation.moved'
=== added file 'sale_double_validation/AUTHORS.txt'
--- sale_double_validation/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ sale_double_validation/AUTHORS.txt	2012-05-21 16:22:21 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'sale_double_validation/__init__.py'
--- sale_double_validation/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_double_validation/__init__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import sale

=== added file 'sale_double_validation/__openerp__.py'
--- sale_double_validation/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_double_validation/__openerp__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': "Double validation for sale orders",
+    'version': '0.1',
+    'category': 'Generic Modules/Sales & Purchases',
+    'description': """
+    This module modifies the sale workflow adding a validation step before the sale order confirmation.
+    """,
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['sale'],
+    "init_xml" : [],
+    "update_xml" : [
+        'sale_workflow.xml',
+        'sale_view.xml',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added directory 'sale_double_validation/i18n'
=== added file 'sale_double_validation/i18n/it.po'
--- sale_double_validation/i18n/it.po	1970-01-01 00:00:00 +0000
+++ sale_double_validation/i18n/it.po	2012-05-21 16:22:21 +0000
@@ -0,0 +1,58 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_double_validation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2012-02-08 16:43+0000\n"
+"PO-Revision-Date: 2012-02-08 17:44+0100\n"
+"Last-Translator: eLBati <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: sale_double_validation
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Il riferimento ordine deve essere unico!"
+
+#. module: sale_double_validation
+#: model:ir.module.module,description:sale_double_validation.module_meta_information
+msgid ""
+"\n"
+"    This module modifies the sale workflow adding a validation step before the sale order confirmation.\n"
+"    "
+msgstr ""
+"\n"
+"    This module modifies the sale workflow adding a validation step before the sale order confirmation.\n"
+"    "
+
+#. module: sale_double_validation
+#: view:sale.order:0
+msgid "Quotation Accepted"
+msgstr "Preventivo Accettato"
+
+#. module: sale_double_validation
+#: model:ir.module.module,shortdesc:sale_double_validation.module_meta_information
+msgid "Double validation for sale orders"
+msgstr "Doppia validazione per gli ordini di vendita"
+
+#. module: sale_double_validation
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr "Conferma Ordine"
+
+#. module: sale_double_validation
+#: model:ir.model,name:sale_double_validation.model_sale_order
+msgid "Sales Order"
+msgstr "Ordine di vendita"
+
+#. module: sale_double_validation
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "Annulla Ordine"
+

=== added file 'sale_double_validation/sale.py'
--- sale_double_validation/sale.py	1970-01-01 00:00:00 +0000
+++ sale_double_validation/sale.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class sale_order(osv.osv):
+    _inherit = "sale.order"
+    
+    _columns = {
+        'state': fields.selection([
+            ('draft', 'Quotation'),
+            ('waiting_resp', 'Waiting Responsible'),
+            ('waiting_date', 'Waiting Schedule'),
+            ('manual', 'Manual In Progress'),
+            ('progress', 'In Progress'),
+            ('shipping_except', 'Shipping Exception'),
+            ('invoice_except', 'Invoice Exception'),
+            ('done', 'Done'),
+            ('cancel', 'Cancelled')
+            ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
+        }
+    
+    def waiting_responsible(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'waiting_resp'})
+        return True
+        
+sale_order()

=== added file 'sale_double_validation/sale_view.xml'
--- sale_double_validation/sale_view.xml	1970-01-01 00:00:00 +0000
+++ sale_double_validation/sale_view.xml	2012-05-21 16:22:21 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_order_form" model="ir.ui.view">
+            <field name="name">sale.order.form</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_order_form"></field>
+            <field name="arch" type="xml">
+                <button name="order_confirm" position="replace">
+                    <button name="order_confirm" states="waiting_resp" string="Confirm Order" icon="gtk-apply"/>
+                    <button name="waiting_responsible" states="draft" string="Quotation Accepted" icon="gtk-apply"/>
+                </button>
+                <button name="cancel" position="replace" >
+                    <button name="cancel" states="draft,waiting_resp" string="Cancel Order" icon="gtk-cancel"/>
+                </button>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'sale_double_validation/sale_workflow.xml'
--- sale_double_validation/sale_workflow.xml	1970-01-01 00:00:00 +0000
+++ sale_double_validation/sale_workflow.xml	2012-05-21 16:22:21 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="act_waiting_responsible" model="workflow.activity">
+            <field name="wkf_id" ref="sale.wkf_sale"/>
+            <field name="name">waiting_responsible</field>
+            <field name="action">waiting_responsible()</field>
+            <field name="kind">function</field>
+        </record>
+
+        <record id="sale.trans_draft_router" model="workflow.transition">
+            <field name="act_from" ref="sale.act_draft"/>
+            <field name="act_to" ref="act_waiting_responsible"/>
+            <field name="signal">waiting_responsible</field>
+        </record>
+
+        <record id="trans_waiting_router" model="workflow.transition">
+            <field name="act_from" ref="act_waiting_responsible"/>
+            <field name="act_to" ref="sale.act_router"/>
+            <field name="signal">order_confirm</field>
+            <field name="group_id" ref="base.group_sale_manager"/>
+        </record>
+
+        <record id="trans_waiting_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_waiting_responsible"/>
+            <field name="act_to" ref="sale.act_cancel"/>
+            <field name="signal">cancel</field>
+            <field name="group_id" ref="base.group_sale_manager"/>
+        </record>
+    </data>
+</openerp>

=== added directory 'sale_double_validation/security'
=== added directory 'super_calendar'
=== renamed directory 'super_calendar' => 'super_calendar.moved'
=== added file 'super_calendar/AUTHORS.txt'
--- super_calendar/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ super_calendar/AUTHORS.txt	2012-05-21 16:22:21 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'super_calendar/__init__.py'
--- super_calendar/__init__.py	1970-01-01 00:00:00 +0000
+++ super_calendar/__init__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import super_calendar

=== added file 'super_calendar/__openerp__.py'
--- super_calendar/__openerp__.py	1970-01-01 00:00:00 +0000
+++ super_calendar/__openerp__.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': "Super Calendar",
+    'version': '0.1',
+    'category': 'Generic Modules/Others',
+    'description': """
+    This module allows to create configurable calendars.
+    
+    Through the 'calendar configurator' object, you can specify which models have to be merged in the super calendar. For each model, you have to define the 'description' and 'date_start' fields at least. Then you can define 'duration' and the 'user_id' fields.
+    
+    The 'super.calendar' object contains the the merged calendars. The 'super.calendar' can be updated by 'ir.cron' or manually.
+    """,
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['base'],
+    "init_xml" : [],
+    "update_xml" : [
+        'super_calendar_view.xml',
+        'cron_data.xml',
+        'security/ir.model.access.csv',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added file 'super_calendar/cron_data.xml'
--- super_calendar/cron_data.xml	1970-01-01 00:00:00 +0000
+++ super_calendar/cron_data.xml	2012-05-21 16:22:21 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+        <record model="ir.cron" id="generate_calendar_records_cron">
+            <field name="name">Generate Calendar Records</field>
+            <field name="interval_number">10</field>
+            <field name="interval_type">minutes</field>
+            <field eval="'super.calendar.configurator'" name="model"/>
+            <field eval="'generate_calendar_records'" name="function"/>
+            <field eval="'[[],{}]'" name="args"/>
+        </record>
+    </data>
+</openerp>

=== added directory 'super_calendar/i18n'
=== added directory 'super_calendar/security'
=== added file 'super_calendar/security/ir.model.access.csv'
--- super_calendar/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ super_calendar/security/ir.model.access.csv	2012-05-21 16:22:21 +0000
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_model_super_calendar_configurator,access_model_super_calendar_configurator,model_super_calendar_configurator,base.group_system,1,1,1,1
+access_model_super_calendar_configurator_line,access_model_super_calendar_configurator_line,model_super_calendar_configurator_line,base.group_system,1,1,1,1
+access_model_super_calendar,access_model_super_calendar,model_super_calendar,base.group_user,1,0,0,0

=== added file 'super_calendar/super_calendar.py'
--- super_calendar/super_calendar.py	1970-01-01 00:00:00 +0000
+++ super_calendar/super_calendar.py	2012-05-21 16:22:21 +0000
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+
+def _models_get(self, cr, uid, context={}):
+    obj = self.pool.get('ir.model')
+    ids = obj.search(cr, uid, [])
+    res = obj.read(cr, uid, ids, ['model', 'name'], context)
+    return [(r['model'], r['name']) for r in res]
+
+class super_calendar_configurator(osv.osv):
+    _logger = netsvc.Logger()
+    _name = 'super.calendar.configurator'
+    _columns  = {
+        'name': fields.char('Name', size=64, required=True),
+        'line_ids': fields.one2many('super.calendar.configurator.line', 'configurator_id', 'Lines'),
+        }
+
+    def generate_calendar_records(self, cr, uid, ids, context=None):
+        configurator_ids = self.search(cr, uid, [])
+        super_calendar_pool = self.pool.get('super.calendar')
+        
+        # removing old records
+        super_calendar_ids = super_calendar_pool.search(cr, uid, [])
+        super_calendar_pool.unlink(cr, uid, super_calendar_ids)
+        
+        for configurator_id in configurator_ids:
+            configurator = self.browse(cr, uid, configurator_id)
+            for line in configurator.line_ids:
+                current_pool = self.pool.get(line.name.model)
+                current_record_ids = current_pool.search(cr, uid, line.domain and eval(line.domain) or [])
+                for current_record_id in current_record_ids:
+                    current_record  = current_pool.browse(cr, uid, current_record_id)
+                    if line.user_field_id and \
+                        current_record[line.user_field_id.name]._table_name != 'res.users':
+                        raise osv.except_osv(_('Error'), 
+                            _("The 'User' field of record %s (%s) does not refer to res.users")
+                            % (current_record[line.description_field_id.name], line.name.model))
+                    if current_record[line.description_field_id.name] \
+                        and current_record[line.date_start_field_id.name]:
+                        super_calendar_values = {
+                            'name': current_record[line.description_field_id.name],
+                            'date_start': current_record[line.date_start_field_id.name],
+                            #'date_stop': line.date_stop_field_id and current_record[line.date_stop_field_id.name] or False,
+                            'duration': line.duration_field_id and current_record[line.duration_field_id.name] \
+                                or False,
+                            'user_id': line.user_field_id and current_record[line.user_field_id.name] and current_record[line.user_field_id.name].id or False,
+                            'configurator_id': configurator.id,
+                            'res_id': line.name.model+','+str(current_record['id']),
+                            'model_id': line.name.id,
+                            }
+                        super_calendar_pool.create(cr, uid, super_calendar_values)
+        self._logger.notifyChannel('super_calendar', netsvc.LOG_INFO, "Calendar generated")
+        return True
+
+super_calendar_configurator()
+
+class super_calendar_configurator_line(osv.osv):
+    _name = 'super.calendar.configurator.line'
+    _columns  = {
+        'name': fields.many2one('ir.model', 'Model', required=True),
+        'domain': fields.char('Domain', size=512),
+        'configurator_id': fields.many2one('super.calendar.configurator', 'Configurator'),
+        'description_field_id': fields.many2one('ir.model.fields', 'Description field',
+            domain="[('model_id', '=', name),('ttype', '=', 'char')]", required=True),
+        'date_start_field_id': fields.many2one('ir.model.fields', 'Start date field',
+            domain="['&',('ttype', '=', 'datetime'),('model_id', '=', name)]",
+            required=True),
+#        'date_stop_field_id': fields.many2one('ir.model.fields', 'End date field',
+#            domain="['&',('ttype', '=', 'datetime'),('model_id', '=', name)]"),
+        'duration_field_id': fields.many2one('ir.model.fields', 'Duration field',
+            domain="['&',('ttype', '=', 'float'),('model_id', '=', name)]"),
+        'user_field_id': fields.many2one('ir.model.fields', 'User field',
+            domain="['&',('ttype', '=', 'many2one'),('model_id', '=', name)]"),
+        }
+    # False. The same object can have several dates
+    #_sql_constraints = [
+    #    ('name', 'unique(configurator_id,name)', 'The model must be unique per configurator' )
+    #    ]
+super_calendar_configurator_line()
+
+class super_calendar(osv.osv):
+    _name = 'super.calendar'
+    _columns  = {
+        'name': fields.char('Description', size=64, required=True),
+        'date_start':fields.datetime('Start date', required=True),
+        #'date_stop':fields.datetime('End date'), # to be removed?
+        'duration':fields.float('Duration'),
+        'user_id': fields.many2one('res.users', 'User'),
+        'configurator_id': fields.many2one('super.calendar.configurator', 'Configurator'),
+        'res_id': fields.reference('Resource', selection=_models_get, size=128),
+        'model_id': fields.many2one('ir.model', 'Model'),
+        }
+super_calendar()

=== added file 'super_calendar/super_calendar_view.xml'
--- super_calendar/super_calendar_view.xml	1970-01-01 00:00:00 +0000
+++ super_calendar/super_calendar_view.xml	2012-05-21 16:22:21 +0000
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        
+        <!-- configurator -->
+        
+        <record model="ir.ui.view" id="super_calendar_configurator_tree">
+            <field name="name">super_calendar_configurator_tree</field>
+            <field name="model">super.calendar.configurator</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Configurators">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="super_calendar_configurator_form">
+            <field name="name">super_calendar_configurator_form</field>
+            <field name="model">super.calendar.configurator</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Configurator">
+                    <field name="name" select="1" colspan="2"/>
+                    <newline/>
+                    <field name="line_ids" nolabel="1" colspan="4">
+                        <tree string="Lines">
+                            <field name="name"/>
+                            <field name="domain"/>
+                        </tree>
+                        <form string="Line">
+                            <field name="name"/>
+                            <field name="domain"/>
+                            <field name="description_field_id"/>
+                            <field name="date_start_field_id"/>
+                            <!--<field name="date_stop_field_id"/>-->
+                            <field name="duration_field_id"/>
+                            <field name="user_field_id"/>
+                        </form>
+                    </field>
+                    <newline/>
+                    <button name="generate_calendar_records" string="Generate Calendar" type="object" icon="gtk-go-forward" colspan="2"/>
+                </form>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="super_calendar_configurator">
+            <field name="name">Calendar Configurators</field>
+            <field name="res_model">super.calendar.configurator</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="super_calendar_configurator_tree"/>
+        </record>
+        
+        <!-- calendar -->
+        
+        <record model="ir.ui.view" id="super_calendar_tree">
+            <field name="name">super_calendar_tree</field>
+            <field name="model">super.calendar</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Calendar">
+                    <field name="name"/>
+                    <field name="date_start"/>
+                    <!--<field name="date_stop"/>-->
+                    <field name="duration"/>
+                    <field name="user_id"/>
+                    <field name="configurator_id"/>
+                    <field name="model_id"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="super_calendar_form">
+            <field name="name">super_calendar_form</field>
+            <field name="model">super.calendar</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Configurator">
+                    <field name="name" readonly="1"/>
+                    <field name="date_start" readonly="1"/>
+                    <!--<field name="date_stop" readonly="1"/>-->
+                    <field name="duration" readonly="1"/>
+                    <field name="user_id" readonly="1"/>
+                    <field name="configurator_id" readonly="1"/>
+                    <field name="model_id" readonly="1"/>
+                    <field name="res_id"/>
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="super_calendar">
+            <field name="name">super_calendar</field>
+            <field name="model">super.calendar</field>
+            <field name="type">calendar</field>
+            <field name="arch" type="xml">
+                <calendar string="Calendar" color="model_id" date_start="date_start" date_delay="duration">
+                    <field name="name"/>
+                </calendar>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="super_calendar_search">
+            <field name="name">super_calendar_search</field>
+            <field name="model">super.calendar</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Calendar" >
+                    <field name="name"/>
+                    <field name="configurator_id" select="1"/>
+                    <field name="model_id" select="1"/>
+                    <field name="user_id" select="1">
+                        <filter domain="[('user_id','=',uid)]" help="My Items" icon="terp-personal"/>
+                    </field>
+                    <newline/>
+                    <group expand="0" string="Extended Filters..." colspan="4" col="8">
+                        <field name="date_start" />
+                        <!--<field name="date_stop" />-->
+                        <field name="duration" />
+                    </group>
+                </search>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="super_calendar_action">
+            <field name="name">Super Calendar</field>
+            <field name="res_model">super.calendar</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">calendar,tree,form</field>
+            <field name="view_id" ref="super_calendar"/>
+        </record>
+    
+        <menuitem id="super_calendar_menu" name="Super Calendar" />
+        <menuitem id="super_calendar_calendar" name="Calendar" parent="super_calendar_menu" />
+        <menuitem id="super_calendar_calendar_calendar" name="Calendar" parent="super_calendar_calendar" action="super_calendar_action"/>
+        <menuitem id="super_calendar_configuration" name="Configuration" parent="super_calendar_menu" />
+        <menuitem id="super_calendar_configurators" name="Configurators" parent="super_calendar_configuration" action="super_calendar_configurator"/>
+    </data>
+</openerp>