unifield-wm

Merge lp:~jfb-tempo-consulting/unifield-wm/sync_uf_2542 into lp:unifield-wm/sync

  1. sync_uf_2542
  2. Merge into sync_module_prod
Proposed by jftempo
Status: Merged
Merged at revision: 526
Proposed branch: lp:~jfb-tempo-consulting/unifield-wm/sync_uf_2542
Merge into: lp:unifield-wm/sync
Diff against target: 27 lines (+5/-1)
2 files modified
sync_client/ir_model_data.py (+4/-0)
sync_common/common.py (+1/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-wm/sync_uf_2542
Reviewer Review Type Date Requested Status
UniField Sync Reviewer Pending
Review via email: mp+243392@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 'sync_client/ir_model_data.py'
2--- sync_client/ir_model_data.py 2014-08-27 14:39:56 +0000
3+++ sync_client/ir_model_data.py 2014-12-02 13:18:14 +0000
4@@ -110,6 +110,10 @@
5 (hasattr(obj._inherit, '__iter__') or self.pool.get(obj._inherit)._table == obj._table):
6 continue
7
8+ # Ignore SQL view records UF-2542
9+ if not getattr(obj, '_auto', True):
10+ continue
11+
12 # get all records for the object
13 cr.execute("""\
14 SELECT distinct r.id
15
16=== modified file 'sync_common/common.py'
17--- sync_common/common.py 2014-11-20 16:46:23 +0000
18+++ sync_common/common.py 2014-12-02 13:18:14 +0000
19@@ -81,7 +81,7 @@
20 'base%',
21 'board%',
22 'audittrail%',
23- #'workflow%',
24+ 'workflow%',
25 ]
26
27 def __compile_models_to_ignore():

Subscribers

People subscribed via source and target branches

to all changes: