Skip to content

Commit 33538d3

Browse files
kobros-techkobros-tech
committed
[FIX] partner_statement: remove blocked related code
1 parent b5c7c24 commit 33538d3

File tree

4 files changed

+4
-82
lines changed

4 files changed

+4
-82
lines changed

‎partner_statement/report/activity_statement_xlsx.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ def _write_currency_lines(self, row_pos, sheet, partner, currency, data):
9090
format_distributed = FORMATS["format_distributed"]
9191
current_money_format = FORMATS["current_money_format"]
9292
for line in currency_data.get("lines"):
93-
# if line.get("blocked"):
94-
# format_tcell_left = FORMATS["format_tcell_left_blocked"]
95-
# format_tcell_date_left = FORMATS["format_tcell_date_left_blocked"]
96-
# format_distributed = FORMATS["format_distributed_blocked"]
97-
# current_money_format = FORMATS["current_money_format_blocked"]
9893
row_pos += 1
9994
name_to_show = (
10095
line.get("name", "") == "/" or not line.get("name", "")

‎partner_statement/report/detailed_activity_statement_xlsx.py

Lines changed: 3 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -98,24 +98,12 @@ def _write_currency_lines(self, row_pos, sheet, partner, currency, data):
9898
FORMATS["current_money_format"],
9999
)
100100
for line in currency_data.get("lines"):
101-
# if line.get("blocked") and not line.get("reconciled_line"):
102-
# format_tcell_left = FORMATS["format_tcell_left_blocked"]
103-
# format_tcell_date_left = FORMATS["format_tcell_date_left_blocked"]
104-
# format_distributed = FORMATS["format_distributed_blocked"]
105-
# current_money_format = FORMATS["current_money_format_blocked"]
106-
if (
107-
line.get("reconciled_line")
108-
# and not line.get("blocked")
109-
and not line.get("outside-date-rank")
110-
):
101+
if line.get("reconciled_line") and not line.get("outside-date-rank"):
111102
format_tcell_left = FORMATS["format_tcell_left_reconciled"]
112103
format_tcell_date_left = FORMATS["format_tcell_date_left_reconciled"]
113104
format_distributed = FORMATS["format_distributed_reconciled"]
114105
current_money_format = FORMATS["current_money_format_reconciled"]
115-
elif (
116-
# line.get("blocked")
117-
line.get("reconciled_line") and not line.get("outside-date-rank")
118-
):
106+
elif line.get("reconciled_line") and not line.get("outside-date-rank"):
119107
format_tcell_left = FORMATS["format_tcell_left_blocked_reconciled"]
120108
format_tcell_date_left = FORMATS[
121109
"format_tcell_date_left_blocked_reconciled"
@@ -124,11 +112,7 @@ def _write_currency_lines(self, row_pos, sheet, partner, currency, data):
124112
current_money_format = FORMATS[
125113
"current_money_format_blocked_reconciled"
126114
]
127-
elif (
128-
line.get("reconciled_line")
129-
# and not line.get("blocked")
130-
and line.get("outside-date-rank")
131-
):
115+
elif line.get("reconciled_line") and line.get("outside-date-rank"):
132116
format_tcell_left = FORMATS[
133117
"format_tcell_left_reconciled_outside-date-rank"
134118
]
@@ -141,23 +125,6 @@ def _write_currency_lines(self, row_pos, sheet, partner, currency, data):
141125
current_money_format = FORMATS[
142126
"current_money_format_reconciled_outside-date-rank"
143127
]
144-
# elif (
145-
# line.get("blocked")
146-
# and line.get("reconciled_line")
147-
# and line.get("outside-date-rank")
148-
# ):
149-
# format_tcell_left = FORMATS[
150-
# "format_tcell_left_blocked_reconciled_outside-date-rank"
151-
# ]
152-
# format_tcell_date_left = FORMATS[
153-
# "format_tcell_date_left_blocked_reconciled_outside-date-rank"
154-
# ]
155-
# format_distributed = FORMATS[
156-
# "format_distributed_blocked_reconciled_outside-date-rank"
157-
# ]
158-
# current_money_format = FORMATS[
159-
# "current_money_format_blocked_reconciled_outside-date-rank"
160-
# ]
161128
else:
162129
format_tcell_left = FORMATS["format_tcell_left"]
163130
format_tcell_date_left = FORMATS["format_tcell_date_left"]
@@ -257,26 +224,11 @@ def _write_currency_prior_lines(self, row_pos, sheet, partner, currency, data):
257224
format_distributed = FORMATS["format_distributed"]
258225
current_money_format = FORMATS["current_money_format"]
259226
for line in currency_data.get("prior_lines"):
260-
# if line.get("blocked") and not line.get("reconciled_line"):
261-
# format_tcell_left = FORMATS["format_tcell_left_blocked"]
262-
# format_tcell_date_left = FORMATS["format_tcell_date_left_blocked"]
263-
# format_distributed = FORMATS["format_distributed_blocked"]
264-
# current_money_format = FORMATS["current_money_format_blocked"]
265227
if line.get("reconciled_line"):
266228
format_tcell_left = FORMATS["format_tcell_left_reconciled"]
267229
format_tcell_date_left = FORMATS["format_tcell_date_left_reconciled"]
268230
format_distributed = FORMATS["format_distributed_reconciled"]
269231
current_money_format = FORMATS["current_money_format_reconciled"]
270-
# elif line.get("blocked") and line.get("reconciled_line"):
271-
# elif line.get("reconciled_line"):
272-
# format_tcell_left = FORMATS["format_tcell_left_blocked_reconciled"]
273-
# format_tcell_date_left = FORMATS[
274-
# "format_tcell_date_left_blocked_reconciled"
275-
# ]
276-
# format_distributed = FORMATS["format_distributed_blocked_reconciled"]
277-
# current_money_format = FORMATS[
278-
# "current_money_format_blocked_reconciled"
279-
# ]
280232
row_pos += 1
281233
name_to_show = (
282234
line.get("name", "") == "/" or not line.get("name", "")
@@ -363,25 +315,11 @@ def _write_currency_ending_lines(self, row_pos, sheet, partner, currency, data):
363315
format_distributed = FORMATS["format_distributed"]
364316
current_money_format = FORMATS["current_money_format"]
365317
for line in currency_data.get("ending_lines"):
366-
# if line.get("blocked") and not line.get("reconciled_line"):
367-
# format_tcell_left = FORMATS["format_tcell_left_blocked"]
368-
# format_tcell_date_left = FORMATS["format_tcell_date_left_blocked"]
369-
# format_distributed = FORMATS["format_distributed_blocked"]
370-
# current_money_format = FORMATS["current_money_format_blocked"]
371318
if line.get("reconciled_line"):
372319
format_tcell_left = FORMATS["format_tcell_left_reconciled"]
373320
format_tcell_date_left = FORMATS["format_tcell_date_left_reconciled"]
374321
format_distributed = FORMATS["format_distributed_reconciled"]
375322
current_money_format = FORMATS["current_money_format_reconciled"]
376-
# elif line.get("blocked") and line.get("reconciled_line"):
377-
# format_tcell_left = FORMATS["format_tcell_left_blocked_reconciled"]
378-
# format_tcell_date_left = FORMATS[
379-
# "format_tcell_date_left_blocked_reconciled"
380-
# ]
381-
# format_distributed = FORMATS["format_distributed_blocked_reconciled"]
382-
# current_money_format = FORMATS[
383-
# "current_money_format_blocked_reconciled"
384-
# ]
385323
row_pos += 1
386324
name_to_show = (
387325
line.get("name", "") == "/" or not line.get("name", "")

‎partner_statement/report/outstanting_statement_xlsx.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,6 @@ def _write_currency_lines(self, row_pos, sheet, partner, currency, data):
6868
format_distributed = FORMATS["format_distributed"]
6969
current_money_format = FORMATS["current_money_format"]
7070
for line in currency_data.get("lines"):
71-
# if line.get("blocked"):
72-
# format_tcell_left = FORMATS["format_tcell_left_blocked"]
73-
# format_tcell_date_left = FORMATS["format_tcell_date_left_blocked"]
74-
# format_distributed = FORMATS["format_distributed_blocked"]
75-
# current_money_format = FORMATS["current_money_format_blocked"]
7671
row_pos += 1
7772
name_to_show = (
7873
line.get("name", "") == "/" or not line.get("name", "")

‎partner_statement/report/report_statement_common.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,7 @@ def _get_report_values(self, docids, data=None):
445445
line["currency_id"], currencies, 0.0, 0.0
446446
)
447447
line_currency = currency_dict[line["currency_id"]]
448-
# if not line["blocked"]:
449-
# line_currency["amount_due"] += line["open_amount"]
448+
line_currency["amount_due"] += line["open_amount"]
450449
line["balance"] = line_currency["amount_due"]
451450
line["date"] = format_date(
452451
line["date"], date_formats.get(partner_id, default_fmt)
@@ -468,11 +467,9 @@ def _get_report_values(self, docids, data=None):
468467
)
469468
line_currency = currency_dict[line["currency_id"]]
470469
if not is_activity:
471-
# if not line["blocked"]:
472470
line_currency["amount_due"] += line[amount_field]
473471
line["balance"] = line_currency["amount_due"]
474472
else:
475-
# if not line["blocked"]:
476473
line_currency["ending_balance"] += line[amount_field]
477474
line["balance"] = line_currency["ending_balance"]
478475
line["outside-date-rank"] = False
@@ -495,7 +492,6 @@ def _get_report_values(self, docids, data=None):
495492
line2["applied_amount"] = line2["open_amount"]
496493
if line2["date"] >= date_start and line2["date"] <= date_end:
497494
line2["outside-date-rank"] = False
498-
# if not line2["blocked"]:
499495
line["applied_amount"] += line2["open_amount"]
500496
else:
501497
line2["outside-date-rank"] = True
@@ -514,7 +510,6 @@ def _get_report_values(self, docids, data=None):
514510
)
515511
if is_activity:
516512
line["open_amount"] = line["amount"] + line["applied_amount"]
517-
# if not line["blocked"]:
518513
line_currency["amount_due"] += line["open_amount"]
519514

520515
if is_detailed:
@@ -523,7 +518,6 @@ def _get_report_values(self, docids, data=None):
523518

524519
for line in ending_lines.get(partner_id, []):
525520
line_currency = currency_dict[line["currency_id"]]
526-
# if not line["blocked"]:
527521
line_currency["amount_due"] += line["open_amount"]
528522
line["balance"] = line_currency["amount_due"]
529523
line["date"] = format_date(

0 commit comments

Comments
 (0)