Merge lp:~domsense/domsense-agilebg-addons/adding_invoice_contract into lp:domsense-agilebg-addons/6.1

[Lorenzo Battistini]

[lp:~domsense/domsense-agilebg-addons/adding_invoice_contract]

243. By Lorenzo Battistini on 2012-08-29

[imp] description

244. By Lorenzo Battistini on 2012-08-29

[imp] faccio sparire il bottone dopo la generazione

245. By Lorenzo Battistini on 2012-08-29

[add] pass the analytic account to invoice

246. By Lorenzo Battistini on 2012-10-09

[add] sale_layout_hour_package

[Lorenzo Battistini (elbati)]

Before merging, we need to analyse analytic_hours_block

review: Needs Fixing

Unmerged revisions

246. By Lorenzo Battistini on 2012-10-09

[add] sale_layout_hour_package

245. By Lorenzo Battistini on 2012-08-29

[add] pass the analytic account to invoice

244. By Lorenzo Battistini on 2012-08-29

[imp] faccio sparire il bottone dopo la generazione

243. By Lorenzo Battistini on 2012-08-29

[imp] description

242. By Lorenzo Battistini on 2012-08-29

[ADD] sale_hour_package
working prototype

241. By Lorenzo Battistini on 2012-08-28

not working changes

240. By Lorenzo Battistini on 2012-08-28

[add] sale_hour_package
not working draft

=== added directory 'sale_hour_package'
=== added file 'sale_hour_package/AUTHORS.txt'
--- sale_hour_package/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ sale_hour_package/AUTHORS.txt	2012-10-09 10:00:45 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'sale_hour_package/__init__.py'
--- sale_hour_package/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_hour_package/__init__.py	2012-10-09 10:00:45 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.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 product
+import sale
+import analytic

=== added file 'sale_hour_package/__openerp__.py'
--- sale_hour_package/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_hour_package/__openerp__.py	2012-10-09 10:00:45 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.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": "Sale hour package",
+    "version": "1.0",
+    'category': 'Generic Modules/Accounting',
+    "depends": ["sale"],
+    "author": "Agile Business Group & Domsense",
+    "description": """
+    Generate hour package contracts from sale orders.
+    
+    If you are selling a product configured as 'hour package', you can generate the 'hour package' analytic account directly from sale order line.
+    In order to do this, you first have to define a 'hour package container' analytic account for the partner you are selling to.
+    
+    """,
+    'website': 'http://www.agilebg.com',
+    'init_xml': [],
+    'update_xml': [
+        'product_view.xml',
+        'analytic_view.xml',
+        'sale_view.xml',
+        ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}

=== added file 'sale_hour_package/analytic.py'
--- sale_hour_package/analytic.py	1970-01-01 00:00:00 +0000
+++ sale_hour_package/analytic.py	2012-10-09 10:00:45 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class analytic_account(osv.osv):
+
+    _inherit = "account.analytic.account"
+    
+    _columns = {
+        'hour_pack_container': fields.boolean('Is hour package container'),
+        }

=== added file 'sale_hour_package/analytic_view.xml'
--- sale_hour_package/analytic_view.xml	1970-01-01 00:00:00 +0000
+++ sale_hour_package/analytic_view.xml	2012-10-09 10:00:45 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        
+        <record model="ir.ui.view" id="view_account_analytic_account_form">
+            <field name="name">account.analytic.account.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <field name="hour_pack_container"></field>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'sale_hour_package/i18n'
=== added file 'sale_hour_package/product.py'
--- sale_hour_package/product.py	1970-01-01 00:00:00 +0000
+++ sale_hour_package/product.py	2012-10-09 10:00:45 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class product_product(osv.osv):
+
+    _inherit = "product.product"
+
+    _columns = {
+        'hour_pack': fields.boolean('Is hour package'),
+        }

