Unifield Server

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

  1. US-3331
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4756
Proposed branch: lp:~julie-w/unifield-server/US-3331
Merge into: lp:unifield-server
Diff against target: 62 lines (+3/-5)
5 files modified
bin/addons/account/wizard/account_invoice_refund.py (+0/-1)
bin/addons/account/wizard/account_invoice_refund_view.xml (+1/-1)
bin/addons/analytic_distribution/account_invoice_refund.py (+0/-1)
bin/addons/analytic_distribution/account_invoice_view.xml (+1/-1)
bin/addons/register_accounting/account_invoice_view.xml (+1/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-3331
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+340168@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/wizard/account_invoice_refund.py'
2--- bin/addons/account/wizard/account_invoice_refund.py 2018-02-08 09:26:32 +0000
3+++ bin/addons/account/wizard/account_invoice_refund.py 2018-03-01 09:44:17 +0000
4@@ -51,7 +51,6 @@
5 return journal and journal[0] or False
6
7 _defaults = {
8- 'date': lambda *a: time.strftime('%Y-%m-%d'),
9 'journal_id': _get_journal,
10 'filter_refund': 'modify',
11 }
12
13=== modified file 'bin/addons/account/wizard/account_invoice_refund_view.xml'
14--- bin/addons/account/wizard/account_invoice_refund_view.xml 2017-11-13 15:34:11 +0000
15+++ bin/addons/account/wizard/account_invoice_refund_view.xml 2018-03-01 09:44:17 +0000
16@@ -12,7 +12,7 @@
17 <group colspan="4" >
18 <field name="description"/>
19 <field name="journal_id"/>
20- <field name="date"/>
21+ <field name="date" required="1"/>
22 <field name="period"/>
23 <field name="filter_refund"/>
24 </group>
25
26=== modified file 'bin/addons/analytic_distribution/account_invoice_refund.py'
27--- bin/addons/analytic_distribution/account_invoice_refund.py 2018-02-05 10:53:45 +0000
28+++ bin/addons/analytic_distribution/account_invoice_refund.py 2018-03-01 09:44:17 +0000
29@@ -87,7 +87,6 @@
30
31 _defaults = {
32 'document_date': _get_document_date,
33- 'date': lambda *a: time.strftime('%Y-%m-%d'),
34 #UTP-961: refund DI: only refund option is available
35 'filter_refund': 'refund',
36 'journal_id': _get_journal, # US-193
37
38=== modified file 'bin/addons/analytic_distribution/account_invoice_view.xml'
39--- bin/addons/analytic_distribution/account_invoice_view.xml 2017-05-19 15:26:08 +0000
40+++ bin/addons/analytic_distribution/account_invoice_view.xml 2018-03-01 09:44:17 +0000
41@@ -139,7 +139,7 @@
42 <field name="period" position="replace"/>
43 <field name="date" position="replace">
44 <field name="document_date"/>
45- <field name="date"/>
46+ <field name="date" required="1"/>
47 </field>
48 </field>
49 </record>
50
51=== modified file 'bin/addons/register_accounting/account_invoice_view.xml'
52--- bin/addons/register_accounting/account_invoice_view.xml 2018-02-13 15:48:51 +0000
53+++ bin/addons/register_accounting/account_invoice_view.xml 2018-03-01 09:44:17 +0000
54@@ -106,7 +106,7 @@
55 <field name="description"/>
56 <field name="journal_id" widget='selection'/>
57 <field name="document_date"/>
58- <field name="date" on_change="onchange_date(date)"/>
59+ <field name="date" required="1" on_change="onchange_date(date)"/>
60 <field name="filter_refund" readonly="1" />
61 </group>
62 <separator colspan="4"/>

Subscribers

People subscribed via source and target branches