Merge lp:~vauxoo/addons-vauxoo/6.1-account_rent_dev_luist into lp:addons-vauxoo/6.1

[Luis Torres - http://www.vauxoo.com]

Se mergeo la opción de contratos

=== modified file 'account_analytic_analysis_rent/__init__.py'
--- account_analytic_analysis_rent/__init__.py	2013-06-03 17:04:02 +0000
+++ account_analytic_analysis_rent/__init__.py	2014-02-11 23:05:08 +0000
@@ -1,3 +1,4 @@
 import account_analytic_account_rent
 import product
 import report
+import wizard

=== modified file 'account_analytic_analysis_rent/__openerp__.py'
--- account_analytic_analysis_rent/__openerp__.py	2013-06-03 17:04:02 +0000
+++ account_analytic_analysis_rent/__openerp__.py	2014-02-11 23:05:08 +0000
@@ -24,12 +24,16 @@
     'name' : "Account Analytic Account Rent",
     'category' : "account_analytic",
     'version' : "1.0",
-    'depends' : ['account_analytic_analysis','product'],
+    'depends' : ['account_analytic_analysis','product','account_voucher'],
     'author' : "Vauxoo",
     'description' : """
         This module added product in account_analytic_analysis to product control
         """,
-    'data' : ['account_analytic_account_rent.xml','product_view.xml','account_analytic_analysis_report.xml'],
+    'data' : ['account_analytic_account_rent.xml',
+        'product_view.xml',
+        'account_analytic_analysis_report.xml',
+        'wizard/lines_invoice_create_view.xml',
+        ],
     'installable': True,
     'auto_install': False,
 }

=== modified file 'account_analytic_analysis_rent/account_analytic_account_rent.py'
--- account_analytic_analysis_rent/account_analytic_account_rent.py	2013-06-03 17:04:02 +0000
+++ account_analytic_analysis_rent/account_analytic_account_rent.py	2014-02-11 23:05:08 +0000
@@ -22,12 +22,158 @@
 from openerp.osv import osv, fields
 from datetime import datetime, timedelta
 from tools.translate import _
+from datetime import datetime, timedelta
+from dateutil.relativedelta import relativedelta
+
+class analytic_term(osv.osv):
+    _name='analytic.term'
+    
+    _columns={
+        'name': fields.char('Term',size=64,required=True),
+        'no_term': fields.integer('No Term')
+    }
+
+class account_analytic_product(osv.osv):
+    _name='account.analytic.product'
+    
+
+    def onchange_prodlot(self, cr , uid, ids, prodlot_id, context=None):
+        if context==None:
+            context={}
+        res={}
+        if prodlot_id:
+            prodlot_obj=self.pool.get('stock.production.lot')
+            if prodlot_obj.browse(cr, uid, prodlot_id, context=context).stock_available < 0:
+                res={'value':{'prodlot_id': False },'warning':{
+                'title': _('This product is already rented  !'),
+                'message': _('This product is already rented,check serial number.')
+            }}
+        return res
+        
+    def onchange_product_id(self, cr, uid, ids, product_id, context=None):
+        res={}
+        list=[]
+        if context==None:
+            context={}
+        if product_id:
+            product_obj=self.pool.get('product.product')
+            for prod in product_obj.browse(cr, uid, [product_id], context):
+                type='rent'
+                if prod.accesory_ok:
+                    type='accesory'
+                list_data = [{'name':feature.name.id} for feature in prod.feature_ids]
+            res={'value':{'type': type, }}
+        return res
+    
+    _columns={
+        'product_id':fields.many2one('product.product','Product', required=True, domain=['|', ('rent_ok','=',True), ('accesory_ok','=',True) ]),
+        'type': fields.selection([('rent','Rent'),('accesory','Accesory')],'Type'),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production", select=True),
+        'analytic_id':fields.many2one('account.analytic.account','Account Analytic')
+    }
+
+class account_analytic_line(osv.osv):
+    _inherit='account.analytic.line'
+    _order='product_id'
+    
+    def _check_inv(self, cr, uid, ids, vals):
+        select = ids
+        if isinstance(select, (int, long)):
+            select = [ids]
+        if ( not vals.has_key('invoice_id')) or vals['invoice_id' ] == False:
+            for line in self.browse(cr, uid, select):
+                if line.invoice_id and 'account_id' not in vals:
+                    raise osv.except_osv(_('Error !'),
+                        _('You cannot modify an invoiced analytic lines!'))
+        return True
+    
+    def onchange_copys(self, cr, uid, id, w_start, w_end, context=None):
+        res={}
+        if context==None:
+            context={}
+        return {'value':{'unit_amount': w_end - w_start} }
+    
+    _columns={
+        'w_start': fields.integer('Inicial'),
+        'w_end': fields.integer('Final'),
+        'feature_id': fields.many2one('product.feature.line','Feature'),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production", select=True),
+    }
+
+
+class account_invoice_line(osv.osv):
+    _inherit='account.invoice.line'
+    
+    _columns={
+        'w_start': fields.integer('Inicial'),
+        'w_end': fields.integer('Final'),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production", select=True),
+    }
+account_invoice_line()
+    
 
 class account_analytic_account(osv.osv):
     _inherit='account.analytic.account'
     
