1
=== modified file 'purchase/purchase.py'
2
--- purchase/purchase.py	2012-10-09 12:16:14 +0000
3
+++ purchase/purchase.py	2012-11-19 09:33:24 +0000
4
@@ -88,12 +88,15 @@
5
88
    def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):
88
    def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):
6
89
        res = {}
89
        res = {}
7
90
        for purchase in self.browse(cursor, user, ids, context=context):
90
        for purchase in self.browse(cursor, user, ids, context=context):
8
91
            if purchase.invoiced:
9
92
                res[purchase.id] = 100.0
10
93
                continue
11
91
            tot = 0.0
94
            tot = 0.0
12
92
            for invoice in purchase.invoice_ids:
95
            for invoice in purchase.invoice_ids:
13
93
                if invoice.state not in ('draft','cancel'):
96
                if invoice.state not in ('draft','cancel'):
14
94
                    tot += invoice.amount_untaxed
97
                    tot += invoice.amount_untaxed
17
95
            if purchase.amount_untaxed:
98
            if tot:
18
96
                res[purchase.id] = tot * 100.0 / purchase.amount_untaxed
99
                res[purchase.id] = tot * 100.0 / purchase.amount_untaxed 
19
97
            else:
100
            else:
20
98
                res[purchase.id] = 0.0
101
                res[purchase.id] = 0.0
21
99
        return res
102
        return res
22
@@ -135,10 +138,13 @@
23
135
    def _invoiced(self, cursor, user, ids, name, arg, context=None):
138
    def _invoiced(self, cursor, user, ids, name, arg, context=None):
24
136
        res = {}
139
        res = {}
25
137
        for purchase in self.browse(cursor, user, ids, context=context):
140
        for purchase in self.browse(cursor, user, ids, context=context):
30
138
            invoiced = False
141
            res[purchase.id] = False
31
139
            if purchase.invoiced_rate == 100.00:
142
            for invoice in purchase.invoice_ids:
32
140
                invoiced = True
143
                if invoice.state!='cancel':
33
141
            res[purchase.id] = invoiced
144
                    res[purchase.id] = True
34
145
                    if invoice.state != 'paid':
35
146
                        res[purchase.id] = False
36
147
                        break
37
142
        return res
148
        return res
38
143
149
39
144
    STATE_SELECTION = [
150
    STATE_SELECTION = [
Status:	Needs review
Proposed branch:	lp:~openerp-dev/openobject-addons/6.1-opw-575216-skh
Merge into:	lp:openobject-addons/6.1
Diff against target:	39 lines (+12/-6) 1 file modified purchase/purchase.py (+12/-6)
To merge this branch:	bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-575216-skh
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Naresh(OpenERP)		2012-05-30	Pending
Review via email: mp+107919@code.launchpad.net