=== added file 'sale_hour_package/product_view.xml'
--- sale_hour_package/product_view.xml	1970-01-01 00:00:00 +0000
+++ sale_hour_package/product_view.xml	2012-10-09 10:00:45 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        
+        <record model="ir.ui.view" id="product_normal_form_view">
+            <field name="name">product.normal.form</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <field name="hour_pack" attrs="{'invisible': [('type', '!=', 'service')]}"></field>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'sale_hour_package/sale.py'
--- sale_hour_package/sale.py	1970-01-01 00:00:00 +0000
+++ sale_hour_package/sale.py	2012-10-09 10:00:45 +0000
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class sale_order_line(osv.osv):
+
+    _inherit = "sale.order.line"
+    
+    _columns = {
+        'hour_pack_id': fields.many2one('account.analytic.account','Hour package', readonly=True),
+        'is_hour_pack': fields.related('product_id', 'hour_pack', type='boolean', string='Is hour package', store=True),
+        'order_state': fields.related('order_id', 'state', type='char', size=64, string='Order state', store=True),
+        }
+        
+    def invoice_line_create(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        line_obj = self.pool.get('account.invoice.line')
+        create_ids = super(sale_order_line, self).invoice_line_create(cr, uid, ids, context=context)
+        i = 0
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.hour_pack_id:
+                line_obj.write(cr, uid, [create_ids[i]], {'account_analytic_id': line.hour_pack_id.id})
+            i = i + 1
+        return create_ids
+
+    def generate_hour_pack(self, cr, uid, ids, context=None):
+        anal_acc_pool = self.pool.get('account.analytic.account')
+        for so_line in self.browse(cr, uid, ids, context):
+            parent_ids = anal_acc_pool.search(cr, uid, [
+                ('partner_id','=', so_line.order_id.partner_id.id),
+                ('hour_pack_container', '=', True),
+                ])
+            if not parent_ids:
+                raise osv.except_osv(_('Error'), _('No hour package container (analytic account) defined for partner %s') % so_line.order_id.partner_id.name)
+            if so_line.product_id and so_line.product_id.hour_pack:
+                if so_line.hour_pack_id:
+                    raise osv.except_osv(_('Error'), _('Order line %s has hour package yet. Remove it first') % so_line.name)
+                acc_vals = {
+                    'name': so_line.name + ' ['+so_line.order_id.name+'] '+ str(so_line.product_uom_qty) + ' '+ so_line.product_uom.name,
+                    'partner_id': so_line.order_id.partner_id.id,
+                    'quantity_max': so_line.product_uom_qty,
+                    'parent_id': parent_ids[0],
+                    }
+                acc_id = anal_acc_pool.create(cr, uid, acc_vals, context)
+                so_line.write({'hour_pack_id': acc_id})
+        return True

=== added file 'sale_hour_package/sale_view.xml'
--- sale_hour_package/sale_view.xml	1970-01-01 00:00:00 +0000
+++ sale_hour_package/sale_view.xml	2012-10-09 10:00:45 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        
+        <record model="ir.ui.view" id="view_order_form">
+            <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 name="arch" type="xml">
+                <field name="address_allotment_id" position="after">
+                    <newline/>
+                    <field name="is_hour_pack" readonly="1"/>
+                    <field name="order_state" invisible="1"/>
+                    <button type="object" name="generate_hour_pack" string="Generate hour package" icon="gtk-go-forward" attrs="{'invisible': ['|','|',('is_hour_pack', '=', False),('order_state','in', ['draft', 'cancel']),('hour_pack_id', '!=', False)]}" colspan="2"></button>
+                    <field name="hour_pack_id" />
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'sale_layout_hour_package'
=== added file 'sale_layout_hour_package/AUTHORS.txt'
--- sale_layout_hour_package/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ sale_layout_hour_package/AUTHORS.txt	2012-10-09 10:00:45 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'sale_layout_hour_package/__init__.py'
--- sale_layout_hour_package/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_layout_hour_package/__init__.py	2012-10-09 10:00:45 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.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/>.
+#
+##############################################################################

=== added file 'sale_layout_hour_package/__openerp__.py'
--- sale_layout_hour_package/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_layout_hour_package/__openerp__.py	2012-10-09 10:00:45 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.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": "Sale layout hour package",
+    "version": "1.0",
+    'category': 'Generic Modules/Accounting',
+    "depends": ["sale_layout", "sale_hour_package"],
+    "author": "Agile Business Group & Domsense",
+    "description": """
+Adapting sale_hour_package to sale_layout
+    """,
+    'website': 'http://www.agilebg.com',
+    'init_xml': [],
+    'update_xml': [
+        'sale_view.xml',
+        ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}

=== added directory 'sale_layout_hour_package/i18n'
=== added file 'sale_layout_hour_package/sale_view.xml'
--- sale_layout_hour_package/sale_view.xml	1970-01-01 00:00:00 +0000
+++ sale_layout_hour_package/sale_view.xml	2012-10-09 10:00:45 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        
+        <record model="ir.ui.view" id="view_order_form">
+            <field name="name">sale.order.form</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale_layout.view_order_form_inherit_1"/>
+            <field name="arch" type="xml">
+                <field name="address_allotment_id" position="after">
+                    <newline/>
+                    <field name="is_hour_pack" readonly="1"/>
+                    <field name="order_state" invisible="1"/>
+                    <button type="object" name="generate_hour_pack" string="Generate hour package" icon="gtk-go-forward" attrs="{'invisible': ['|','|',('is_hour_pack', '=', False),('order_state','in', ['draft', 'cancel']),('hour_pack_id', '!=', False)]}" colspan="2"></button>
+                    <field name="hour_pack_id" />
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>