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

[Franco Tampieri]

Aggiunte nuove funzionalità all'account_analytics_defered

[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)]

merged in 6.1: http://bazaar.launchpad.net/~domsense/domsense-agilebg-addons/6.1/revision/219

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

=== modified file 'account_analytic_deferred_choice/AUTHORS.txt'
--- account_analytic_deferred_choice/AUTHORS.txt	2011-12-06 17:34:39 +0000
+++ account_analytic_deferred_choice/AUTHORS.txt	2012-05-21 16:22:22 +0000
@@ -1,1 +1,3 @@
 Lorenzo Battistini <[e-mail]>
+Leonardo Pistone <[e-mail]>
+Franco Tampieri <[e-mail]>

=== modified file 'account_analytic_deferred_choice/account_invoice_view.xml'
--- account_analytic_deferred_choice/account_invoice_view.xml	2012-01-24 22:03:25 +0000
+++ account_analytic_deferred_choice/account_invoice_view.xml	2012-05-21 16:22:22 +0000
@@ -21,6 +21,7 @@
                 </page>
             </field>
         </record>
+
         <record id="invoice_form" model="ir.ui.view">
             <field name="name">account.invoice.form</field>
             <field name="model">account.invoice</field>
@@ -53,5 +54,33 @@
                 </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>

=== modified file 'account_analytic_deferred_choice/analytic.py'
--- account_analytic_deferred_choice/analytic.py	2011-12-07 14:35:51 +0000
+++ account_analytic_deferred_choice/analytic.py	2012-05-21 16:22:22 +0000
@@ -1,6 +1,6 @@
 # -*- 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
@@ -29,6 +29,9 @@
         '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 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:22 +0000 differ
=== modified file 'account_analytic_deferred_choice/i18n/it.po'
--- account_analytic_deferred_choice/i18n/it.po	2011-12-09 10:50:36 +0000
+++ account_analytic_deferred_choice/i18n/it.po	2012-05-21 16:22:22 +0000
@@ -4,11 +4,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Project-Id-Version: OpenERP Server 6.0.4\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:46+0100\n"
-"Last-Translator: Lorenzo Battistini <[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"
@@ -16,58 +16,170 @@
 "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 "Voce conto analitico"
-
-#. module: account_analytic_deferred_choice
-#: code:addons/account_analytic_deferred_choice/invoice.py:61
+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
-#: code:addons/account_analytic_deferred_choice/invoice.py:64
+#: 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
-#: view:account.invoice:0
-msgid "Create analytic lines"
-msgstr "Crea righe analitiche"
-
-#. module: account_analytic_deferred_choice
-#: code:addons/account_analytic_deferred_choice/invoice.py:57
-#: code:addons/account_analytic_deferred_choice/invoice.py:61
-#, python-format
-msgid "Error"
-msgstr "Errore"
-
-#. 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
-#: code:addons/account_analytic_deferred_choice/invoice.py:64
-#, 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
-#: view:account.invoice:0
-msgid "Delete analytic lines"
-msgstr "Rimuovi righe analitiche"
-
-#. 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
@@ -75,42 +187,7 @@
 msgstr "Fattura"
 
 #. 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
-#: code:addons/account_analytic_deferred_choice/invoice.py:58
-#, 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
-#: 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
-#: view:account.invoice:0
-msgid "Deferred analytic lines"
-msgstr "Righe analitiche differite"
-
-#. module: account_analytic_deferred_choice
-#: field:account.invoice,deferred_analytics_id:0
-#: field:account.invoice.line,deferred_analytics_id:0
-msgid "Deferred Analytic Distribution"
-msgstr "Distribuzione analitica differita"
-
-#. module: account_analytic_deferred_choice
-#: view:account.invoice:0
-msgid "Payments"
-msgstr "Pagamenti"
+#: 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\""
 

=== modified file 'account_analytic_deferred_choice/invoice.py'
--- account_analytic_deferred_choice/invoice.py	2012-01-24 15:41:42 +0000
+++ account_analytic_deferred_choice/invoice.py	2012-05-21 16:22:22 +0000
@@ -1,6 +1,6 @@
 # -*- 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
@@ -25,9 +25,9 @@
 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):
@@ -41,7 +41,7 @@
                         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'),
@@ -89,17 +89,95 @@
                     }
                     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

=== modified file 'account_analytic_deferred_choice/project_view.xml'
--- account_analytic_deferred_choice/project_view.xml	2011-12-07 16:22:31 +0000
+++ account_analytic_deferred_choice/project_view.xml	2012-05-21 16:22:22 +0000
@@ -11,6 +11,9 @@
                     <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>