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

Proposed by jftempo
Status: Merged
Merged at revision: 5685
Proposed branch: lp:~julie-w/unifield-server/US-7255
Merge into: lp:unifield-server
Diff against target: 96 lines (+18/-3)
5 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+2/-0)
bin/addons/register_accounting/account_bank_statement.py (+5/-1)
bin/addons/register_accounting/account_view.xml (+2/-1)
bin/addons/register_accounting/report/open_advances_xls.mako (+4/-0)
bin/addons/register_accounting/report/report_open_advances.py (+5/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-7255
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+383117@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/msf_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2020-04-20 08:36:07 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2020-04-29 08:55:39 +0000
4@@ -31373,6 +31373,7 @@
5 #: selection:analytic.distribution.wizard,register_line_state:0
6 #: view:account.bank.statement:0
7 #: selection:account.bank.statement.line,state:0
8+#: view:account.bank.statement.line:0
9 msgid "Hard"
10 msgstr "Comptabilisé"
11
12@@ -35555,6 +35556,7 @@
13 #: field:product.mass.update,product_state:0
14 #: field:product.mass.update,state:0
15 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:235
16+#: report:addons/register_accounting/report/open_advances_xls.mako:160
17 #, python-format
18 msgid "Status"
19 msgstr "Statut"
20
21=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
22--- bin/addons/register_accounting/account_bank_statement.py 2020-04-07 14:24:03 +0000
23+++ bin/addons/register_accounting/account_bank_statement.py 2020-04-29 08:55:39 +0000
24@@ -495,7 +495,11 @@
25 if not register:
26 raise osv.except_osv(_('Error'), _('Please select a register first.'))
27 context.update({'check_advance_reconciled': True})
28- domain = [('account_id.type_for_register', '=', 'advance'), ('state', '=', 'hard'), ('reconciled', '=', False), ('amount', '<=', 0.0), ('date', '<=', date)]
29+ domain = [('account_id.type_for_register', '=', 'advance'),
30+ ('state', 'in', ['temp', 'hard']),
31+ ('reconciled', '=', False),
32+ ('amount', '<=', 0.0),
33+ ('date', '<=', date)]
34 name = _('Open Advances')
35 if register.journal_id and register.journal_id.currency:
36 # prepare some values
37
38=== modified file 'bin/addons/register_accounting/account_view.xml'
39--- bin/addons/register_accounting/account_view.xml 2020-03-20 17:31:32 +0000
40+++ bin/addons/register_accounting/account_view.xml 2020-04-29 08:55:39 +0000
41@@ -502,7 +502,8 @@
42 <search string="Register Lines">
43 <group col='10' colspan='4'>
44 <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
45- <filter string="Temp" domain="[('state','=','temp')]" icon="terp-camera_test"/>
46+ <filter string="Temp" domain="[('state', '=', 'temp')]" icon="terp-gtk-jump-to-ltr"/>
47+ <filter string="Hard" domain="[('state', '=', 'hard')]" icon="terp-camera_test"/>
48 <separator orientation="vertical"/>
49 <field name="document_date" select='1'/>
50 <field name="date" select='1'/>
51
52=== modified file 'bin/addons/register_accounting/report/open_advances_xls.mako'
53--- bin/addons/register_accounting/report/open_advances_xls.mako 2018-03-01 13:27:56 +0000
54+++ bin/addons/register_accounting/report/open_advances_xls.mako 2020-04-29 08:55:39 +0000
55@@ -127,6 +127,7 @@
56 <Column ss:Width="76.5"/>
57 <Column ss:Width="79.5"/>
58 <Column ss:Width="55.0"/>
59+<Column ss:Width="75.0"/>
60
61 <Row>
62 <Cell ss:StyleID="s25" ><Data ss:Type="String">${_('OPEN ADVANCES')}</Data></Cell>
63@@ -156,6 +157,7 @@
64 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Functional Debit')}</Data></Cell>
65 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Functional Credit')}</Data></Cell>
66 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Functional Currency')}</Data></Cell>
67+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Status')}</Data></Cell>
68 </Row>
69 % for line in getLines(o):
70
71@@ -188,6 +190,8 @@
72 <Cell ss:StyleID="lineN" ><Data ss:Type="Number">${(line.first_move_line_id and line.first_move_line_id.debit or 0.00)|x}</Data></Cell>
73
74 <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.company_id and line.company_id.currency_id and line.company_id.currency_id.name or '')|x}</Data></Cell>
75+
76+ <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.state and getSel(line, 'state') or '')|x}</Data></Cell>
77 </Row>
78
79 % endfor
80
81=== modified file 'bin/addons/register_accounting/report/report_open_advances.py'
82--- bin/addons/register_accounting/report/report_open_advances.py 2018-04-10 08:34:01 +0000
83+++ bin/addons/register_accounting/report/report_open_advances.py 2020-04-29 08:55:39 +0000
84@@ -88,7 +88,11 @@
85 ret = []
86 obj_line = pooler.get_pool(self.cr.dbname).get('account.bank.statement.line')
87 date = time.strftime('%Y-%m-%d')
88- domain = [('account_id.type_for_register', '=', 'advance'), ('state', '=', 'hard'), ('reconciled', '=', False), ('amount', '<=', 0.0), ('date', '<=', date)]
89+ domain = [('account_id.type_for_register', '=', 'advance'),
90+ ('state', 'in', ['temp', 'hard']),
91+ ('reconciled', '=', False),
92+ ('amount', '<=', 0.0),
93+ ('date', '<=', date)]
94 if obj.journal_id and obj.journal_id.currency:
95 domain.append(('statement_id.journal_id.currency', '=', obj.journal_id.currency.id))
96 ids = obj_line.search(self.cr, self.uid, domain, context={'check_advance_reconciled': True})

Subscribers

People subscribed via source and target branches