+    def onchange_product_lines(self, cr, uid, ids, product_ids, feature_ids, context=None):
+        res={}
+        list_feature=[]
+        if context==None:
+            context={}
+        if product_ids:
+            product_obj=self.pool.get('product.product')
+            for prod in product_ids:
+                if prod[2]['product_id']:
+                    for feature in product_obj.browse(cr, uid, prod[2]['product_id'], context=context).feature_ids:
+                        list_feature.append({'name': feature.name and feature.name.id or False, 'product_line_id':prod[2]['product_id'],'counter':feature.counter or False, 'prodlot_feature_id' : prod[2]['prodlot_id']})
+        return {'value':{'feature_ids': [(0, 6, data) for data in list_feature]}}
+
+    def _get_journal(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        type_inv = context.get('type', 'out_invoice')
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        company_id = context.get('company_id', user.company_id.id)
+        type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale_refund', 'in_refund': 'purchase_refund'}
+        journal_obj = self.pool.get('account.journal')
+        res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'sale')),
+                                            ('company_id', '=', company_id)],
+                                                limit=1)
+        return res and res[0] or False
+    
+    def _compute_lines(self, cr, uid, ids, name, args, context=None):
+        result = {}
+        for contract in self.browse(cr, uid, ids, context=context):
+            src = []
+            lines = []
+            for line in contract.line_ids:
+                if line.invoice_id:
+                    if line.invoice_id.state=='paid':
+                        for l in line.invoice_id.payment_ids:
+                            if l.id not in lines:
+                                lines.append(l.id)
+            result[contract.id] = lines
+        return result
+        
+    def _compute_lines_inv(self, cr, uid, ids, name, args, context=None):
+        result = {}
+        for contract in self.browse(cr, uid, ids, context=context):
+            src = []
+            lines = []
+            for line in contract.line_ids:
+                if line.invoice_id and line.invoice_id.id not in lines:
+                    lines.append(line.invoice_id.id)
+            result[contract.id]=lines
+        return result
+    
     _columns={
-        'product_id':fields.many2one('product.product','Product', domain=[('rent','=',False), ('rent_ok','=',True)]),
+        'product_ids':fields.one2many('account.analytic.product','analytic_id', 'Products'),
+        'term_id': fields.many2one('analytic.term','Term', required=True),
+        'voucher_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'),
+        'invoice_ids': fields.function(_compute_lines_inv, relation='account.invoice', type="many2many", string='Invoice'),
+        'group_product': fields.boolean('Group Product'),
+        'journal_id':fields.many2one('account.journal','Journal', required=True),
+        'feature_ids': fields.one2many('product.feature.line', 'analytic_id', 'Features')
     }
     
     def set_close(self, cr, uid, ids, context=None):
@@ -37,10 +183,16 @@
         product_obj=self.pool.get('product.product')
         ware_id=warehouse_obj.search(cr, uid, [], context=context)[0]
         warehouse=warehouse_obj.browse(cr ,uid, ware_id, context=context)
+        location = self.pool.get('stock.location').search(cr, uid, [('usage', '=', 'customer')], context=context)
+        if location:
+            location=location[0]
+        else:
+            raise osv.except_osv(_('Error!'),  _('You not have a configured client location'))
         for contract in self.browse(cr, uid , ids , context=context):
-            picking_id=picking_obj.create(cr, uid, {'origin':contract.name, 'address_id':contract.contact_id.id,'date':contract.date_start,'type':'in'}, context=context)
-            move_obj.create(cr, uid, {'name':contract.product_id.name,'product_id':contract.product_id.id,'product_qty':1,'picking_id':picking_id,'product_uom':contract.product_id.uom_id.id,'location_id':warehouse.lot_output_id.id,'location_dest_id':warehouse.lot_input_id.id}, context=context)
-            product_obj.write(cr, uid, contract.product_id.id, {'rent':False, 'contract_id': False}, context=context)
+            picking_id=picking_obj.create(cr, uid, {'origin':contract.name or False, 'address_id': contract.contact_id and contract.contact_id.id or False,'date':contract.date_start or False,'type':'in'}, context=context)
+            for prod in contract.product_ids:
+                move_obj.create(cr, uid, {'name':prod.product_id.name,'product_id':prod.product_id.id,'product_qty':1,'picking_id':picking_id,'product_uom':prod.product_id.uom_id.id,'location_id':location,'location_dest_id': warehouse.lot_input_id and warehouse.lot_input_id.id or False, 'prodlot_id': prod.prodlot_id and prod.prodlot_id.id or 1}, context=context)
+                product_obj.write(cr, uid, prod.product_id.id, {'rent':False, 'contract_id': False}, context=context)
         return super(account_analytic_account, self).set_close(cr, uid, ids, context=context)
     
     def set_open(self, cr, uid, ids, context=None):
