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

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
=== modified file 'sync_client/ir_model_data.py'
--- sync_client/ir_model_data.py 2014-08-27 14:39:56 +0000
+++ sync_client/ir_model_data.py 2014-12-02 13:18:14 +0000
@@ -110,6 +110,10 @@
110 (hasattr(obj._inherit, '__iter__') or self.pool.get(obj._inherit)._table == obj._table):110 (hasattr(obj._inherit, '__iter__') or self.pool.get(obj._inherit)._table == obj._table):
111 continue111 continue
112112
113 # Ignore SQL view records UF-2542
114 if not getattr(obj, '_auto', True):
115 continue
116
113 # get all records for the object117 # get all records for the object
114 cr.execute("""\118 cr.execute("""\
115 SELECT distinct r.id119 SELECT distinct r.id
116120
=== modified file 'sync_common/common.py'
--- sync_common/common.py 2014-11-20 16:46:23 +0000
+++ sync_common/common.py 2014-12-02 13:18:14 +0000
@@ -81,7 +81,7 @@
81 'base%',81 'base%',
82 'board%',82 'board%',
83 'audittrail%',83 'audittrail%',
84 #'workflow%',84 'workflow%',
85 ]85 ]
8686
87def __compile_models_to_ignore():87def __compile_models_to_ignore():

Subscribers

People subscribed via source and target branches

to all changes: