From 0a856c7f6dcdababa4a86f2fb152db0818bc743d Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 20 Oct 2008 17:30:32 +0530 Subject: [PATCH 1/6] partner ledger filter prob solved bzr revid: patelamit2003@gmail.com-20081020120032-iq91mpqe282e548s --- addons/account/report/third_party_ledger.py | 2 +- addons/account/wizard/wizard_third_party_ledger.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py index afc5635527c..6d7f7a9bf16 100755 --- a/addons/account/report/third_party_ledger.py +++ b/addons/account/report/third_party_ledger.py @@ -204,7 +204,7 @@ class third_party_ledger(rml_parse.rml_parse): "FROM account_move_line AS line, account_account AS account " \ "WHERE line.partner_id IS NOT NULL " \ "AND line.account_id = account.id " \ - "AND line.date < %s " \ + "AND line.date <= %s " \ "AND line.reconcile_id IS NULL " \ # "AND line.account_id IN (" + self.account_ids + ") " \ " " + PARTNER_REQUEST + " " \ diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py index f4b9c5aadfc..7a638f3d0db 100755 --- a/addons/account/wizard/wizard_third_party_ledger.py +++ b/addons/account/wizard/wizard_third_party_ledger.py @@ -79,8 +79,8 @@ period_fields = { 'required':True }, 'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'}, - 'reconcil':{'string':" Inclure les ecritures reconsiliees",'type':'boolean'}, - 'page_split':{'string':"Un partenaire par page",'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')}, 'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')}, } From 366ba22b71a3b401030f892ceb62aa23110bce62 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 20 Oct 2008 18:03:57 +0530 Subject: [PATCH 2/6] Mvt column size changed in General ledger.(Viral Rami) bzr revid: patelamit2003@gmail.com-20081020123357-jh9z5hiqh8pb786b --- addons/account/report/general_ledger.rml | 66 +++++++------- .../report/general_ledger_landscape.rml | 86 +++++++++---------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index e42d0368d70..20817dff3f3 100755 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -23,7 +23,7 @@ [[ time.strftime("%d-%m-%Y %H:%M", time.localtime()) ]] Page - + 1cm 27.7cm 20cm 27.7cm @@ -32,29 +32,29 @@ - + - + - + - + - - + + - - + + @@ -91,7 +91,7 @@ - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] Date @@ -122,7 +122,7 @@ [[ repeatIn(objects, 'a') ]] [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - + @@ -139,7 +139,7 @@ [[sum_solde_account(o, data['form']) or '0.0' ]] - + @@ -147,7 +147,7 @@ - + Balance Initial @@ -169,13 +169,13 @@ [[ (o.init_debit - o.init_credit) or '0.0' ]] - + [[ repeatIn(lines(o, data['form']), 'line') ]] [[ line['date'] ]] - + [[ line['partner'] ]] @@ -197,14 +197,14 @@ [[ line['progress'] and line['progress'] or '0.0' ]] - + - - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] Date @@ -229,17 +229,17 @@ Balance - + Currency - - + + [[ repeatIn(objects, 'a') ]] [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - + @@ -256,18 +256,18 @@ [[sum_solde_account(o, data['form']) or '0.0' ]] - + [[ sum_currency_amount_account(a, data['form']) or '0.0' ]] - + [[ data['form']['soldeinit'] == True or removeParentNode('tr') ]] - + Balance Initial @@ -292,7 +292,7 @@ - + [[ repeatIn(lines(o, data['form']), 'line') ]] @@ -323,15 +323,15 @@ [[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]] - + - + - + - - - - + + + + \ No newline at end of file diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index a2f17d7a640..16ddfa9a594 100755 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -24,39 +24,39 @@ Page - + 1.3cm 24.9cm 38.3cm 24.9cm - + - + - + - + - + - - + + - - + + @@ -92,10 +92,10 @@ - - - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] - + + + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + @@ -145,10 +145,10 @@ [[ repeatIn(objects, 'a') ]] [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - + - - + + @@ -165,18 +165,18 @@ [[ sum_solde_account(o, data['form']) or '0.0' ]] - + [[ sum_currency_amount_account(o, data['form']) or '0.0' ]] - + [[ data['form']['soldeinit'] == True or removeParentNode('tr') ]] Balance Initial - + @@ -207,13 +207,13 @@ - - - + + + [[ repeatIn(lines(o, data['form']), 'line') ]] - + [[ line['date'] ]] @@ -247,17 +247,17 @@ [[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]] - - + + - - - + + + - - - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + + + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] @@ -320,7 +320,7 @@ Balance - + [[ repeatIn(objects, 'a') ]] @@ -342,14 +342,14 @@ [[sum_solde_account(o, data['form']) or '0.0' ]] - + [[ data['form']['soldeinit'] == True or removeParentNode('tr') ]] - + Solde Initial @@ -368,7 +368,7 @@ - + [[ o.init_debit or '0.0' ]] @@ -378,7 +378,7 @@ [[ o.init_debit - o.init_credit or '0.0' ]] - + [[ repeatIn(lines(o, data['form']), 'line') ]] @@ -412,15 +412,15 @@ [[ line['progress'] and line['progress'] or '0.0' ]] - - + + - + - - + + - + \ No newline at end of file From 8f2b7a0a4c2e55af992109a61dec1e6c7c10560c Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 20 Oct 2008 18:16:04 +0530 Subject: [PATCH 3/6] add a field Analytic account in the same style of notes on sale order: means, with the same font and under the line--Solved(Vinay Rana) bzr revid: patelamit2003@gmail.com-20081020124604-rk9rv0t92bsfpqxn --- addons/hr_expense/report/expense.rml | 51 +++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml index 7ab564bf011..82321f43dec 100644 --- a/addons/hr_expense/report/expense.rml +++ b/addons/hr_expense/report/expense.rml @@ -59,6 +59,14 @@ + + + + + + + + @@ -104,6 +112,7 @@ + @@ -201,6 +210,46 @@ [[ company.currency_id.name ]] + + + + + + + + [[ format(line.analytic_account and line.analytic_account.complete_name or removeParentNode('tr')) ]] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -248,4 +297,4 @@ This document must be dated and signed for reimbursment - + \ No newline at end of file From 5c2df007560f69e3085ce10fa2e810ae4b7953ed Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 20 Oct 2008 18:22:54 +0530 Subject: [PATCH 4/6] account balance prob solved..(Rana Vinay) bzr revid: patelamit2003@gmail.com-20081020125254-e70gjdmt04l0e87r --- addons/account/report/account_balance.rml | 32 ++++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index cfabf9d545f..8178d8fa399 100755 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -42,7 +42,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -80,6 +80,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + [[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['jname'] or removeParentNode('tr') ]] - [[ a['level']<4 and removeParentNode('font') or '...'*(2) ]][[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][ref: [[ a['ref'] or removeParentNode('font') ]] ] [[ a['lname'] ]] + [[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]] [[ setTag('tr','tr',{'style':('TrLevel_Name'+str(a['level']))}) ]][ref: [[ a['ref'] or removeParentNode('font') ]] ] [[ a['lname'] ]] [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '0.00']] [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '0.00']] [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '0.00' ]] @@ -277,4 +302,3 @@ - From 2419a46d91d440389d73008db1a49e6e8f728466 Mon Sep 17 00:00:00 2001 From: "hda@tinyerp.com" <> Date: Mon, 20 Oct 2008 18:32:18 +0530 Subject: [PATCH 5/6] Improved database Installation wizard and remove unusual menus bzr revid: hda@tinyerp.com-20081020130218-8dtpjf16uzbdhuqq --- .../aso_vertical_view.xml | 14 +++---- addons/base_setup/wizard/wizard_base_setup.py | 38 ++++++++++++++++--- addons/membership/membership_view.xml | 2 +- 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/addons/association_vertical/aso_vertical_view.xml b/addons/association_vertical/aso_vertical_view.xml index cb810f113d1..219cea03776 100644 --- a/addons/association_vertical/aso_vertical_view.xml +++ b/addons/association_vertical/aso_vertical_view.xml @@ -6,15 +6,15 @@ - + - +