@@ -48,17 +200,45 @@
         move_obj=self.pool.get('stock.move')
         warehouse_obj=self.pool.get('stock.warehouse')
         product_obj=self.pool.get('product.product')
+        line_obj=self.pool.get('account.analytic.line')
         ware_id=warehouse_obj.search(cr, uid, [], context=context)[0]
         warehouse=warehouse_obj.browse(cr ,uid, ware_id, context=context)
         
         for contract in self.browse(cr, uid , ids , context=context):
-            picking_id=picking_obj.create(cr, uid, {'origin':contract.name, 'address_id':contract.contact_id.id,'date':contract.date_start,'type':'out'}, context=context)
-            move_obj.create(cr, uid, {'name':contract.product_id.name,'product_id':contract.product_id.id,'product_qty':1,'picking_id':picking_id,'product_uom':contract.product_id.uom_id.id,'location_id':warehouse.lot_stock_id.id,'location_dest_id':warehouse.lot_output_id.id}, context=context)
-            product_obj.write(cr, uid, contract.product_id.id, {'rent':True,'contract_id':contract.id}, context=context)
+            date_invoice=contract.date_start
+            #~ date_invoice=datetime.strptime(contract.date_start, "%Y-%m-%d")
+            picking_id=picking_obj.create(cr, uid, {'origin':contract.name, 'address_id': contract.contact_id and contract.contact_id.id or False,'date':contract.date_start,'type':'out'}, context=context)
+            for prod in contract.product_ids:
+                move_obj.create(cr, uid, {'name':prod.product_id.name,'product_id':prod.product_id.id,'product_qty':1,'picking_id':picking_id,'product_uom':prod.product_id.uom_id.id,'location_id': warehouse.lot_stock_id and warehouse.lot_stock_id.id or False,'location_dest_id': warehouse.lot_output_id and warehouse.lot_output_id.id or False, 'prodlot_id': prod.prodlot_id and prod.prodlot_id.id or 1}, context=context)
+            for line in range(0,contract.term_id.no_term):
+                for prod in contract.product_ids:
+                    a = prod.product_id.product_tmpl_id.property_account_income.id
+                    if not a:
+                        a = prod.product_id.categ_id.property_account_income_categ.id
+                    for feature in contract.feature_ids:
+                        if feature.product_line_id.id==prod.product_id.id:
+                            line_obj.create(cr, uid, {'date':date_invoice,'name':feature.name and feature.name.name or False,'product_id':prod.product_id.id,'product_uom_id':prod.product_id.uom_id.id,'general_account_id':a,'to_invoice':1,'account_id': contract and contract.id or False,'journal_id': contract.journal_id and contract.journal_id.analytic_journal_id and contract.journal_id.analytic_journal_id.id or False,'amount': feature and feature.cost or False, 'feature_id':feature and feature.id or False, 'prodlot_id': prod.prodlot_id and prod.prodlot_id.id or 1},context=context)
+                    product_obj.write(cr, uid, prod.product_id.id, {'rent':True,'contract_id': contract and contract.id or False}, context=context)
+                date_invoice=(datetime.strptime(date_invoice, "%Y-%m-%d") + relativedelta(months=1)).strftime("%Y-%m-%d")
         return super(account_analytic_account, self).set_open(cr, uid, ids, context=context)
     
+    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
+        journal_obj = self.pool.get('account.journal')
+        if context is None:
+            context = {}
+        res = super(account_analytic_account,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
+        type = 'sale'
+        for field in res['fields']:
+            if field == 'journal_id' and type:
+                journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)
+                res['fields'][field]['selection'] = journal_select
+
+        return res
+    
     _defaults = {
         'state': 'draft',
+        'group_product': True,
+        'journal_id': _get_journal,
     }
 account_analytic_account()
     
@@ -77,5 +257,14 @@
         res['product']=line.product_id.id
         return res
 hr_timesheet_invoice_create()
-        
-
+
+
+class stock_production_lot(osv.osv):
+    _inherit='stock.production.lot'
+
+    def name_get(self, cr, uid, ids, context=None):
+        if ids and ids[0] == False:
+            ids=[]
+        return super(stock_production_lot, self).name_get(
+            cr, uid, ids, context=context)
+stock_production_lot()

