From b92702c9aa4c86a1a79e3db6abad515682c5ae0b Mon Sep 17 00:00:00 2001 From: pso Date: Mon, 1 Nov 2010 15:26:38 +0530 Subject: [PATCH 01/26] [FIX] hr_timesheet_sheet: Fixed overlapping error of timesheet lp bug: https://launchpad.net/bugs/669360 fixed bzr revid: pso@tinyerp.com-20101101095638-2wsfuilu01almz6l --- .../hr_timesheet_sheet/hr_timesheet_sheet_demo.xml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml index a4b4b434da6..daaa55fc6a1 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml @@ -1,8 +1,9 @@ - - Sheet 0 + + + Sheet 1 @@ -10,12 +11,5 @@ - - Sheet 1 - - - - - From 448fc93683d50ea0e18d2d0b15246d3069a99f65 Mon Sep 17 00:00:00 2001 From: vth Date: Mon, 1 Nov 2010 18:16:06 +0530 Subject: [PATCH 02/26] [IMP] account,hr,sale,point_of_sale,event: give user role to the demo user bzr revid: vth@tinyerp.com-20101101124606-ia3nqngu19u8b7oa --- addons/account_accountant/security/account_security.xml | 3 +++ addons/event/security/event_security.xml | 4 +++- addons/hr/security/hr_security.xml | 4 +++- addons/point_of_sale/security/point_of_sale_security.xml | 4 +++- addons/sale/security/sale_security.xml | 6 +++++- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml index 0d6006fd9b0..df2291446c8 100644 --- a/addons/account_accountant/security/account_security.xml +++ b/addons/account_accountant/security/account_security.xml @@ -6,5 +6,8 @@ + + + diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml index 4415b11a8e4..d98202c2aea 100644 --- a/addons/event/security/event_security.xml +++ b/addons/event/security/event_security.xml @@ -17,7 +17,9 @@ Sales / User - + + + diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index 4f7691f03e9..b9df79abdd9 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -9,6 +9,8 @@ Human Resources / User - + + + diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml index d70fd1caa85..56e92a468e7 100644 --- a/addons/point_of_sale/security/point_of_sale_security.xml +++ b/addons/point_of_sale/security/point_of_sale_security.xml @@ -8,6 +8,8 @@ Point of Sale / User - + + + diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index 27852979773..209870711f2 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -12,11 +12,15 @@ - + + + + + Sale Order multi-company From a993412a9afe61e602ebae2cf82d17f39a12dce0 Mon Sep 17 00:00:00 2001 From: vth Date: Tue, 2 Nov 2010 12:34:53 +0530 Subject: [PATCH 03/26] [IMP] hr_holidays: Reporting/Dashboard/Human Resources Dashboard put a column allocated leaves instead of remaining leaves and change the string bzr revid: vth@tinyerp.com-20101102070453-qkfg0x7vhvl43rt7 --- addons/hr_holidays/report/available_holidays_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml index d590af5a430..60f47fb656a 100644 --- a/addons/hr_holidays/report/available_holidays_view.xml +++ b/addons/hr_holidays/report/available_holidays_view.xml @@ -34,8 +34,8 @@ - - + + From e8ec3efe69dca9f3ce200e5b36627db95b96b40a Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Tue, 2 Nov 2010 12:34:55 +0530 Subject: [PATCH 04/26] [ADD] account_* : help added for menus bzr revid: vir@tinyerp.com-20101102070455-obn9kosyhajipnur --- addons/account/account_end_fy.xml | 2 +- addons/account/account_view.xml | 1 + addons/account/wizard/account_fiscalyear_close_state.xml | 1 + addons/account/wizard/account_validate_move_view.xml | 1 + addons/account_budget/account_budget_view.xml | 1 + addons/account_payment/account_payment_view.xml | 1 + addons/sale_margin/report/report_margin_view.xml | 1 + 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml index d0c966898d6..5f4ed44adfe 100644 --- a/addons/account/account_end_fy.xml +++ b/addons/account/account_end_fy.xml @@ -8,7 +8,7 @@ form {'search_default_draft': 1} - After closing a period, you will no longer be able to post entries to the period once it has been closed. + A period is a fiscal period of time during which accounting entries should be recorded for accounting related activities. Monthly period is the norm but depending on your countries or company needs, you could also have quarterly periods. Closing a period will make it impossible to record new accounting entries, all new entries should then be made on the following open period. Close a period when you do not want to record new entries and want to lock this period for tax related calculation. form tree,form + A recurring entry is a payment related entry that occurs on a recurrent basis from a specific date corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create them in the system in order to automate their entries in the system. tree,form new + If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive. {'record_id' : active_id} new + This wizard will validate all journal entries of a particular journal and period. Once journal entries are validated, you can not update them anymore. diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 414c4cbfde1..3915463d8a2 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -192,6 +192,7 @@ tree,form + A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period. form tree,form + A payment order is a payment request that your company does in order to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for. diff --git a/addons/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml index c25f6d91ba2..fdc624b36ae 100644 --- a/addons/sale_margin/report/report_margin_view.xml +++ b/addons/sale_margin/report/report_margin_view.xml @@ -88,6 +88,7 @@ tree,graph {"search_default_At Date":1,'group_by_no_leaf':1,'group_by':[]} + This report gives you an overview of all the invoices generated by the system. You can sort and group your results by specific selection criteria to quickly find what you are looking for. From f943acfa3702f01fdf9706c676422fee6dbe481d Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 2 Nov 2010 13:01:48 +0530 Subject: [PATCH 05/26] [FIX] Account: account creation wizard doesn't take selected company into account properly lp bug: https://launchpad.net/bugs/651421 fixed bzr revid: mra@mra-laptop-20101102073148-3qiz4qxz2dijyap5 --- addons/account/installer.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/addons/account/installer.py b/addons/account/installer.py index 74f262d0cea..72060a3c541 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -263,6 +263,7 @@ class account_installer(osv.osv_memory): 'name': _('Bank Journal '), 'code': 'account.journal', 'prefix': 'BNK/%(year)s/', + 'company_id': company_id.id, 'padding': 5 } seq_id = obj_sequence.create(cr, uid, vals_seq, context=context) @@ -275,6 +276,7 @@ class account_installer(osv.osv_memory): 'code': _('BNK'), 'sequence_id': seq_id, 'type': 'bank', + 'company_id': company_id.id, 'analytic_journal_id': analitical_journal_bank } if vals.get('currency_id', False): @@ -327,6 +329,7 @@ class account_installer(osv.osv_memory): 'code': _(vals_bnk['name'][:3]).upper(), 'sequence_id': seq_id, 'type': 'cash', + 'company_id': company_id.id } if vals.get('currency_id', False): vals_journal.update({ @@ -366,28 +369,32 @@ class account_installer(osv.osv_memory): 'name': 'Sale Journal', 'code': 'account.journal', 'prefix': 'SAJ/%(year)s/', - 'padding': 3 + 'padding': 3, + 'company_id': company_id.id } seq_id_sale = obj_sequence.create(cr, uid, seq_sale, context=context) seq_purchase = { 'name': 'Purchase Journal', 'code': 'account.journal', 'prefix': 'EXJ/%(year)s/', - 'padding': 3 + 'padding': 3, + 'company_id': company_id.id } seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase, context=context) seq_refund_sale = { 'name': 'Sales Refund Journal', 'code': 'account.journal', 'prefix': 'SCNJ/%(year)s/', - 'padding': 3 + 'padding': 3, + 'company_id': company_id.id } seq_id_sale_refund = obj_sequence.create(cr, uid, seq_refund_sale, context=context) seq_refund_purchase = { 'name': 'Purchase Refund Journal', 'code': 'account.journal', 'prefix': 'ECNJ/%(year)s/', - 'padding': 3 + 'padding': 3, + 'company_id': company_id.id } seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase, context=context) else: @@ -407,7 +414,8 @@ class account_installer(osv.osv_memory): 'type': 'sale', 'code': _('SAJ'), 'sequence_id': seq_id_sale, - 'analytic_journal_id': analitical_journal_sale + 'analytic_journal_id': analitical_journal_sale, + 'company_id': company_id.id }) if obj_multi.property_account_receivable: @@ -426,7 +434,8 @@ class account_installer(osv.osv_memory): 'type': 'purchase', 'code': _('EXJ'), 'sequence_id': seq_id_purchase, - 'analytic_journal_id': analitical_journal_purchase + 'analytic_journal_id': analitical_journal_purchase, + 'company_id': company_id.id }) if obj_multi.property_account_payable: @@ -450,7 +459,8 @@ class account_installer(osv.osv_memory): 'refund_journal': True, 'code': _('SCNJ'), 'sequence_id': seq_id_sale_refund, - 'analytic_journal_id': analitical_journal_sale + 'analytic_journal_id': analitical_journal_sale, + 'company_id': company_id.id } if obj_multi.property_account_receivable: vals_journal.update({ @@ -468,7 +478,8 @@ class account_installer(osv.osv_memory): 'refund_journal': True, 'code': _('ECNJ'), 'sequence_id': seq_id_purchase_refund, - 'analytic_journal_id': analitical_journal_purchase + 'analytic_journal_id': analitical_journal_purchase, + 'company_id': company_id.id } if obj_multi.property_account_payable: From 048486acec5a56394c3242e6169228eeb636399d Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 2 Nov 2010 14:01:53 +0530 Subject: [PATCH 06/26] [FIX] Account: now We can open Accounts where type=Regular for the Reserve & Profit&loss account field on company lp bug: https://launchpad.net/bugs/551630 fixed bzr revid: mra@mra-laptop-20101102083153-wbpr6wv9acojsdyu --- addons/account/company.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/company.py b/addons/account/company.py index 0a3cc15663a..72b3dbcb6aa 100644 --- a/addons/account/company.py +++ b/addons/account/company.py @@ -32,7 +32,7 @@ class res_company(osv.osv): string="Reserve and Profit/Loss Account", method=True, view_load=True, - domain="[('type', '=', 'payable')]", + domain="[('type', '=', 'other')]", help="This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profit & Loss Report"), } From a36a5cd576a6a73616d2e9e8b1314c9be8aecfa4 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Tue, 2 Nov 2010 10:29:54 +0100 Subject: [PATCH 07/26] [IMP] base, res_lang: very small usability improvement in form view (colspan=4 on a separator) bzr revid: qdp-launchpad@tinyerp.com-20101102092954-hk20xruzgnn8m7q4 --- bin/addons/base/res/res_lang_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/addons/base/res/res_lang_view.xml b/bin/addons/base/res/res_lang_view.xml index cbe5fb388ba..839915a56a5 100644 --- a/bin/addons/base/res/res_lang_view.xml +++ b/bin/addons/base/res/res_lang_view.xml @@ -76,7 +76,7 @@ - +