Merge lp:~domsense/domsense-agilebg-addons/adding_causali into lp:domsense-agilebg-addons/6.0

[Davide Corio]

[Lorenzo Battistini (elbati)]

Non si riesce a usare 'super' nei metodi 'generate' e 'create_entries' ?

review: Needs Information

[Davide Corio (enlightx-deactivatedaccount)]

ad occhio direi di no, ma sarei felice di essere smentito

[Lorenzo Battistini (elbati)]

Lo consideriamo sostituito da account_move_template e account_invoice_template?

Unmerged revisions

22. By Davide Corio on 2011-09-03

[ADD] new reg wizard

21. By Davide Corio on 2011-08-31

[FIX] missing import

20. By Davide Corio on 2011-08-18

[IMP] dedicated menu item and translations

19. By Davide Corio on 2011-08-18

[FIX] pdb removed

18. By Davide Corio on 2011-08-18

[IMP] tax computation

17. By Davide Corio on 2011-08-18

[IMP] added tax_code on model line

16. By Lorenzo Battistini on 2011-08-10

[DEL] account_voucher_template

15. By Lorenzo Battistini on 2011-08-10

[FIX] varie

14. By Lorenzo Battistini on 2011-08-10

[FIX] mandatory field

13. By Lorenzo Battistini on 2011-08-09

[add] account_recurring_model account_voucher_template

=== added directory 'account_recurring_model'
=== added file 'account_recurring_model/AUTHORS.txt'
--- account_recurring_model/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ account_recurring_model/AUTHORS.txt	2011-09-03 19:18:23 +0000
@@ -0,0 +1,1 @@
+Davide Corio <[e-mail]>