=== modified file 'account_analytic_analysis_rent/account_analytic_account_rent.xml'
--- account_analytic_analysis_rent/account_analytic_account_rent.xml	2013-06-03 17:04:02 +0000
+++ account_analytic_analysis_rent/account_analytic_account_rent.xml	2014-02-11 23:05:08 +0000
@@ -10,11 +10,172 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Product">
-                        <field name="product_id"/>
-                    </page>
-                </notebook>
-            </field>
-    </record>
+                        <field name="product_ids" on_change="onchange_product_lines(product_ids, feature_ids)" nolabel="1">
+                            <tree string="products" editable="top">
+                                <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                                <field name="prodlot_id" 
+                                context="{'product_id':product_id}"
+                                domain="[('product_id','=?',product_id)]"
+                                on_change="onchange_prodlot(prodlot_id)"/>
+                                <field name="type"/>
+                            </tree>
+                            <form string="products">
+                                <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                                <field name="prodlot_id" 
+                                context="{'product_id':product_id}"
+                                domain="[('product_id','=?',product_id)]"
+                                on_change="onchange_prodlot(prodlot_id)"/>
+                                <field name="type"/>
+                            </form>
+                        </field>
+                        <newline/>
+                        <field name="feature_ids" nolabel="1">
+                            <tree string='Features' editable="top">
+                                <field name="product_line_id"/>
+                                <field name="name"/>
+                                <field name="counter"/>
+                                <field name="cost"/>
+                                <field name="prodlot_feature_id" invisible = '1'/>
+                            </tree>
+                            <form string='Features'>
+                                <field name="product_line_id"/>
+                                <field name="name"/>
+                                <field name="counter"/>
+                                <field name="cost"/>
+                            </form>
+                        </field>
+                    </page>
+                </notebook>
+            </field>
+    </record>
+    
+    <record model="ir.ui.view" id="account_analytic_analysis_invoice_page">
+        <field name="name">account.analytic.analysis.invoice.page</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">
+                <notebook position="inside">
+                    <page string="Invoice">
+                        <field name="invoice_ids" nolabel="1"/>
+                    </page>
+                </notebook>
+            </field>
+    </record>
+    
+    <record model="ir.ui.view" id="account_analytic_analysis_payments">
+        <field name="name">account.analytic.analysis.payments</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">
+                <notebook position="inside">
+                    <page string="Payments">
+                        <field name="voucher_ids" nolabel="1"/>
+                    </page>
+                </notebook>
+            </field>
+    </record>
+    
+    
+    <record id="view_analytic_term_tree" model="ir.ui.view">
+        <field name="name">view.analytic.term.tree</field>
+        <field name="model">analytic.term</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Analytic Term">
+                <field name="name"/>
+                <field name="no_term"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record id="view_analytic_term_form" model="ir.ui.view">
+        <field name="name">view.analytic.term.form</field>
+        <field name="model">analytic.term</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Analytic Term">
+                <field name="name"/>
+                <field name="no_term"/>
+            </form>
+        </field>
+    </record>
+    
+    <record model="ir.actions.act_window" id="analytic_term_action">
+        <field name="name">Analytic Term</field>
+        <field name="res_model">analytic.term</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem id="analytic_contract" name="Contract" parent="base.menu_sale_config_sales"/>
+    <menuitem action="analytic_term_action" id="analytic_term_action_menu" parent="analytic_contract"/>
+    
+    
+    <record model="ir.ui.view" id="account_analytic_analysis_term_contract">
+        <field name="name">account.analytic.analysis.term.contract</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="quantity_max" position="after">
+                        <field name="term_id"/>
+                    </field>
+            </field>
+    </record>
+    
+    <record model="ir.ui.view" id="account_analytic_analysis_journal_contract">
+        <field name="name">account.analytic.analysis.journal.contract</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="user_id" position="after">
+                        <field name="journal_id" widget="selection"/>
+                    </field>
+            </field>
+    </record>
+
+    <record model="ir.ui.view" id="account_analytic_analysis_group_prod">
+        <field name="name">account.analytic.analysis.group.prod</field>
+        <field name="model">account.analytic.account</field>
+            <field name="type">form</field> 
+            <field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
+            <field name="arch" type="xml">
+                    <field name="amount_invoiced" position="after">
+                        <field name="group_product"/>
+                    </field>
+            </field>
+    </record>
+    
+    
+    <record model="ir.ui.view" id="account_analytic_line_product_visible">
+        <field name="name">account.analytic.line.product.visible</field>
+        <field name="model">account.analytic.line</field>
+            <field name="type">form</field> 
+            <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="product_id" position="replace">
+                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" />
+                </field>
+            </field>
+    </record>
+
+    <record model="ir.ui.view" id="account_invoice_line_write">
+        <field name="name">account.invoice.line_write</field>
+        <field name="model">account.invoice.line</field>
+            <field name="type">form</field> 
+            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="name" position="after">
+                    <field name="product_id" />
+                    <field name="prodlot_id" />
+                    <field name="w_start" />
+                    <field name="w_end" />
+                </field>
+            </field>
+    </record>
+
 
     </data>
 </openerp>

