unifield-wm

Merge lp:~unifield-team/unifield-wm/UF_2181 into lp:unifield-wm

  1. UF_2181
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 1836
Proposed branch: lp:~unifield-team/unifield-wm/UF_2181
Merge into: lp:unifield-wm
Diff against target: 77 lines (+6/-6)
5 files modified
account_corrections/wizard/analytic_distribution_wizard.py (+1/-1)
account_journal/account_journal.py (+2/-2)
analytic_distribution/analytic_line.py (+1/-1)
analytic_distribution_invoice/account_invoice_refund.py (+1/-1)
msf_doc_import/account.py (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/UF_2181
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+193947@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 'account_corrections/wizard/analytic_distribution_wizard.py'
2--- account_corrections/wizard/analytic_distribution_wizard.py 2013-10-14 13:01:42 +0000
3+++ account_corrections/wizard/analytic_distribution_wizard.py 2013-11-05 16:07:28 +0000
4@@ -122,7 +122,7 @@
5 ml = wizard.move_line_id
6 orig_date = ml.source_date or ml.date
7 orig_document_date = ml.document_date
8- correction_journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type', '=', 'correction')])
9+ correction_journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type', '=', 'correction'), ('is_current_instance', '=', True)])
10 correction_journal_id = correction_journal_ids and correction_journal_ids[0] or False
11 if not correction_journal_id:
12 raise osv.except_osv(_('Error'), _('No analytic journal found for corrections!'))
13
14=== modified file 'account_journal/account_journal.py'
15--- account_journal/account_journal.py 2013-05-24 15:44:30 +0000
16+++ account_journal/account_journal.py 2013-11-05 16:07:28 +0000
17@@ -61,19 +61,19 @@
18 ('correction','Correction'),
19 ('cur_adj', 'Currency Adjustement'),
20 ('depreciation', 'Depreciation'),
21- ('extra', 'OD-Extra Accounting'),
22 ('general', 'General'),
23 ('hq', 'HQ'),
24 ('hr', 'HR'),
25 ('inkind', 'In-kind Donation'),
26 ('intermission', 'Intermission'),
27+ ('migration', 'Migration'),
28+ ('extra', 'OD-Extra Accounting'),
29 ('situation', 'Opening/Closing Situation'),
30 ('purchase', 'Purchase'),
31 ('purchase_refund','Purchase Refund'),
32 ('sale', 'Sale'),
33 ('sale_refund','Sale Refund'),
34 ('stock', 'Stock'),
35- ('migration', 'Migration'),
36 ]
37
38 _columns = {
39
40=== modified file 'analytic_distribution/analytic_line.py'
41--- analytic_distribution/analytic_line.py 2013-10-31 13:55:38 +0000
42+++ analytic_distribution/analytic_line.py 2013-11-05 16:07:28 +0000
43@@ -301,7 +301,7 @@
44 # Prepare some value
45 account = self.pool.get('account.analytic.account').browse(cr, uid, [account_id], context)[0]
46 context.update({'from': 'mass_reallocation'}) # this permits reallocation to be accepted when rewrite analaytic lines
47- correction_journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type', '=', 'correction')])
48+ correction_journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type', '=', 'correction'), ('is_current_instance', '=', True)])
49 correction_journal_id = correction_journal_ids and correction_journal_ids[0] or False
50 if not correction_journal_id:
51 raise osv.except_osv(_('Error'), _('No analytic journal found for corrections!'))
52
53=== modified file 'analytic_distribution_invoice/account_invoice_refund.py'
54--- analytic_distribution_invoice/account_invoice_refund.py 2013-03-26 17:07:53 +0000
55+++ analytic_distribution_invoice/account_invoice_refund.py 2013-11-05 16:07:28 +0000
56@@ -44,7 +44,7 @@
57 args = [('type', '=', 'purchase_refund')]
58 if user.company_id.instance_id:
59 args.append(('is_current_instance','=',True))
60- journal = obj_journal.search(cr, uid, [('type', '=', 'purchase_refund')])
61+ journal = obj_journal.search(cr, uid, [('type', '=', 'purchase_refund'), ('is_current_instance', '=', True)])
62 return journal and journal[0] or False
63
64 def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
65
66=== modified file 'msf_doc_import/account.py'
67--- msf_doc_import/account.py 2013-10-03 12:44:06 +0000
68+++ msf_doc_import/account.py 2013-11-05 16:07:28 +0000
69@@ -60,7 +60,7 @@
70 if not context:
71 context = {}
72 # Prepare some values
73- journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'migration')])
74+ journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'migration'), ('is_current_instance', '=', True)])
75 if not journal_ids:
76 raise osv.except_osv(_('Warning'), _('No migration journal found!'))
77 journal_id = journal_ids[0]

Subscribers

People subscribed via source and target branches