IntenseFinance/flectra
3
0
Fork 0
mirror of https://gitlab.com/flectra-hq/flectra.git synced 2026-08-17 16:54:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'master-upstream-patch-10032024' into 'master'"

Browse Source 
This reverts merge request !1249
This commit is contained in:
Parthiv Patel
2024-03-11 06:18:40 +00:00
parent 100eef7c6a
commit 336932d09a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_move.py
+3 -1
View File
@@ -5276,7 +5276,9 @@ class AccountMoveLine(models.Model):
elif context.get('initial_bal'):
domain += [(date_field, '<', context['date_from'])]
else:
domain += [(date_field, '>=', context['date_from'])]
# domain += [(date_field, '>=', context['date_from'])]
domain += ['|', (date_field, '>=', context['date_from']),
('account_id.user_type_id.include_initial_balance', '=', True)]
if context.get('journal_ids'):
domain += [('journal_id', 'in', context['journal_ids'])]
addons/account/wizard/account_report_common.py
+2 -2
View File
@@ -10,8 +10,8 @@ class AccountCommonReport(models.TransientModel):
company_id = fields.Many2one('res.company', string='Company', required=True, default=lambda self: self.env.company)
journal_ids = fields.Many2many('account.journal', string='Journals', required=True, default=lambda self: self.env['account.journal'].search([('company_id', '=', self.company_id.id)]))
date_from = fields.Date(string='Start Date')
date_to = fields.Date(string='End Date')
date_from = fields.Date(string='Start Date', required=True)
date_to = fields.Date(string='End Date', required=True)
target_move = fields.Selection([('posted', 'All Posted Entries'),
('all', 'All Entries'),
], string='Target Moves', required=True, default='posted')