OpenERP-USA Localization

Merge lp:~serpentcs/openerp-usa/imp-account_voucher_credits_us into lp:openerp-usa/6.0

  1. imp-account_voucher_credits_us
  2. Merge into openerp-usa-6.0
Proposed by Serpent Consulting Services
Status: Merged
Merged at revision: 128
Proposed branch: lp:~serpentcs/openerp-usa/imp-account_voucher_credits_us
Merge into: lp:openerp-usa/6.0
Diff against target: 75 lines (+10/-5)
4 files modified
account_voucher_credits_us/Change Log.txt (+3/-0)
account_voucher_credits_us/__openerp__.py (+1/-1)
account_voucher_credits_us/voucher_payment_receipt_view.xml (+1/-1)
account_voucher_credits_us/voucher_view.xml (+5/-3)
To merge this branch: bzr merge lp:~serpentcs/openerp-usa/imp-account_voucher_credits_us
Reviewer Review Type Date Requested Status
Novapoint Group (community) Approve
npg Pending
Review via email: mp+200684@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 2012-09-04 18:10:13 +0000
3+++ account_voucher_credits_us/Change Log.txt 2014-01-07 15:55:48 +0000
4@@ -1,6 +1,9 @@
5 ===============================================================================
6 Version Change Log (account_voucher_credits_us)
7 ===============================================================================
8+1.27 2014-01-07 by Serpent Consulting Services Pvt. Ltd.
9+ * Made the customer payment o2m non editable.
10+
11 1.26 2012-09-04 by Rima
12 * Fixed AttributeError: "Field 'has_attr' does not exist in object 'browse_record(account.voucher.line, )'"
13
14
15=== modified file 'account_voucher_credits_us/__openerp__.py'
16--- account_voucher_credits_us/__openerp__.py 2012-09-04 18:10:13 +0000
17+++ account_voucher_credits_us/__openerp__.py 2014-01-07 15:55:48 +0000
18@@ -22,7 +22,7 @@
19
20 {
21 "name": "Voucher modifications for US",
22- "version": "1.26",
23+ "version": "1.27",
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_payment_receipt_view.xml'
29--- account_voucher_credits_us/voucher_payment_receipt_view.xml 2013-09-30 22:55:55 +0000
30+++ account_voucher_credits_us/voucher_payment_receipt_view.xml 2014-01-07 15:55:48 +0000
31@@ -45,7 +45,7 @@
32
33 <xpath expr="/form/notebook/page[@string='Payment Information']/field[@name='line_cr_ids']" position="replace">
34 <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" string="Payment Modification">
35- <tree string="Invoices and Outstanding Transactions" editable="bottom">
36+ <tree string="Invoices and Outstanding Transactions">
37 <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
38 on_change="onchange_move_line_id(move_line_id)"
39 domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
40
41=== modified file 'account_voucher_credits_us/voucher_view.xml'
42--- account_voucher_credits_us/voucher_view.xml 2013-10-01 16:07:25 +0000
43+++ account_voucher_credits_us/voucher_view.xml 2014-01-07 15:55:48 +0000
44@@ -45,7 +45,7 @@
45
46 <xpath expr="/form/notebook/page[@string='Payment Information']/field[@name='line_cr_ids']" position="replace">
47 <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" string="Payment Modification">
48- <tree string="Invoices and Outstanding Transactions" editable="bottom">
49+ <tree string="Invoices and Outstanding Transactions">
50 <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
51 on_change="onchange_move_line_id(move_line_id)"
52 domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
53@@ -74,10 +74,12 @@
54 <newline/>
55 <field name="date_original" readonly="True"/>
56 </group>
57-
58 <group color="red" colspan="2" cols="2" >
59 <field name="amount_original"/>
60 <newline/>
61+ <field name="pay" on_change="onchange_supp_pay(amount, pay, amount_unreconciled, [], parent.amount,
62+ credit_used, discount_used, writeoff_amount)"/>
63+ <newline/>
64 <field name="amount_unreconciled"/>
65 <newline/>
66 <field name='amount' />
67@@ -100,7 +102,7 @@
68 <field name='account_analytic_id' readonly="1"/>
69 <field name='date_due' readonly="1"/>
70 <field name='company_id' readonly="1"/>
71- <field name='pay' on_change="onchange_pay(amount, pay, amount_unreconciled, parent.line_cr_ids, parent.amount, credit_used, discount_used, writeoff_amount)"/>
72+<!-- <field name='pay' on_change="onchange_pay(amount, pay, amount_unreconciled, parent.line_cr_ids, parent.amount, credit_used, discount_used, writeoff_amount)"/-->
73 </page>
74 </notebook>
75 <group colspan="1" cols="1">

Subscribers

People subscribed via source and target branches