=== added file 'account_recurring_model/__init__.py'
--- account_recurring_model/__init__.py	1970-01-01 00:00:00 +0000
+++ account_recurring_model/__init__.py	2011-09-03 19:18:23 +0000
@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Domsense s.r.l. (<http://www.domsense.com>).
+#
+#    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 Affero 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_model

=== added file 'account_recurring_model/__openerp__.py'
--- account_recurring_model/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_recurring_model/__openerp__.py	2011-09-03 19:18:23 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Domsense s.r.l. (<http://www.domsense.com>).
+#
+#    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 Affero 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 Recurring Models',
+    'version': '0.1',
+    'category': 'Generic Modules/Accounting',
+    'description': """Account Recurring Models (Improvements)""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['account'],
+    "init_xml" : ['account_model_view.xml'],
+    "update_xml" : [],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added file 'account_recurring_model/account_model.py'
--- account_recurring_model/account_model.py	1970-01-01 00:00:00 +0000
+++ account_recurring_model/account_model.py	2011-09-03 19:18:23 +0000
@@ -0,0 +1,231 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Domsense s.r.l. (<http://www.domsense.com>).
+#
+#    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 Affero 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 datetime
+import time
+import decimal_precision as dp
+
+from osv import fields, osv
+from tools.translate import _
+
+
+class account_model_line(osv.osv):
+
+    _inherit = 'account.model.line'
+    _columns = {
+        'type':fields.selection([
+            ('cr','Credit'),
+            ('dr','Debit'),
+            ], 'Type'),
+        'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
+        'value_type': fields.selection([
+            ('amount','Amount'),
+            ('percentage','Percentage'),
+            ], 'Value Type'),
+        'account_tax_id': fields.many2one('account.tax','Tax'),
+    }
+
+    def compute_amount(self,vals,amount):
+    	if vals['type']=='cr' and vals['value_type']=='amount':
+        	vals['credit']=vals['amount']
+        elif vals['type']=='cr' and vals['value_type']=='percentage':
+        	vals['credit']=(amount/100)*vals['amount']
+        elif vals['type']=='dr' and vals['value_type']=='amount':
+        	vals['debit']=vals['amount']
+        elif vals['type']=='dr' and vals['value_type']=='percentage':
+        	vals['debit']=(amount/100)*vals['amount']
+        return vals
+
+    def create(self, cr, uid, vals, context=None):
+        amount = self.pool.get('account.model').browse(cr,uid,vals['model_id']).amount
+        vals = self.compute_amount(vals,amount)
+        return super(account_model_line, self).create(cr, uid, vals, context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        amount = self.pool.get('account.model.line').browse(cr,uid,ids[0]).model_id.amount
+        vals = self.compute_amount(vals,amount)
+        return super(account_model_line, self).write(cr, uid, ids, vals, context=context)
+    
+account_model_line()
+
+class account_model(osv.osv):
+
+    _inherit = 'account.model'
+    _columns = {
+        'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
+    }
+
+    def generate(self, cr, uid, ids, datas={}, context=None):
+        move_ids = []
+        entry = {}
+        account_move_obj = self.pool.get('account.move')
+        account_move_line_obj = self.pool.get('account.move.line')
+        pt_obj = self.pool.get('account.payment.term')
+
+        if context is None:
+            context = {}
+
+        if datas.get('date', False):
+            context.update({'date': datas['date']})
+
+        period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date', False))
+        if not period_id:
+            raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
+        period_id = period_id[0]
+
+        for model in self.browse(cr, uid, ids, context=context):
+            entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%Y-%m')}
+            move_id = account_move_obj.create(cr, uid, {
+                'ref': entry['name'],
+                'period_id': period_id,
+                'journal_id': model.journal_id.id,
+                'date': context.get('date',time.strftime('%Y-%m-%d'))
+            })
+            move_ids.append(move_id)
+            for line in model.lines_id:
+                analytic_account_id = False
+                if line.analytic_account_id:
+                    if not model.journal_id.analytic_journal_id:
+                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,))
+                    analytic_account_id = line.analytic_account_id.id
+                val = {
+                    'move_id': move_id,
+                    'journal_id': model.journal_id.id,
+                    'period_id': period_id,
+                    'analytic_account_id': analytic_account_id
+                }
+
+                date_maturity = time.strftime('%Y-%m-%d')
+                if line.date_maturity == 'partner':
+                    if not line.partner_id:
+                        raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \
+                                                                "\nPlease define partner on it!")%(line.name, model.name))
+                    if line.partner_id.property_payment_term:
+                        payment_term_id = line.partner_id.property_payment_term.id
+                        pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity)
+                        if pterm_list:
+                            pterm_list = [l[0] for l in pterm_list]
+                            pterm_list.sort()
+                            date_maturity = pterm_list[-1]
+
+                val.update({
+                    'name': line.name,
+                    'quantity': line.quantity,
+                    'debit': line.debit,
+                    'credit': line.credit,
+                    'account_id': line.account_id.id,
+                    'move_id': move_id,
+                    'partner_id': line.partner_id.id,
+                    'date': context.get('date',time.strftime('%Y-%m-%d')),
+                    'date_maturity': date_maturity,
+                    'account_tax_id': line.account_tax_id.id,
+                })
+                c = context.copy()
+                c.update({'journal_id': model.journal_id.id,'period_id': period_id})
+                account_move_line_obj.create(cr, uid, val, context=c)
+
+        return move_ids
+    
+account_model()
+
+class account_use_model(osv.osv_memory):
+
+    _inherit = 'account.use.model'
+
+    def create_entries(self, cr, uid, ids, context=None):
+        account_model_obj = self.pool.get('account.model')
+        account_period_obj = self.pool.get('account.period')
+        account_move_obj = self.pool.get('account.move')
+        account_move_line_obj = self.pool.get('account.move.line')
+        pt_obj = self.pool.get('account.payment.term')
+        mod_obj = self.pool.get('ir.model.data')
+        if context is None:
+            context = {}
+        move_ids = []
+        entry = {}
+        data =  self.read(cr, uid, ids, context=context)[0]
+        record_id = context and context.get('model_line', False) or False
+        if record_id:
+            data_model = account_model_obj.browse(cr, uid, data['model'], context=context)
+        else:
+            data_model = account_model_obj.browse(cr, uid, context['active_ids'], context=context)
+        for model in data_model:
+            entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%d')}
+            period_id = account_period_obj.find(cr, uid, context=context)
+            if not period_id:
+                raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
+            period_id = period_id[0]
+            move_id = account_move_obj.create(cr, uid, {
+                'ref': entry['name'],
+                'period_id': period_id,
+                'journal_id': model.journal_id.id,
+            })
+            move_ids.append(move_id)
+            for line in model.lines_id:
+                analytic_account_id = False
+                if line.analytic_account_id:
+                    if not model.journal_id.analytic_journal_id:
+                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,))
+                    analytic_account_id = line.analytic_account_id.id
+                val = {
+                    'move_id': move_id,
+                    'journal_id': model.journal_id.id,
+                    'period_id': period_id,
+                    'analytic_account_id': analytic_account_id
+                }
+                date_maturity = time.strftime('%Y-%m-%d')
+                if line.date_maturity == 'partner' and line.partner_id and line.partner_id.property_payment_term:
+                    payment_term_id = line.partner_id.property_payment_term.id
+                    pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity)
+                    if pterm_list:
+                        pterm_list = [l[0] for l in pterm_list]
+                        pterm_list.sort()
+                        date_maturity = pterm_list[-1]
+                val.update({
+                    'name': line.name,
+                    'quantity': line.quantity,
+                    'debit': line.debit,
+                    'credit': line.credit,
+                    'account_id': line.account_id.id,
+                    'move_id': move_id,
+                    'partner_id': line.partner_id.id,
+                    'date': time.strftime('%Y-%m-%d'),
+                    'date_maturity': date_maturity,
+                    'account_tax_id': line.account_tax_id.id,
+                })
+                c = context.copy()
+                c.update({'journal_id': model.journal_id.id,'period_id': period_id})
+                id_line = account_move_line_obj.create(cr, uid, val, context=c)
+
+        context.update({'move_ids':move_ids})
+        model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_move_form')], context=context)
+        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+            'domain': "[('id','in', ["+','.join(map(str,context['move_ids']))+"])]",
+            'name': 'Entries',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.move',
+            'views': [(False,'tree'),(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+        }
+
+account_use_model()

=== added file 'account_recurring_model/account_model_view.xml'
--- account_recurring_model/account_model_view.xml	1970-01-01 00:00:00 +0000
+++ account_recurring_model/account_model_view.xml	2011-09-03 19:18:23 +0000
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+       <record id="view_model_line_form_type" model="ir.ui.view">
+            <field name="name">account.model.line.form.type</field>
+            <field name="model">account.model.line</field>
+            <field name="inherit_id" ref="account.view_model_line_form"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="type"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_model_form_amount" model="ir.ui.view">
+            <field name="name">account.model.form.amount</field>
+            <field name="model">account.model</field>
+            <field name="inherit_id" ref="account.view_model_form"/>
+            <field name="arch" type="xml">
+                <field name="name" position="after">
+                    <field name="amount"/>
+                </field>
+            </field>
+        </record>
+
+       <record id="view_model_line_tree_type" model="ir.ui.view">
+            <field name="name">account.model.line.tree.type</field>
+            <field name="model">account.model.line</field>
+            <field name="inherit_id" ref="account.view_model_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="type"/>
+                </field>
+            </field>
+        </record>
+
+       <record id="view_model_line_tree_amount_1" model="ir.ui.view">
+            <field name="name">account.model.line.tree.amount.1</field>
+            <field name="model">account.model.line</field>
+            <field name="inherit_id" ref="account.view_model_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="credit" position="replace">
+                </field>
+            </field>
+        </record>
+
+        <record id="view_model_line_tree_amount_2" model="ir.ui.view">
+            <field name="name">account.model.line.tree.amount.2</field>
+            <field name="model">account.model.line</field>
+            <field name="inherit_id" ref="account.view_model_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="debit" position="replace">
+                    <field name="value_type"/>
+                    <field name="amount"/>
+                    <field name="account_tax_id"/> 
+                </field>
+            </field>
+        </record>
+
+        <record id="view_model_line_form_amount_1" model="ir.ui.view">
+            <field name="name">account.model.line.form.amount.1</field>
+            <field name="model">account.model.line</field>
+            <field name="inherit_id" ref="account.view_model_line_form"/>
+            <field name="arch" type="xml">
+                <field name="credit" position="replace">
+                </field>
+            </field>
+        </record>
+
+        <record id="view_model_line_form_amount_2" model="ir.ui.view">
+            <field name="name">account.model.line.form.amount.2</field>
+            <field name="model">account.model.line</field>
+            <field name="inherit_id" ref="account.view_model_line_form"/>
+            <field name="arch" type="xml">
+                <field name="debit" position="replace">
+                    <field name="value_type"/>
+                    <field name="amount"/>
+                    <field name="account_tax_id"/>
+                </field>
+            </field>
+        </record>
+
+        <menuitem
+            action="account.action_model_form" name="Recurring Models" id="menu_action_recurring_model_form" sequence="5" parent="account.menu_finance_entries" groups="base.group_extended"/>
+        <menuitem name="Create Entries from Model" action="account.action_view_account_use_model" id="menu_action_manual_recurring" sequence="10" parent="account.menu_finance_entries"/>
+
+    </data>
+</openerp>

=== added directory 'account_recurring_model/i18n'
=== added file 'account_recurring_model/i18n/it.po'
--- account_recurring_model/i18n/it.po	1970-01-01 00:00:00 +0000
+++ account_recurring_model/i18n/it.po	2011-09-03 19:18:23 +0000
@@ -0,0 +1,141 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_recurring_model
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-09-03 15:29+0000\n"
+"PO-Revision-Date: 2011-09-03 15:29+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_recurring_model
+#: code:addons/account_recurring_model/account_model.py:107
+#: code:addons/account_recurring_model/account_model.py:186
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr "E' necessario definire un giornale analitico sul sezionale '%s'!"
+
+#. module: account_recurring_model
+#: selection:account.model.line,type:0
+msgid "Debit"
+msgstr "Dare"
+
+#. module: account_recurring_model
+#: model:ir.ui.menu,name:account_recurring_model.menu_action_manual_recurring
+msgid "Create Entries from Model"
+msgstr "Crea registrazioni da causale"
+
+#. module: account_recurring_model
+#: field:account.model.line,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account_recurring_model
+#: selection:account.model.line,value_type:0
+msgid "Percentage"
+msgstr "Percentuale"
+
+#. module: account_recurring_model
+#: code:addons/account_recurring_model/account_model.py:119
+#, python-format
+msgid "Error !"
+msgstr "Errore !"
+
+#. module: account_recurring_model
+#: model:ir.module.module,description:account_recurring_model.module_meta_information
+msgid "Account Recurring Models (Improvements)"
+msgstr "Account Recurring Models (Improvements)"
+
+#. module: account_recurring_model
+#: code:addons/account_recurring_model/account_model.py:119
+#, python-format
+msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n"
+"Please define partner on it!"
+msgstr "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n"
+"Please define partner on it!"
+
+#. module: account_recurring_model
+#: model:ir.ui.menu,name:account_recurring_model.menu_action_recurring_model_form
+msgid "Recurring Models"
+msgstr "Modelli Causale"
+
+#. module: account_recurring_model
+#: model:ir.model,name:account_recurring_model.model_account_model
+msgid "Account Model"
+msgstr "Modello Causale"
+
+#. module: account_recurring_model
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+msgstr "Errato valore per il credito od il debito nel modello (uno dei due deve essere \"0\") !"
+
+#. module: account_recurring_model
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+msgstr "Valore del credito o debito  errato (credito+debito deve essere maggiore di \"0\")!"
+
+#. module: account_recurring_model
+#: model:ir.model,name:account_recurring_model.model_account_model_line
+msgid "Account Model Entries"
+msgstr "Voci Modello Causale"
+
+#. module: account_recurring_model
+#: selection:account.model.line,type:0
+msgid "Credit"
+msgstr "Avere"
+
+#. module: account_recurring_model
+#: field:account.model,amount:0
+#: field:account.model.line,amount:0
+#: selection:account.model.line,value_type:0
+msgid "Amount"
+msgstr "Importo"
+
+#. module: account_recurring_model
+#: model:ir.model,name:account_recurring_model.model_account_use_model
+msgid "Use model"
+msgstr "Usa il modello"
+
+#. module: account_recurring_model
+#: model:ir.module.module,shortdesc:account_recurring_model.module_meta_information
+msgid "Account Recurring Models"
+msgstr "Account Recurring Models"
+
+#. module: account_recurring_model
+#: code:addons/account_recurring_model/account_model.py:91
+#: code:addons/account_recurring_model/account_model.py:174
+#, python-format
+msgid "Unable to find a valid period !"
+msgstr "Impossibile trovare un periodo valido!"
+
+#. module: account_recurring_model
+#: field:account.model.line,value_type:0
+msgid "Value Type"
+msgstr "Tipo Valore"
+
+#. module: account_recurring_model
+#: code:addons/account_recurring_model/account_model.py:107
+#: code:addons/account_recurring_model/account_model.py:186
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "No Analytic Journal !"
+
+#. module: account_recurring_model
+#: field:account.model.line,account_tax_id:0
+msgid "Tax"
+msgstr "Tassa"
+
+#. module: account_recurring_model
+#: code:addons/account_recurring_model/account_model.py:91
+#: code:addons/account_recurring_model/account_model.py:174
+#, python-format
+msgid "No period found !"
+msgstr "No period found !"
+