OpenERP-USA Localization

Merge lp:~serpentcs/openerp-usa/fix-voucher_lines_amount_calc into lp:openerp-usa/6.0

  1. fix-voucher_lines_amount_calc
  2. Merge into openerp-usa-6.0
Proposed by Serpent Consulting Services
Status: Merged
Merged at revision: 130
Proposed branch: lp:~serpentcs/openerp-usa/fix-voucher_lines_amount_calc
Merge into: lp:openerp-usa/6.0
Diff against target: 38 lines (+5/-2)
3 files modified
account_voucher_credits_us/Change Log.txt (+3/-0)
account_voucher_credits_us/__openerp__.py (+1/-1)
account_voucher_credits_us/voucher.py (+1/-1)
To merge this branch: bzr merge lp:~serpentcs/openerp-usa/fix-voucher_lines_amount_calc
Reviewer Review Type Date Requested Status
Novapoint Group (community) Approve
npg Pending
Review via email: mp+201001@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Novapoint Group (npg-team) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_voucher_credits_us/Change Log.txt'
2--- account_voucher_credits_us/Change Log.txt 2014-01-07 15:52:13 +0000
3+++ account_voucher_credits_us/Change Log.txt 2014-01-09 12:38:26 +0000
4@@ -1,6 +1,9 @@
5 ===============================================================================
6 Version Change Log (account_voucher_credits_us)
7 ===============================================================================
8+1.28 2014-01-09 by Serpent Consulting Services Pvt. Ltd.
9+ * Voucher line should consider unpaid, discounts and credits used.
10+
11 1.27 2014-01-07 by Serpent Consulting Services Pvt. Ltd.
12 * Made the customer payment o2m non editable.
13
14
15=== modified file 'account_voucher_credits_us/__openerp__.py'
16--- account_voucher_credits_us/__openerp__.py 2014-01-07 15:52:13 +0000
17+++ account_voucher_credits_us/__openerp__.py 2014-01-09 12:38:26 +0000
18@@ -22,7 +22,7 @@
19
20 {
21 "name": "Voucher modifications for US",
22- "version": "1.27",
23+ "version": "1.28",
24 "author": 'NovaPoint Group LLC',
25 "description": """
26 This module will add new functionality to better manage credits and how and when they apply to Sales Payments.
27
28=== modified file 'account_voucher_credits_us/voucher.py'
29--- account_voucher_credits_us/voucher.py 2013-07-30 18:33:52 +0000
30+++ account_voucher_credits_us/voucher.py 2014-01-09 12:38:26 +0000
31@@ -974,7 +974,7 @@
32 voucher_line = self.browse(cr, uid, ids[0], context=context)
33 else:
34 voucher_line = self.browse(cr, uid, ids, context=context)
35- self.write(cr, uid, ids, {'pay': True, 'amount': voucher_line.amount_unreconciled - voucher_line.discount_used},context=context)
36+ self.write(cr, uid, ids, {'pay': True, 'amount': voucher_line.amount_unreconciled - voucher_line.discount_used - (voucher_line.credit_used or 0.0)},context=context)
37 self.pool.get('account.voucher').calc_diff(cr, uid, [voucher_line.voucher_id.id])
38 return True
39

Subscribers

People subscribed via source and target branches