Vauxoo Addons

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

  1. 7.0-contract_enterprise_license-dev_sabrina
  2. Merge into 7.0
Proposed by Sabrina Romero - http://www.vauxoo.com
Status: Merged
Merged at revision: 1059
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-contract_enterprise_license-dev_sabrina
Merge into: lp:addons-vauxoo/7.0
Diff against target: 125 lines (+86/-2)
4 files modified
contract_enterprise_openerp/__openerp__.py (+6/-0)
contract_enterprise_openerp/demo/demo_account_analytic_account.xml (+53/-0)
contract_enterprise_openerp/model/account_analytic_analysis.py (+3/-2)
contract_enterprise_openerp/test/contract_enterprise_license.yml (+24/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-contract_enterprise_license-dev_sabrina
Reviewer Review Type Date Requested Status
Julio Serna-http://www.vauxoo.com Approve
Sabrina Romero - http://www.vauxoo.com Pending
Nhomar - Vauxoo Pending
Review via email: mp+223971@code.launchpad.net

Description of the change

Some improvements added for handling date range in licenses.

To post a comment you must log in.
Revision history for this message
Nhomar - Vauxoo (nhomar) wrote :

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 updated
1059. By Sabrina Romero - http://www.vauxoo.com

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

Revision history for this message
Sabrina Romero - http://www.vauxoo.com (sabrina) wrote :

@Nhomar,

Done!

Revision history for this message
Julio Serna-http://www.vauxoo.com (hearthebreaker) :
review: Approve
Revision history for this message
Nhomar - Vauxoo (nhomar) wrote :

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.
+58-414-4110269
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

Revision history for this message
Nhomar - Vauxoo (nhomar) :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
51 """,51 """,
52 "website": "http://vauxoo.com",52 "website": "http://vauxoo.com",
53 "category": "Contracts",53 "category": "Contracts",
54 "demo": [
55 'demo/demo_account_analytic_account.xml',
56 ],
54 "data": [57 "data": [
55 'security/ir.model.access.csv',58 'security/ir.model.access.csv',
56 'view/account_analytic_analysis_view.xml',59 'view/account_analytic_analysis_view.xml',
57 ],60 ],
61 "test": [
62 'test/contract_enterprise_license.yml'
63 ],
58 "active": False,64 "active": False,
59 "installable": True,65 "installable": True,
60}66}
6167
=== 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 @@
1<?xml version="1.0" ?>
2<openerp>
3 <data noupdate="1">
4 <record id="account_analytic_account_enterprise_license_0" model="account.analytic.account">
5 <field name="code">AATEST</field>
6 <field eval="100.0" name="quantity_max"/>
7 <field name="user_id" ref="base.user_root"/>
8 <field eval="1" name="use_tasks"/>
9 <field name="date_start">2006-06-20</field>
10 <field name="company_id" ref="base.main_company"/>
11 <field name="state">open</field>
12 <field name="manager_id" ref="base.user_root"/>
13 <field eval="1" name="license_oerp"/>
14 <field name="type">contract</field>
15 <field name="date">2008-06-21</field>
16 <field name="name">Test Enterprise License For Contract</field>
17 <field name="vx_contract_code">R82ODY1K4XAF</field>
18 </record>
19 <record id="account_warranty_oerp_0" model="account.warranty_oerp">
20 <field name="enterprise_key">AKEY</field>
21 <field name="start_date">2006-06-20</field>
22 <field name="end_date">2007-06-20</field>
23 <field name="contract_id" ref="account_analytic_account_enterprise_license_0"/>
24 </record>
25 <record id="account_warranty_oerp_1" model="account.warranty_oerp">
26 <field name="enterprise_key">BKEY</field>
27 <field name="start_date">2007-06-21</field>
28 <field name="end_date">2008-06-21</field>
29 <field name="contract_id" ref="account_analytic_account_enterprise_license_0"/>
30 </record>
31 <record id="account_analytic_account_enterprise_license_1" model="account.analytic.account">
32 <field name="code">AATEST2</field>
33 <field eval="100.0" name="quantity_max"/>
34 <field name="user_id" ref="base.user_root"/>
35 <field eval="1" name="use_tasks"/>
36 <field name="date_start">2006-06-20</field>
37 <field name="company_id" ref="base.main_company"/>
38 <field name="state">open</field>
39 <field name="manager_id" ref="base.user_root"/>
40 <field eval="1" name="license_oerp"/>
41 <field name="type">contract</field>
42 <field name="date">2008-06-21</field>
43 <field name="name">Test Enterprise License For Contract</field>
44 <field name="vx_contract_code">R82ODY1K4XAZ</field>
45 </record>
46 <record id="account_warranty_oerp_2" model="account.warranty_oerp">
47 <field name="enterprise_key">CKEY</field>
48 <field name="start_date">2006-06-20</field>
49 <field name="end_date">2007-06-20</field>
50 <field name="contract_id" ref="account_analytic_account_enterprise_license_1"/>
51 </record>
52 </data>
53</openerp>
054
=== 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 @@
43 return False43 return False
44 pids = self.search(cr, uid,44 pids = self.search(cr, uid,
45 [('end_date', '>=', obj_warranty.start_date),45 [('end_date', '>=', obj_warranty.start_date),
46 ('start_date', '<=', obj_warranty.end_date),46 ('start_date','<=', obj_warranty.end_date),
47 ('id', '<>', obj_warranty.id)])47 ('contract_id', '=', obj_warranty.contract_id.id),
48 ('id', '<>', obj_warranty.id),])
48 if len(pids) > 0:49 if len(pids) > 0:
49 return False50 return False
50 return True51 return True
5152
=== 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 @@
1-
2 To test contract enterprise module constraint.
3-
4 I check that Initially contract state is "Open".
5-
6 !assert {model: account.analytic.account, id: account_analytic_account_enterprise_license_0}:
7 - state == 'open'
8-
9 I add to the contract a new warranty.
10-
11 !python {model: account.warranty_oerp}: |
12 import netsvc, tools, os, base64
13 import traceback
14 from openerp.osv.orm import except_orm
15 from tools.misc import mute_logger
16
17 log('Error controlled, constraint limits allowed date range.')
18 try:
19 with mute_logger('openerp.tools.yaml_import'):
20 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")})
21 except except_orm:
22 error = tools.ustr(traceback.format_exc())
23 test_ok = True
24 assert test_ok, "Test failed."