diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index d4408d63bfe..39e40555f39 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -34,14 +34,15 @@ Budgets Customer and Supplier Invoices Bank statements + Reconciliation process by partner Creates a dashboards for accountants that includes: * List of uninvoiced quotations * Graph of aged receivables - * Graph of aged incomes + * Graph of aged incomes The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a -module named account_voucherss +module named account_vouchers """, 'website': 'http://www.openerp.com', 'init_xml': [], @@ -85,6 +86,7 @@ module named account_voucherss 'wizard/account_compare_account_balance_report_view.xml', 'wizard/account_third_party_ledger.xml', 'wizard/account_reconcile_view.xml', + 'wizard/account_reconcile_partner_process_view.xml', 'wizard/account_automatic_reconcile_view.xml', 'project/wizard/project_account_analytic_line_view.xml', 'account_end_fy.xml', diff --git a/addons/account/account.py b/addons/account/account.py index f946723e350..87eb6dfd2a8 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -81,7 +81,7 @@ class account_payment_term(osv.osv): if amt: next_date = datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days) if line.days2 < 0: - next_date += relativedelta(day=line.days2) + next_date += relativedelta(day=31) if line.days2 > 0: next_date += relativedelta(day=line.days2, months=1) result.append( (next_date.strftime('%Y-%m-%d'), amt) ) @@ -616,17 +616,17 @@ class account_journal(osv.osv): 'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]), 'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]), 'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."), - 'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]",help="It acts as a default account for credit amount"), - 'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]",help="It acts as a default account for debit amount"), + 'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]", help="It acts as a default account for credit amount"), + 'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"), 'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."), - 'update_posted': fields.boolean('Allow Cancelling Entries',help="Check this box if you want to cancel the entries related to this journal or want to cancel the invoice related to this journal"), + 'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"), 'group_invoice_lines': fields.boolean('Group invoice lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."), 'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=True), 'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"), 'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'), 'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'), 'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'), - 'company_id': fields.many2one('res.company', 'Company', required=True,select=1,help="Company associated with a journal"), + 'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"), 'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \ help="The sequence used for invoice numbers in this journal."), 'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'), @@ -678,7 +678,6 @@ class account_journal(osv.osv): res= {'value':{'centralisation': False}} return res - account_journal() class account_fiscalyear(osv.osv): @@ -772,7 +771,7 @@ class account_period(osv.osv): 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True), 'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True, help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'), - 'company_id': fields.related('fiscalyear_id','company_id',type='many2one',relation='res.company',string='Company',store=True) + 'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True) } _defaults = { 'state': lambda *a: 'draft', @@ -878,7 +877,7 @@ class account_journal_period(osv.osv): 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True, help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'), 'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'), - 'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company') + 'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company') } def _check(self, cr, uid, ids, context={}): @@ -2122,7 +2121,7 @@ class account_tax_code_template(osv.osv): 'info': fields.text('Description'), 'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True), 'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'), - 'sign': fields.float('Sign for parent', required=True), + 'sign': fields.float('Sign for parent', required=True, help="Choose 1.00 to add the total to the parent account or -1.00 to subtract it"), 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"), } @@ -2154,7 +2153,7 @@ class account_chart_template(osv.osv): _columns={ 'name': fields.char('Name', size=64, required=True), - 'account_root_id': fields.many2one('account.account.template','Root Account',required=True,domain=[('parent_id','=',False)]), + 'account_root_id': fields.many2one('account.account.template','Root Account',required=True,domain=[('parent_id','=',False)], help=""), 'tax_code_root_id': fields.many2one('account.tax.code.template','Root Tax Code',required=True,domain=[('parent_id','=',False)]), 'tax_template_ids': fields.one2many('account.tax.template', 'chart_template_id', 'Tax Template List', help='List of all the taxes that have to be installed by the wizard'), 'bank_account_view_id': fields.many2one('account.account.template','Bank Account',required=True), diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 45edefe6082..b8719f26242 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -577,6 +577,39 @@ class account_move_line(osv.osv): # writeoff; entry generated for the difference between the lines # + def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): + if context is None: + context = {} + if context and context.get('next_partner_only', False): + if not context.get('partner_id', False): + partner = self.get_next_partner_only(cr, uid, offset, context) + else: + partner = context.get('partner_id', False) + if not partner: + return [] + args.append(('partner_id', '=', partner[0])) + return super(account_move_line, self).search(cr, uid, args, offset, limit, order, context, count) + + def get_next_partner_only(self, cr, uid, offset=0, context=None): + cr.execute( + """ + SELECT p.id + FROM res_partner p + RIGHT JOIN ( + SELECT l.partner_id as partner_id, SUM(l.debit) as debit, SUM(l.credit) as credit + FROM account_move_line l + LEFT JOIN account_account a ON (a.id = l.account_id) + LEFT JOIN res_partner p ON (l.partner_id = p.id) + WHERE a.reconcile IS TRUE + AND l.reconcile_id IS NULL + AND (p.last_reconciliation_date IS NULL OR l.date > p.last_reconciliation_date) + AND l.state <> 'draft' + GROUP BY l.partner_id + ) AS s ON (p.id = s.partner_id) + ORDER BY p.last_reconciliation_date LIMIT 1 OFFSET %s""", (offset,) + ) + return cr.fetchone() + def reconcile_partial(self, cr, uid, ids, type='auto', context=None): merges = [] unmerge = [] @@ -730,6 +763,11 @@ class account_move_line(osv.osv): # because of the way the line_id are defined: (4, x, False) for id in ids: wf_service.trg_trigger(uid, 'account.move.line', id, cr) + + if lines and lines[0]: + partner_id = lines[0].partner_id.id + if context and context.get('stop_reconcile', False): + self.pool.get('res.partner').write(cr, uid, [partner_id], {'last_reconciliation_date': time.strftime('%Y-%m-%d %H:%M:%S')}) return r_id def view_header_get(self, cr, user, view_id, view_type, context): @@ -838,13 +876,14 @@ class account_move_line(osv.osv): journal_id = m.journal_id.id period_id = m.period_id.id else: - journal_id = context['journal_id'] - period_id = context['period_id'] - journal = self.pool.get('account.journal').browse(cr, uid, [journal_id])[0] - if journal.allow_date: - period = self.pool.get('account.period').browse(cr, uid, [period_id])[0] - if not time.strptime(vals['date'],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') or not time.strptime(vals['date'],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'): - raise osv.except_osv(_('Error'),_('The date of your Ledger Posting is not in the defined period !')) + journal_id = context.get('journal_id',False) + period_id = context.get('period_id',False) + if journal_id: + journal = self.pool.get('account.journal').browse(cr, uid, [journal_id])[0] + if journal.allow_date and period_id: + period = self.pool.get('account.period').browse(cr, uid, [period_id])[0] + if not time.strptime(vals['date'],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') or not time.strptime(vals['date'],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'): + raise osv.except_osv(_('Error'),_('The date of your Ledger Posting is not in the defined period !')) else: return True diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 694a48177d9..82781b45ab0 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -12,12 +12,14 @@ form
- - + + + + @@ -49,11 +51,32 @@ + + account.fiscalyear.search + account.fiscalyear + search + + + + + + + + + + + + + + + + + Fiscal Years account.fiscalyear form - tree,form + tree,form,search @@ -71,15 +94,15 @@ form - - + + - +