=== modified file 'account_analytic_analysis_rent/product.py'
--- account_analytic_analysis_rent/product.py	2013-06-03 17:04:02 +0000
+++ account_analytic_analysis_rent/product.py	2014-02-11 23:05:08 +0000
@@ -22,15 +22,54 @@
 from openerp.osv import osv, fields
 from datetime import datetime, timedelta
 from tools.translate import _
+import decimal_precision as dp
 
 class product_template(osv.osv):
     _inherit='product.template'
     
+    
+    
     _columns={
         'rent_ok':fields.boolean('Rentable'),
+        'accesory_ok':fields.boolean('Accesory'),
         'rent': fields.boolean('Rent', readonly=True),
-        'contract_id': fields.many2one('account.analytic.account', 'Contract', readonly=True)
+        'contract_id': fields.many2one('account.analytic.account', 'Contract', readonly=True),
     }
     
 product_template()
-     
+
+class product_product(osv.osv):
+    _inherit='product.product'
+    
+    _columns={
+        'feature_ids': fields.one2many('product.feature.line', 'product_id', 'Features')
+    }
+    
+product_product()
+
+class product_feature(osv.osv):
+    _name='product.feature'
+    
+    _columns={
+        'name':fields.char('Name', size=64, required=True),
+        'description':fields.char('Description', size=256),
+    }
+    
+product_feature()
+
+class product_feature_line(osv.osv):
+    _name='product.feature.line'
+    _order='product_id'
+    _columns={
+        'name':fields.many2one('product.feature', 'Feature', required=True),
+        'product_id':fields.many2one('product.product','Product'),
+        'product_line_id':fields.many2one('product.product','Product'),
+        'counter':fields.integer('Counter'),
+        'analytic_id':fields.many2one('account.analytic.account','Product'),
+        'cost':fields.float('cost', digits_compute=dp.get_precision('Account')),
+        'prodlot_feature_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production", select=True),
+    }
+    
+product_feature_line()
+
+

=== modified file 'account_analytic_analysis_rent/product_view.xml'
--- account_analytic_analysis_rent/product_view.xml	2013-06-03 17:04:02 +0000
+++ account_analytic_analysis_rent/product_view.xml	2014-02-11 23:05:08 +0000
@@ -3,19 +3,42 @@
     <data>
 
     <record model="ir.ui.view" id="product_rentable">
-        <field name="name">product_rentable</field>
+        <field name="name">product.rentable</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="purchase_ok" position="after">
                     <field name="rent_ok"/>
+                    <field name="accesory_ok"/>
                 </field>
             </field>
     </record>
     
+    <record model="ir.ui.view" id="product_feature_product">
+        <field name="name">product.feature.product</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">
+                <group name="misc" position="after">
+                    <group name="Features" colspan="2">
+                        <separator colspan="4" string='Features'/>
+                        <field name="feature_ids" nolabel="1">
+                            <tree string='Features'>
+                                <field name="name"/>
+                            </tree>
+                            <form string='Features'>
+                                <field name="name"/>
+                            </form>
+                        </field>
+                    </group>
+                </group>
+            </field>
+    </record>
+    
     <record model="ir.ui.view" id="product_rent">
-        <field name="name">product_rent</field>
+        <field name="name">product.rent</field>
         <field name="model">product.product</field>
             <field name="type">form</field> 
             <field name="inherit_id" ref="product.product_normal_form_view"/>
@@ -49,5 +72,48 @@
 
     <menuitem action="product_rent_action" id="product_rent_action_menu" parent="base.menu_sales"/>
     
+    <record model="ir.actions.act_window" id="product_accesory_action">
+        <field name="name">Accesory Product</field>
+        <field name="res_model">product.product</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('accesory_ok','=',True)]</field>
+    </record>
+
+    <menuitem action="product_accesory_action" id="product_accesory_action_menu" parent="base.menu_sales"/>
+    
+    <record id="view_feature_product_tree" model="ir.ui.view">
+        <field name="name">view.feature.product.tree</field>
+        <field name="model">product.feature</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Features">
+                <field name="name"/>
+                <field name="description"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record id="view_feature_product_form" model="ir.ui.view">
+        <field name="name">view.feature.product.form</field>
+        <field name="model">product.feature</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Features">
+                <field name="name"/>
+                <field name="description"/>
+            </form>
+        </field>
+    </record>
+    
+    <record model="ir.actions.act_window" id="product_feature_action">
+        <field name="name">Features</field>
+        <field name="res_model">product.feature</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem id="product_feature" name="Features" parent="base.menu_sale_config_sales"/>
+    <menuitem action="product_feature_action" id="product_feature_action_menu" parent="product_feature"/>
+    
     </data>
 </openerp>

