From 63be12114daaeb8f5d9e9ee681e4690fde40641e Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Mon, 20 Oct 2008 15:17:06 +0200 Subject: [PATCH 1/6] Add date_stop, date_start and state for the res.contact.job bzr revid: stephane@tinyerp.com-20081020131706-uaklguc4v6uuoc8z --- addons/base_contact/base_contact.py | 4 ++++ addons/base_contact/base_contact_view.xml | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py index 6fd1df8228e..0547703d782 100644 --- a/addons/base_contact/base_contact.py +++ b/addons/base_contact/base_contact.py @@ -133,10 +133,14 @@ class res_partner_job(osv.osv): 'sequence_partner':fields.integer('Sequence (Partner)',help='order of importance of this function in the list of functions of the linked partner'), 'email': fields.char('E-Mail', size=240), 'phone': fields.char('Phone', size=64), + 'date_start' : fields.date('Date Start'), + 'date_stop' : fields.date('Date Stop'), + 'state' : fields.selection([('past', 'Past'),('current', 'Current')], 'State', required=True), } _defaults = { 'sequence_contact' : lambda *a: 0, + 'state' : lambda *a: 'past', } res_partner_job() diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml index 817135a8571..cbac79d9c50 100644 --- a/addons/base_contact/base_contact_view.xml +++ b/addons/base_contact/base_contact_view.xml @@ -23,10 +23,10 @@ form
- + + + - - @@ -43,6 +43,9 @@ + + + @@ -51,6 +54,7 @@ + From a9ca19338345f10472f1a9d688ad348643ca25a5 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Mon, 20 Oct 2008 15:22:12 +0200 Subject: [PATCH 2/6] set the current value for the state field bzr revid: stephane@tinyerp.com-20081020132212-8te4p08xxmq0y5gl --- addons/base_contact/base_contact.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py index 0547703d782..2a6dc558963 100644 --- a/addons/base_contact/base_contact.py +++ b/addons/base_contact/base_contact.py @@ -140,7 +140,7 @@ class res_partner_job(osv.osv): _defaults = { 'sequence_contact' : lambda *a: 0, - 'state' : lambda *a: 'past', + 'state' : lambda *a: 'current', } res_partner_job() From 59009f1dd0ff770f8864d34c731f2523d253e242 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Mon, 20 Oct 2008 15:24:59 +0200 Subject: [PATCH 3/6] change the order of some fields and change the title of the sequence object bzr revid: stephane@tinyerp.com-20081020132459-om103pcivt6vpcz1 --- addons/base_contact/base_contact_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml index cbac79d9c50..5cc819d8dea 100644 --- a/addons/base_contact/base_contact_view.xml +++ b/addons/base_contact/base_contact_view.xml @@ -37,10 +37,10 @@
- - + + @@ -48,7 +48,7 @@ - + From 8b0e3d3e9b57adb48ceb2b29ee8f9da2a04bfb55 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 20 Oct 2008 18:58:16 +0530 Subject: [PATCH 4/6] In the menuitem, Partner ledger and Partner balance, we need uppercase letter: Partner Ledger, Partner Balance bzr revid: patelamit2003@gmail.com-20081020132816-hsvu9fsv7jyhi4wd --- addons/account/account_wizard.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml index f2573a71f9b..7be194e2f65 100644 --- a/addons/account/account_wizard.xml +++ b/addons/account/account_wizard.xml @@ -48,19 +48,19 @@ - + - + - + - - + + From c518c420ddf2ecca7f232e6ae2a9776530480911 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 20 Oct 2008 19:09:39 +0530 Subject: [PATCH 5/6] By default, all filters must be "By Date" and not "By Date and Period" bzr revid: patelamit2003@gmail.com-20081020133939-g74dp83d8z2lzxag --- addons/account/wizard/wizard_partner_balance_report.py | 2 +- addons/account/wizard/wizard_third_party_ledger.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/wizard/wizard_partner_balance_report.py b/addons/account/wizard/wizard_partner_balance_report.py index d90a68a99f0..5b28e10ceb9 100644 --- a/addons/account/wizard/wizard_partner_balance_report.py +++ b/addons/account/wizard/wizard_partner_balance_report.py @@ -59,7 +59,7 @@ period_fields = { 'string':"Date/Period Filter", 'type':'selection', 'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')], - 'default': lambda *a:'all' + 'default': lambda *a:'bydate' }, 'fiscalyear': { 'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear', diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py index 7a638f3d0db..4cabe4792b2 100755 --- a/addons/account/wizard/wizard_third_party_ledger.py +++ b/addons/account/wizard/wizard_third_party_ledger.py @@ -65,7 +65,7 @@ period_fields = { 'string':"Date/Period Filter", 'type':'selection', 'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')], - 'default': lambda *a:'all' + 'default': lambda *a:'bydate' }, 'fiscalyear': { 'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear', From abec264caadf91ba55c6bb1ef3d6ccf68cdcd397 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 20 Oct 2008 19:15:28 +0530 Subject: [PATCH 6/6] Small changes in partner ledger wizaed bzr revid: patelamit2003@gmail.com-20081020134528-buitfmih5p1g4388 --- addons/account/wizard/wizard_third_party_ledger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py index 4cabe4792b2..298cf910275 100755 --- a/addons/account/wizard/wizard_third_party_ledger.py +++ b/addons/account/wizard/wizard_third_party_ledger.py @@ -81,7 +81,7 @@ period_fields = { 'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'}, 'reconcil':{'string':" Include Reconciled Entries",'type':'boolean'}, 'page_split':{'string':"One Partner Per Page",'type':'boolean'}, - 'date1': {'string':' Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')}, + 'date1': {'string':' Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')}, 'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')}, }