Unifield Server

Merge lp:~jfb-tempo-consulting/unifield-server/US-4481 into lp:unifield-server

  1. US-4481
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4857
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-4481
Merge into: lp:unifield-server
Diff against target: 55 lines (+15/-1)
3 files modified
bin/addons/msf_profile/data/patches.xml (+5/-0)
bin/addons/msf_profile/msf_profile.py (+7/-0)
bin/addons/sync_client/monitor.py (+3/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-4481
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+343622@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_profile/data/patches.xml'
2--- bin/addons/msf_profile/data/patches.xml 2018-04-03 08:08:50 +0000
3+++ bin/addons/msf_profile/data/patches.xml 2018-04-19 14:23:12 +0000
4@@ -1,6 +1,11 @@
5 <?xml version="1.0" encoding="utf-8" ?>
6 <openerp>
7 <data>
8+ <!-- UF9.0 -->
9+ <record id="us_4481_monitor_set_null_size" model="patch.scripts">
10+ <field name="method">us_4481_monitor_set_null_size</field>
11+ </record>
12+
13 <!-- UF8.1 -->
14 <record id="us-4454" model="patch.scripts">
15 <field name="method">cancel_extra_empty_draft_po</field>
16
17=== modified file 'bin/addons/msf_profile/msf_profile.py'
18--- bin/addons/msf_profile/msf_profile.py 2018-04-09 08:22:12 +0000
19+++ bin/addons/msf_profile/msf_profile.py 2018-04-19 14:23:12 +0000
20@@ -51,6 +51,13 @@
21 'model': lambda *a: 'patch.scripts',
22 }
23
24+ # UF9.0
25+ def us_4481_monitor_set_null_size(self,cr, uid, *a, **b):
26+ if self.pool.get('sync.version.instance.monitor'):
27+ cr.execute('update sync_version_instance_monitor set cloud_size=0 where cloud_size is null')
28+ cr.execute('update sync_version_instance_monitor set backup_size=0 where backup_size is null')
29+ return True
30+
31 # UF8.1
32 def cancel_extra_empty_draft_po(self, cr, uid, *a, **b):
33 rule_obj = self.pool.get('sync.client.message_rule')
34
35=== modified file 'bin/addons/sync_client/monitor.py'
36--- bin/addons/sync_client/monitor.py 2018-02-22 14:23:17 +0000
37+++ bin/addons/sync_client/monitor.py 2018-04-19 14:23:12 +0000
38@@ -359,7 +359,7 @@
39 return self.get_path_disk_usage(cr, uid, unifield_path)
40
41 _columns = {
42- 'instance_id': fields.many2one('msf.instance', 'Instance', select=1),
43+ 'instance_id': fields.many2one('msf.instance', 'Instance', select=1, m2o_order='code'),
44 'my_instance': fields.function(_get_my_instance, method=True, type='boolean', fnct_search=_search_my_instance, string="My Instance"),
45 'version': fields.char(size=128, string='Version', readonly=True),
46 'backup_path': fields.char('Backup Location', size=128),
47@@ -383,6 +383,8 @@
48 _defaults = {
49 'backup_date' : fields.datetime.now,
50 'instance_id': _get_default_instance_id,
51+ 'cloud_size': 0,
52+ 'backup_size': 0,
53 }
54
55 _sql_constraints = [

Subscribers

People subscribed via source and target branches