=== added directory 'account_analytic_analysis_rent/wizard'
=== added file 'account_analytic_analysis_rent/wizard/__init__.py'
--- account_analytic_analysis_rent/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_analysis_rent/wizard/__init__.py	2014-02-11 23:05:08 +0000
@@ -0,0 +1,1 @@
+import lines_invoice_create 

=== added file 'account_analytic_analysis_rent/wizard/lines_invoice_create.py'
--- account_analytic_analysis_rent/wizard/lines_invoice_create.py	1970-01-01 00:00:00 +0000
+++ account_analytic_analysis_rent/wizard/lines_invoice_create.py	2014-02-11 23:05:08 +0000
@@ -0,0 +1,268 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 time
+from datetime import datetime
+from osv import osv, fields
+from tools.translate import _
+
+## Create an invoice based on selected timesheet lines
+#
+
+class account_analytic_line(osv.osv):
+    _inherit = "account.analytic.line"
+
+    #
+    # data = {
+    #   'date': boolean
+    #   'time': boolean
+    #   'name': boolean
+    #   'price': boolean
+    #   'product': many2one id
+    # }
+    def invoice_cost_create(self, cr, uid, ids, data={}, context=None):
+        analytic_account_obj = self.pool.get('account.analytic.account')
+        res_partner_obj = self.pool.get('res.partner')
+        account_payment_term_obj = self.pool.get('account.payment.term')
+        invoice_obj = self.pool.get('account.invoice')
+        product_obj = self.pool.get('product.product')
+        invoice_factor_obj = self.pool.get('hr_timesheet_invoice.factor')
+        pro_price_obj = self.pool.get('product.pricelist')
+        fiscal_pos_obj = self.pool.get('account.fiscal.position')
+        product_uom_obj = self.pool.get('product.uom')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        feature_line_obj = self.pool.get('product.feature.line')
+        invoices = []
+        if context is None:
+            context = {}
+
+        account_ids = {}
+        for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
+            account_ids[line.account_id.id] = True
+
+        account_ids = account_ids.keys() #data['accounts']
+        for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
+            partner = account.partner_id
+            if (not partner) or not (account.pricelist_id):
+                raise osv.except_osv(_('Analytic Account incomplete'),
+                        _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s') % (account.name,))
+
+            if not partner.address:
+                raise osv.except_osv(_('Partner incomplete'),
+                        _('Please fill in the Address field in the Partner: %s.') % (partner.name,))
+
+            date_due = False
+            if partner.property_payment_term:
+                pterm_list= account_payment_term_obj.compute(cr, uid,
+                        partner.property_payment_term.id, value=1,
+                        date_ref=time.strftime('%Y-%m-%d'))
+                if pterm_list:
+                    pterm_list = [line[0] for line in pterm_list]
+                    pterm_list.sort()
+                    date_due = pterm_list[-1]
+            curr_invoice = {
+                'name': time.strftime('%d/%m/%Y')+' - '+account.name,
+                'partner_id': account.partner_id.id,
+                'address_contact_id': res_partner_obj.address_get(cr, uid,
+                    [account.partner_id.id], adr_pref=['contact'])['contact'],
+                'address_invoice_id': res_partner_obj.address_get(cr, uid,
+                    [account.partner_id.id], adr_pref=['invoice'])['invoice'],
+                'payment_term': partner.property_payment_term.id or False,
+                'account_id': partner.property_account_receivable.id,
+                'currency_id': account.pricelist_id.currency_id.id,
+                'date_due': date_due,
+                'fiscal_position': account.partner_id.property_account_position.id,
+                'type':'out_invoice',
+                'journal_id':account.journal_id.id
+            }
+            last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context)
+            invoices.append(last_invoice)
+            context2 = context.copy()
+            context2['lang'] = partner.lang
+            cr.execute("SELECT product_id, to_invoice, unit_amount, product_uom_id, w_start, w_end, name, amount, feature_id, prodlot_id " \
+                    "FROM account_analytic_line as line " \
+                    "WHERE account_id = %s " \
+                        "AND id IN %s AND to_invoice IS NOT NULL " , (account.id, tuple(ids),))
+
+            for product_id, factor_id, qty, uom, w_start, w_end, name, amount, feature_id, prodlot_id in cr.fetchall():
+                product = product_obj.browse(cr, uid, product_id, context2)
+                if not product:
+                    raise osv.except_osv(_('Error'), _('At least one line has no product !'))
+                factor_name = ''
+                factor = invoice_factor_obj.browse(cr, uid, factor_id, context2)
+
+                ctx =  context.copy()
+                ctx.update({'uom':uom})
+                if account.pricelist_id:
+                    pl = account.pricelist_id.id
+                    price = pro_price_obj.price_get(cr,uid,[pl], product_id or data.get('product', False), qty or 1.0, account.partner_id.id, context=ctx)[pl]
+                else:
+                    price = 0.0
+
+                taxes = product.taxes_id
+                tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+                account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
+                if not account_id:
+                    raise osv.except_osv(_("Configuration Error"), _("No income account defined for product '%s'") % product.name)
+                curr_line = {
+                    'price_unit': amount or price,
+                    'quantity': qty,
+                    'discount':factor.factor,
+                    'invoice_line_tax_id': [(6,0,tax )],
+                    'invoice_id': last_invoice,
+                    'name': name,
+                    'product_id': product_id or data.get('product',product_id),
+                    'invoice_line_tax_id': [(6,0,tax)],
+                    'uos_id': uom,
+                    'account_id': account_id,
+                    'account_analytic_id': account.id,
+                    'w_start': int(w_start or 0),
+                    'w_end': int(w_end or 0),
+                    'prodlot_id': prodlot_id,
+                }
+                feature_line_obj.write(cr, uid, feature_id, {'counter': int(w_end or 0)}, context=context)
+                #
+                # Compute for lines
+                #
+                cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(ids), product_id, factor_id))
+
+                line_ids = cr.dictfetchall()
+                note = []
+                for line in line_ids:
+                    # set invoice_line_note
+                    details = []
+                    if data.get('date', False):
+                        details.append(line['date'])
+                    if data.get('time', False):
+                        if line['product_uom_id']:
+                            details.append("%s %s" % (line['unit_amount'], product_uom_obj.browse(cr, uid, [line['product_uom_id']],context2)[0].name))
+                        else:
+                            details.append("%s" % (line['unit_amount'], ))
+                    if data.get('name', False):
+                        details.append(line['name'])
+                    note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
+
+                curr_line['note'] = "\n".join(map(lambda x: unicode(x) or '',note))
+                invoice_line_obj.create(cr, uid, curr_line, context=context)
+                cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s", (last_invoice, account.id, tuple(ids)))
+
+            invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
+        return invoices
+
+class lines_create(osv.osv_memory):
+
+    _name = 'lines.create'
+    _columns = {
+        'month': fields.selection([('1','January'), ('2','February'),
+            ('3','March'), ('4','April'), ('5','May'), ('6','June'),
+            ('7','July'), ('8','August'), ('9','September'), ('10','October'),
+            ('11','November'), ('12','December')], 'Month'),
+        'line_ids': fields.many2many('account.analytic.line','analytic_wiz_lines_rel','wiz_id','line_id','lines'),
+        'contract_id': fields.many2one('account.analytic.account','Contract')
+        #~ 'time': fields.boolean('Time spent', help='The time of each work done will be displayed on the invoice'),
+        #~ 'name': fields.boolean('Description', help='The detail of each work done will be displayed on the invoice'),
+        #~ 'price': fields.boolean('Cost', help='The cost of each work done will be displayed on the invoice. You probably don\'t want to check this'),
+        #~ 'product': fields.many2one('product.product', 'Product', help='Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        res = super(lines_create, self).default_get(
+            cr, uid, fields, context=context)
+        analytic_obj = self.pool.get('account.analytic.account')
+        product_obj = self.pool.get('product.product')
+        line_obj = self.pool.get('account.analytic.line')
+        lines_ids=[]
+        if context.get('active_model') == 'account.analytic.account':
+            res['contract_id']=context.get('active_id')
+            res['month']=str(datetime.strptime(datetime.now().strftime('%Y-%m-%d'), "%Y-%m-%d").month)
+            for contract in analytic_obj.browse(cr,uid,context['active_ids'],context):
+                lines_ids=[]
+                for line in contract.line_ids:
+                    if not line.invoice_id and line.to_invoice:
+                        date_line=datetime.strptime(line.date, "%Y-%m-%d")
+                        #~ date=datetime.strptime(datetime.now().strftime('%Y-%m-%d'), "%Y-%m-%d")
+                        if date_line.month==res['month']:
+                            lines_ids.append(line.id)
+            res['line_ids']=lines_ids
+        return res
+
+    def onchange_date(self, cr, uid, ids, month, contract_id, context=None):
+        if context is None:
+            context = {}
+        res={}
+        analytic_obj = self.pool.get('account.analytic.account')
+        line_obj = self.pool.get('account.analytic.line')
+        lines_ids=[]
+        for contract in analytic_obj.browse(cr,uid,[contract_id],context):
+            lines_ids=[]
+            for line in contract.line_ids:
+                if not line.invoice_id and line.to_invoice:
+                    date_line=datetime.strptime(line.date, "%Y-%m-%d")
+                    #~ date_new=datetime.strptime(month, "%Y-%m-%d")
+                    if str(month)==str(date_line.month):
+                        for feature in contract.feature_ids:
+                                if feature.id==line.feature_id.id:
+                                    line_obj.write(cr, uid, line.id, {'w_start':feature.counter}, context=context)
+                        lines_ids.append(line.id)
+        res['value']={'line_ids':lines_ids}
+        return res
+        
+
+
+    def do_create(self, cr, uid, ids, context=None):
+        analytic_obj = self.pool.get('account.analytic.account')
+        data = self.read(cr, uid, ids, [], context=context)[0]
+        if context.get('active_model') == 'account.analytic.account':
+            invs=[]
+            for contract in analytic_obj.browse(cr,uid,context['active_ids'],context):
+                new_lines=[]
+                for prod in contract.product_ids:
+                    lines_ids=[]
+                    for line in contract.line_ids:
+                        if not line.invoice_id and line.to_invoice and line.product_id.id==prod.product_id.id and prod.type=='rent':
+                            date_line=datetime.strptime(line.date, "%Y-%m-%d")
+                            #~ date=datetime.strptime(data['date'], "%Y-%m-%d")
+                            if str(date_line.month)==data['month']:
+                                lines_ids.append(line.id)
+                    if not lines_ids and prod.type=='rent':
+                        raise osv.except_osv(_('Warning !'), _("Invoice is already linked to some of the analytic line(s)!"))
+                    if contract.group_product and prod.type=='rent':
+                        new_lines=new_lines + lines_ids
+                    elif not contract.group_product and prod.type=='rent':
+                        invs.append(self.pool.get('account.analytic.line').invoice_cost_create(cr, uid, lines_ids, {}, context=context))
+                if contract.group_product:
+                    invs.append(self.pool.get('account.analytic.line').invoice_cost_create(cr, uid, new_lines, {}, context=context))
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        mod_ids = mod_obj.search(cr, uid, [('name', '=', 'action_invoice_tree1')], context=context)[0]
+        res_id = mod_obj.read(cr, uid, mod_ids, ['res_id'], context=context)['res_id']
+        act_win = act_obj.read(cr, uid, res_id, [], context=context)
+        act_win['domain'] = [('id','in',invs),('type','=','out_invoice')]
+        act_win['name'] = _('Invoices')
+        return act_win
+
+
+lines_create()
+
+
+

