Merge lp:~vauxoo/addons-vauxoo/7.0-contract_enterprise_license-dev_sabrina into lp:addons-vauxoo/7.0

[Sabrina Romero - http://www.vauxoo.com]

Some improvements added for handling date range in licenses.

[Nhomar - Vauxoo (nhomar)]

The message should be:

Fix problems with constraints on deates for contracts, and added demos and test yaml to verify it doesn't happen again.

[lp:~vauxoo/addons-vauxoo/7.0-contract_enterprise_license-dev_sabrina]

1059. By Sabrina Romero - http://www.vauxoo.com on 2014-06-20

[FIX] Fix problems with constraints on dates for contracts, demo data added and yaml test to verify it doesn't happen again.

[Sabrina Romero - http://www.vauxoo.com (sabrina)]

@Nhomar,

Done!

[Julio Serna-http://www.vauxoo.com (hearthebreaker)]

review: Approve

[Nhomar - Vauxoo (nhomar)]

2014-06-20 15:02 GMT-05:00 Julio Serna-http://www.vauxoo.com <
<email address hidden>>:

> Review: Approve
>

LGTM.

@Julio ejecutas el merge.
@sabri mandas a producción por favor.

--
--------------------
Saludos Cordiales

Nhomar G. Hernandez M.
[phone]
Skype: nhomar00
Web-Blog: http://geronimo.com.ve
Servicios IT: http://vauxoo.com
Linux-Counter: 467724
Correos:
<email address hidden>
<email address hidden>
twitter @nhomar

=== modified file 'contract_enterprise_openerp/__openerp__.py'
--- contract_enterprise_openerp/__openerp__.py	2014-05-09 21:51:34 +0000
+++ contract_enterprise_openerp/__openerp__.py	2014-06-20 18:32:42 +0000
@@ -51,10 +51,16 @@
     """,
     "website": "http://vauxoo.com",
     "category": "Contracts",
+    "demo": [
+        'demo/demo_account_analytic_account.xml',
+    ],
     "data": [
         'security/ir.model.access.csv',
         'view/account_analytic_analysis_view.xml',
     ],
+    "test": [
+        'test/contract_enterprise_license.yml'
+    ],
     "active": False,
     "installable": True,
 }

=== added directory 'contract_enterprise_openerp/demo'
=== added file 'contract_enterprise_openerp/demo/demo_account_analytic_account.xml'
--- contract_enterprise_openerp/demo/demo_account_analytic_account.xml	1970-01-01 00:00:00 +0000
+++ contract_enterprise_openerp/demo/demo_account_analytic_account.xml	2014-06-20 18:32:42 +0000
@@ -0,0 +1,53 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data noupdate="1">
+		<record id="account_analytic_account_enterprise_license_0" model="account.analytic.account">
+			<field name="code">AATEST</field>
+			<field eval="100.0" name="quantity_max"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="1" name="use_tasks"/>
+			<field name="date_start">2006-06-20</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="state">open</field>
+			<field name="manager_id" ref="base.user_root"/>
+			<field eval="1" name="license_oerp"/>
+			<field name="type">contract</field>
+			<field name="date">2008-06-21</field>
+			<field name="name">Test Enterprise License For Contract</field>
+			<field name="vx_contract_code">R82ODY1K4XAF</field>
+		</record>
+		<record id="account_warranty_oerp_0" model="account.warranty_oerp">
+			<field name="enterprise_key">AKEY</field>
+			<field name="start_date">2006-06-20</field>
+			<field name="end_date">2007-06-20</field>
+            <field name="contract_id" ref="account_analytic_account_enterprise_license_0"/>
+		</record>
+		<record id="account_warranty_oerp_1" model="account.warranty_oerp">
+            <field name="enterprise_key">BKEY</field>
+			<field name="start_date">2007-06-21</field>
+			<field name="end_date">2008-06-21</field>
+            <field name="contract_id" ref="account_analytic_account_enterprise_license_0"/>
+		</record>
+		<record id="account_analytic_account_enterprise_license_1" model="account.analytic.account">
+			<field name="code">AATEST2</field>
+			<field eval="100.0" name="quantity_max"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="1" name="use_tasks"/>
+			<field name="date_start">2006-06-20</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="state">open</field>
+			<field name="manager_id" ref="base.user_root"/>
+			<field eval="1" name="license_oerp"/>
+			<field name="type">contract</field>
+			<field name="date">2008-06-21</field>
+			<field name="name">Test Enterprise License For Contract</field>
+			<field name="vx_contract_code">R82ODY1K4XAZ</field>
+		</record>
+		<record id="account_warranty_oerp_2" model="account.warranty_oerp">
+			<field name="enterprise_key">CKEY</field>
+			<field name="start_date">2006-06-20</field>
+			<field name="end_date">2007-06-20</field>
+            <field name="contract_id" ref="account_analytic_account_enterprise_license_1"/>
+		</record>
+	</data>
+</openerp>

=== modified file 'contract_enterprise_openerp/model/account_analytic_analysis.py'
--- contract_enterprise_openerp/model/account_analytic_analysis.py	2014-05-09 21:51:34 +0000
+++ contract_enterprise_openerp/model/account_analytic_analysis.py	2014-06-20 18:32:42 +0000
@@ -43,8 +43,9 @@
             return False
         pids = self.search(cr, uid,
                            [('end_date', '>=', obj_warranty.start_date),
-                          ('start_date', '<=', obj_warranty.end_date),
-                               ('id', '<>', obj_warranty.id)])
+                                ('start_date','<=', obj_warranty.end_date),
+                                ('contract_id', '=', obj_warranty.contract_id.id),
+                                ('id', '<>', obj_warranty.id),])
         if len(pids) > 0:
             return False
         return True

=== added directory 'contract_enterprise_openerp/test'
=== added file 'contract_enterprise_openerp/test/contract_enterprise_license.yml'
--- contract_enterprise_openerp/test/contract_enterprise_license.yml	1970-01-01 00:00:00 +0000
+++ contract_enterprise_openerp/test/contract_enterprise_license.yml	2014-06-20 18:32:42 +0000
@@ -0,0 +1,24 @@
+-
+  To test contract enterprise module constraint.
+- 
+  I check that Initially contract state is "Open".
+-
+  !assert {model: account.analytic.account, id: account_analytic_account_enterprise_license_0}:
+    - state == 'open'
+-
+  I add to the contract a new warranty.
+-
+  !python {model: account.warranty_oerp}: |
+    import netsvc, tools, os, base64
+    import traceback
+    from openerp.osv.orm import except_orm
+    from tools.misc import mute_logger
+    
+    log('Error controlled, constraint limits allowed date range.')
+    try:
+        with mute_logger('openerp.tools.yaml_import'):
+            self.create(cr, uid, {'start_date':'2008-06-20','end_date':'2009-06-20','enterprise_key': 'Test-key-error','contract_id': ref("account_analytic_account_enterprise_license_0")})
+    except except_orm:
+        error = tools.ustr(traceback.format_exc())
+        test_ok = True
+    assert test_ok, "Test failed."