Unifield Server

Merge lp:~julie-w/unifield-server/US-4593 into lp:unifield-server

  1. US-4593
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5037
Proposed branch: lp:~julie-w/unifield-server/US-4593
Merge into: lp:unifield-server
Diff against target: 38 lines (+3/-3)
3 files modified
bin/addons/account_override/account.py (+1/-1)
bin/addons/analytic_distribution/analytic_line.py (+1/-1)
bin/addons/sync_client/update.py (+1/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-4593
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+349134@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/account_override/account.py'
2--- bin/addons/account_override/account.py 2018-04-03 10:18:51 +0000
3+++ bin/addons/account_override/account.py 2018-07-09 08:36:03 +0000
4@@ -797,7 +797,7 @@
5 return self.pool.get('account.journal').get_journal_type(cr, uid, context)
6
7 _columns = {
8- 'name': fields.char('Entry Sequence', size=64, required=True),
9+ 'name': fields.char('Entry Sequence', size=64, required=True, select=True),
10 'statement_line_ids': fields.many2many('account.bank.statement.line', 'account_bank_statement_line_move_rel', 'statement_id', 'move_id',
11 string="Statement lines", help="This field give all statement lines linked to this move."),
12 'ref': fields.char('Reference', size=64, readonly=True, states={'draft':[('readonly',False)]}),
13
14=== modified file 'bin/addons/analytic_distribution/analytic_line.py'
15--- bin/addons/analytic_distribution/analytic_line.py 2018-05-28 10:19:58 +0000
16+++ bin/addons/analytic_distribution/analytic_line.py 2018-07-09 08:36:03 +0000
17@@ -221,7 +221,7 @@
18 'move_state': fields.related('move_id', 'move_id', 'state', type='selection', size=64, relation="account.move.line", selection=[('draft', 'Unposted'), ('posted', 'Posted')], string='Journal Entry state', readonly=True, help="Indicates that this line come from an Unposted Journal Entry."),
19 'journal_type': fields.related('journal_id', 'type', type='selection', selection=_journal_type_get, string="Journal Type", readonly=True, \
20 help="Indicates the Journal Type of the Analytic journal item"),
21- 'entry_sequence': fields.function(_get_entry_sequence, method=True, type='text', string="Entry Sequence", readonly=True, store=True),
22+ 'entry_sequence': fields.function(_get_entry_sequence, method=True, type='text', string="Entry Sequence", readonly=True, store=True, select=True),
23 'period_id': fields.function(_get_period_id, fnct_search=_search_period_id, method=True, string="Period", readonly=True, type="many2one", relation="account.period", store=False),
24 'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', type='many2one', relation='account.fiscalyear', string='Fiscal Year', store=False),
25 'from_commitment_line': fields.function(_get_from_commitment_line, method=True, type='boolean', string="Commitment?"),
26
27=== modified file 'bin/addons/sync_client/update.py'
28--- bin/addons/sync_client/update.py 2018-05-17 08:28:31 +0000
29+++ bin/addons/sync_client/update.py 2018-07-09 08:36:03 +0000
30@@ -158,7 +158,7 @@
31 'version' : fields.integer('Version', readonly=True),
32 'fancy_version' : fields.function(fancy_integer, method=True, string="Version", type='char', readonly=True),
33 'rule_id' : fields.many2one('sync.client.rule','Generating Rule', readonly=True, ondelete="set null"),
34- 'sdref' : fields.char('SD ref', size=128, readonly=True, required=True),
35+ 'sdref' : fields.char('SD ref', size=128, readonly=True, required=True, select=True),
36 'fields':fields.text('Fields', size=128, readonly=True),
37 'fieldsvalues': fields.function(fv_formatter.fmt, method=True, type='char'),
38 'is_deleted' : fields.boolean('Is deleted?', readonly=True, select=True),

Subscribers

People subscribed via source and target branches