=== added file 'account_analytic_analysis_rent/wizard/lines_invoice_create_view.xml'
--- account_analytic_analysis_rent/wizard/lines_invoice_create_view.xml	1970-01-01 00:00:00 +0000
+++ account_analytic_analysis_rent/wizard/lines_invoice_create_view.xml	2014-02-11 23:05:08 +0000
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_lines_create" model="ir.ui.view">
+            <field name="name">lines.create.form</field>
+            <field name="model">lines.create</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Create Invoice">
+                <notebook colspan="4">
+                    <page string="Billing Data">
+                       <group col="4" colspan="4">
+                           <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
+                                <field name="month" on_change="onchange_date(month,contract_id)"/>
+                                <newline/>
+                                <field name="line_ids" nolabel="1" colspan="4">
+                                    <tree editable="top" string="Analytic Entries">
+                                        <field name="date" />
+                                        <field name="ref" />
+                                        <field name="name" />
+                                        <field name="journal_id" />
+                                        <field name="amount" sum="Total" />
+                                        <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" />
+                                        <field name="prodlot_id"/>
+                                        <field name="w_start" on_change="onchange_copys(w_start,w_end)"/>
+                                        <field name="w_end" on_change="onchange_copys(w_start,w_end)" />
+                                        <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity" />
+                                        <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" />
+                                        <field name="general_account_id" />
+                                        <field name="user_id" invisible="1"/>
+
+                                    </tree>
+                                </field>
+                                <field name="contract_id" invisible="1"/>
+                           </group>
+                    </page>
+                </notebook>
+                <separator colspan="4"/>
+                <group col="2" colspan="4">
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="do_create" string="Create Invoices" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
+                </group>
+            </form>
+            </field>
+        </record>
+
+        <record id="lines_invoice_create" model="ir.actions.act_window">
+            <field name="name">Create Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">lines.create</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+    <act_window id="lines_invoice_create_wizard"
+        name="Create Invoice"
+        src_model="account.analytic.account"
+        res_model="lines.create"
+        view_mode="form"
+        target="new"
+        key2="client_action_multi"/>
+
+    </data>
+</openerp>