From ede4ce4399ca020775485effeb0e3feec9115017 Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Fri, 3 Sep 2010 11:40:45 +0530 Subject: [PATCH] [MOD] account,account_payment,account_followup : replace maturity date by due date bzr revid: vir@tinyerp.com-20100903061045-np3lrhr0tcscgj7m --- addons/account/account.py | 2 +- addons/account/account_move_line.py | 2 +- addons/account/data/account_data2.xml | 4 ++-- addons/account/report/overdue.rml | 2 +- addons/account_followup/report/report_followp_print.rml | 2 +- addons/account_followup/wizard/account_followup_print.py | 2 +- addons/account_payment/account_payment.py | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 1276f2b640f..08725e0cc5e 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2039,7 +2039,7 @@ class account_model_line(osv.osv): 'currency_id': fields.many2one('res.currency', 'Currency'), 'partner_id': fields.many2one('res.partner', 'Partner'), - 'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."), + 'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Due date', help="The due date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."), 'date': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Current Date', required=True, help="The date of the generated entries"), } _defaults = { diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index cf17c76deff..7be8cffa508 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -439,7 +439,7 @@ class account_move_line(osv.osv): 'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"), 'partner_id': fields.many2one('res.partner', 'Partner'), - 'date_maturity': fields.date('Maturity date', help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."), + 'date_maturity': fields.date('Due date', help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."), 'date': fields.related('move_id','date', string='Effective date', type='date', required=True, store={ 'account.move': (_get_move_lines, ['date'], 20) diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml index 336e8c1ab56..51f7ebaed43 100644 --- a/addons/account/data/account_data2.xml +++ b/addons/account/data/account_data2.xml @@ -295,7 +295,7 @@ - Maturity Date + Due Date date_maturity @@ -393,7 +393,7 @@ - Maturity Date + Due Date date_maturity diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml index e8e1a7dc84c..3218f84b4a0 100644 --- a/addons/account/report/overdue.rml +++ b/addons/account/report/overdue.rml @@ -147,7 +147,7 @@ Ref - Maturity date + Due date Due diff --git a/addons/account_followup/report/report_followp_print.rml b/addons/account_followup/report/report_followp_print.rml index 97aaa377c1e..b12e6308fd0 100644 --- a/addons/account_followup/report/report_followp_print.rml +++ b/addons/account_followup/report/report_followp_print.rml @@ -136,7 +136,7 @@ Ref - Maturity Date + Due Date Amount In Currency diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index a37b13cf126..b89ad76d0ee 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -209,7 +209,7 @@ class account_followup_print_all(osv.osv_memory): subtotal_maturity = 0.0 balance = 0.0 l = '--------------------------------------------------------------------------------------------------------------------------' - head = l+ '\n' + 'Date'.rjust(10) + '\t' + 'Description'.rjust(10) + '\t' + 'Ref'.rjust(10) + '\t' + 'Maturity date'.rjust(10) + '\t' + 'Due'.rjust(10) + '\t' + 'Paid'.rjust(10) + '\t' + 'Maturity'.rjust(10) + '\t' + 'Litigation'.rjust(10) + '\n' + l + head = l+ '\n' + 'Date'.rjust(10) + '\t' + 'Description'.rjust(10) + '\t' + 'Ref'.rjust(10) + '\t' + 'Due date'.rjust(10) + '\t' + 'Due'.rjust(10) + '\t' + 'Paid'.rjust(10) + '\t' + 'Maturity'.rjust(10) + '\t' + 'Litigation'.rjust(10) + '\n' + l for i in data_lines: maturity = 0.00 if i.date_maturity < time.strftime('%Y-%m-%d') and (i.debit - i.credit): diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index b36dc0be306..cd3d30e46a8 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -319,7 +319,7 @@ class payment_line(osv.osv): help='Payment amount in the company currency'), 'ml_date_created': fields.function(_get_ml_created_date, string="Effective Date", method=True, type='date', help="Invoice Effective Date"), - 'ml_maturity_date': fields.function(_get_ml_maturity_date, method=True, type='date', string='Maturity Date'), + 'ml_maturity_date': fields.function(_get_ml_maturity_date, method=True, type='date', string='Due Date'), 'ml_inv_ref': fields.function(_get_ml_inv_ref, method=True, type='many2one', relation='account.invoice', string='Invoice Ref.'), 'info_owner': fields.function(info_owner, string="Owner Account", method=True, type="text", help='Address of the Main Partner'), 'info_partner': fields.function(info_partner, string="Destination Account", method=True, type="text", help='Address of the Ordering Customer.'),