|
@ -186,6 +186,7 @@ class GeneralLedgerReportMoveLine(models.TransientModel): |
|
|
|
|
|
|
|
|
# Data fields, used to keep link with real object |
|
|
# Data fields, used to keep link with real object |
|
|
move_line_id = fields.Many2one('account.move.line') |
|
|
move_line_id = fields.Many2one('account.move.line') |
|
|
|
|
|
matched_ml_id = fields.Many2one("account.full.reconcile") |
|
|
|
|
|
|
|
|
# Data fields, used for report display |
|
|
# Data fields, used for report display |
|
|
date = fields.Date() |
|
|
date = fields.Date() |
|
@ -197,7 +198,6 @@ class GeneralLedgerReportMoveLine(models.TransientModel): |
|
|
label = fields.Char() |
|
|
label = fields.Char() |
|
|
cost_center = fields.Char() |
|
|
cost_center = fields.Char() |
|
|
tags = fields.Char() |
|
|
tags = fields.Char() |
|
|
matching_number = fields.Char() |
|
|
|
|
|
debit = fields.Float(digits=(16, 2)) |
|
|
debit = fields.Float(digits=(16, 2)) |
|
|
credit = fields.Float(digits=(16, 2)) |
|
|
credit = fields.Float(digits=(16, 2)) |
|
|
cumul_balance = fields.Float(digits=(16, 2)) |
|
|
cumul_balance = fields.Float(digits=(16, 2)) |
|
@ -1067,6 +1067,7 @@ INSERT INTO |
|
|
create_uid, |
|
|
create_uid, |
|
|
create_date, |
|
|
create_date, |
|
|
move_line_id, |
|
|
move_line_id, |
|
|
|
|
|
matched_ml_id, |
|
|
date, |
|
|
date, |
|
|
entry, |
|
|
entry, |
|
|
journal, |
|
|
journal, |
|
@ -1075,7 +1076,6 @@ INSERT INTO |
|
|
partner, |
|
|
partner, |
|
|
label, |
|
|
label, |
|
|
cost_center, |
|
|
cost_center, |
|
|
matching_number, |
|
|
|
|
|
debit, |
|
|
debit, |
|
|
credit, |
|
|
credit, |
|
|
cumul_balance, |
|
|
cumul_balance, |
|
@ -1096,6 +1096,7 @@ SELECT |
|
|
%s AS create_uid, |
|
|
%s AS create_uid, |
|
|
NOW() AS create_date, |
|
|
NOW() AS create_date, |
|
|
ml.id AS move_line_id, |
|
|
ml.id AS move_line_id, |
|
|
|
|
|
fr.id AS matched_ml_id, |
|
|
ml.date, |
|
|
ml.date, |
|
|
m.name AS entry, |
|
|
m.name AS entry, |
|
|
j.code AS journal, |
|
|
j.code AS journal, |
|
@ -1139,7 +1140,6 @@ SELECT |
|
|
query_inject_move_line += """ |
|
|
query_inject_move_line += """ |
|
|
CONCAT_WS(' - ', NULLIF(ml.ref, ''), NULLIF(ml.name, '')) AS label, |
|
|
CONCAT_WS(' - ', NULLIF(ml.ref, ''), NULLIF(ml.name, '')) AS label, |
|
|
aa.name AS cost_center, |
|
|
aa.name AS cost_center, |
|
|
fr.name AS matching_number, |
|
|
|
|
|
ml.debit, |
|
|
ml.debit, |
|
|
ml.credit, |
|
|
ml.credit, |
|
|
""" |
|
|
""" |
|
|