From f7e4fb31924832b021c7e27379d5599bcf2fa51e Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Wed, 9 Feb 2011 16:45:37 +0530 Subject: [PATCH 001/164] [FIX] base_action_rule: Encoding trouble in mail_message parsing and base_action_rule processin lp bug: https://launchpad.net/bugs/921442 fixed bzr revid: kjo@tinyerp.com-20110209111537-xh7tcqqo50xfoty1 --- addons/base_action_rule/base_action_rule.py | 5 +++-- addons/crm/crm_action_rule.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 249fea89e0e..25885598f89 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -28,6 +28,7 @@ import pooler import re import time import tools +from openerp.loglevels import ustr def get_datetime(date_field): @@ -369,8 +370,8 @@ the rule to mark CC(mail to any other person defined in actions)."), reg_name = action.regex_name result_name = True if reg_name: - ptrn = re.compile(str(reg_name)) - _result = ptrn.search(str(obj.name)) + ptrn = re.compile(ustr(reg_name)) + _result = ptrn.search(ustr(obj.name)) if not _result: result_name = False regex_n = not reg_name or result_name diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index 3947eb58156..27ee6e49d6f 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -27,6 +27,7 @@ from osv import fields from osv import osv import crm +from openerp.loglevels import ustr class base_action_rule(osv.osv): """ Base Action Rule """ @@ -73,9 +74,9 @@ class base_action_rule(osv.osv): regex = action.regex_history if regex: res = False - ptrn = re.compile(str(regex)) + ptrn = re.compile(ustr(regex)) for history in obj.message_ids: - _result = ptrn.search(str(history.name)) + _result = ptrn.search(ustr(history.subject)) if _result: res = True break From d081af362cb00b376753121e24ae6d49944c0fa7 Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Tue, 21 Feb 2012 18:42:38 +0530 Subject: [PATCH 002/164] [FIX] mail: remove the unused charector from the message body using filter. bzr revid: nco@tinyerp.com-20120221131238-czel3dz0b51ac2dz --- addons/mail/mail_message.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 1693397f6fa..1d84468ca85 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -441,7 +441,8 @@ class mail_message(osv.osv): if part.get_content_subtype() == 'html': msg['body_html'] = content msg['subtype'] = 'html' # html version prevails - body = tools.ustr(tools.html2plaintext(content)) + #this filter will remove " " unused charector which generaed by space + body = filter(lambda c: c not in " ", tools.ustr(tools.html2plaintext(content))) elif part.get_content_subtype() == 'plain': body = content elif part.get_content_maintype() in ('application', 'image'): From 3df9fa50fb133cf4ec3539e7a1bc6dd53770a463 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 22 Feb 2012 11:26:39 +0100 Subject: [PATCH 003/164] [IMP] try to terminate all postgresql backends connected to a database before dropping it bzr revid: chs@openerp.com-20120222102639-q19kiykopb3b3qu0 --- openerp/service/web_services.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py index a7136e24269..8fed25cf226 100644 --- a/openerp/service/web_services.py +++ b/openerp/service/web_services.py @@ -173,6 +173,8 @@ class db(netsvc.ExportService): raise Exception, e def exp_drop(self, db_name): + if not self.exp_db_exist(db_name): + return False openerp.modules.registry.RegistryManager.delete(db_name) sql_db.close_db(db_name) @@ -180,6 +182,13 @@ class db(netsvc.ExportService): cr = db.cursor() cr.autocommit(True) # avoid transaction block try: + try: + cr.execute('SELECT DISTINCT procpid FROM pg_stat_activity WHERE datname=%s', (db_name,)) + for procpid, in cr.fetchall(): + cr.execute('SELECT pg_terminate_backend(%d)' % (procpid,)) + except Exception: + pass + try: cr.execute('DROP DATABASE "%s"' % db_name) except Exception, e: From 3490275dc06fd4cf902ca60035a7418e17fbb85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9cile=20Tonglet?= Date: Wed, 22 Feb 2012 12:40:09 +0100 Subject: [PATCH 004/164] [REF] Clean up of tools.graph bzr revid: cto@openerp.com-20120222114009-nyalbc7uyelf54f0 --- openerp/tools/graph.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/openerp/tools/graph.py b/openerp/tools/graph.py index b54e101eec4..9ad1f34e91f 100755 --- a/openerp/tools/graph.py +++ b/openerp/tools/graph.py @@ -438,26 +438,19 @@ class graph(object): l.reverse() no = len(l) - if no%2==0: - first_half = l[no/2:] - factor = 1 - else: - first_half = l[no/2+1:] - factor = 0 - + rest = no%2 + first_half = l[no/2+rest:] last_half = l[:no/2] - i=1 - for child in first_half: - self.result[child]['y'] = mid_pos - (i - (factor * 0.5)) - i += 1 + for i, child in enumerate(first_half): + self.result[child]['y'] = mid_pos - (i+1 - (0 if rest else 0.5)) if self.transitions.get(child, False): if last: self.result[child]['y'] = last + len(self.transitions[child])/2 + 1 last = self.tree_order(child, last) - if no%2: + if rest: mid_node = l[no/2] self.result[mid_node]['y'] = mid_pos @@ -474,7 +467,7 @@ class graph(object): i=1 last_child = None for child in last_half: - self.result[child]['y'] = mid_pos + (i - (factor * 0.5)) + self.result[child]['y'] = mid_pos + (i - (0 if rest else 0.5)) last_child = child i += 1 if self.transitions.get(child, False): From 9a639793bf75848402afcd65d5a5939437e03d07 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Wed, 22 Feb 2012 15:41:02 +0100 Subject: [PATCH 005/164] [ADD] Set specific taxes on sales and purchase accounts [ADD] Set default taxes using sequence [FIX] Set negative sign on taxes for refund transactions [FIX] Set refund tax account same as regular tax account [ADD] Add reserve/pl property bzr revid: stefan@therp.nl-20120222144102-u7iuub1g27tzpduf --- addons/l10n_nl/account_chart_netherlands.xml | 263 +++++++++++++++++-- 1 file changed, 245 insertions(+), 18 deletions(-) diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml index ee8997b09e4..d548e13b278 100644 --- a/addons/l10n_nl/account_chart_netherlands.xml +++ b/addons/l10n_nl/account_chart_netherlands.xml @@ -4100,6 +4100,7 @@ + @@ -4177,12 +4187,15 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + sale + 10 @@ -4193,10 +4206,13 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + purchase + 5 @@ -4205,10 +4221,13 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + purchase + 2 @@ -4217,10 +4236,13 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + purchase + 10 @@ -4230,10 +4252,13 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + purchase + 10 @@ -4242,11 +4267,14 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + purchase + 10 @@ -4255,10 +4283,13 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + purchase + 10 @@ -4267,10 +4298,13 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + purchase + 10 @@ -4279,11 +4313,14 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + purchase + 10 @@ -4292,10 +4329,13 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + purchase + 10 @@ -4304,10 +4344,13 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + purchase + 10 @@ -4320,7 +4363,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4332,7 +4378,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4344,7 +4393,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4355,7 +4407,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4367,7 +4422,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4379,7 +4437,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4390,7 +4451,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4402,7 +4466,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4414,7 +4481,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4424,10 +4494,13 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + sale + 10 @@ -4436,10 +4509,13 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + sale + 10 @@ -4453,7 +4529,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4465,7 +4544,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4477,7 +4559,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4488,7 +4573,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4500,7 +4588,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4512,7 +4603,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4523,7 +4617,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4535,7 +4632,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 @@ -4547,8 +4647,12 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge + + purchase + 10 + @@ -4557,10 +4661,133 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge percent - + + + sale + 10 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4a87cc055d365ec4d9063805ebcebf7050c0d5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9cile=20Tonglet?= Date: Wed, 22 Feb 2012 16:16:53 +0100 Subject: [PATCH 006/164] [FIX] infinte loops in tools.graph lp bug: https://launchpad.net/bugs/932830 fixed bzr revid: cto@openerp.com-20120222151653-ucftpis7zh9kman5 --- openerp/tools/graph.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openerp/tools/graph.py b/openerp/tools/graph.py index 9ad1f34e91f..1b039ce97c6 100755 --- a/openerp/tools/graph.py +++ b/openerp/tools/graph.py @@ -313,7 +313,8 @@ class graph(object): self.order[level] = self.order[level]+1 for sec_end in self.transitions.get(node, []): - self.init_order(sec_end, self.result[sec_end]['x']) + if node!=sec_end: + self.init_order(sec_end, self.result[sec_end]['x']) def order_heuristic(self): @@ -457,7 +458,8 @@ class graph(object): if self.transitions.get((mid_node), False): if last: self.result[mid_node]['y'] = last + len(self.transitions[mid_node])/2 + 1 - last = self.tree_order(mid_node) + if node!=mid_node: + last = self.tree_order(mid_node) else: if last: self.result[mid_node]['y'] = last + 1 @@ -473,7 +475,8 @@ class graph(object): if self.transitions.get(child, False): if last: self.result[child]['y'] = last + len(self.transitions[child])/2 + 1 - last = self.tree_order(child, last) + if node!=child: + last = self.tree_order(child, last) if last_child: last = self.result[last_child]['y'] From e6131b194f8a51508b8044b772961593d72ed3bc Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Thu, 23 Feb 2012 11:10:22 +0530 Subject: [PATCH 007/164] [FIX] mail: remove the unused charector generated by the html2plaintext function from the message. bzr revid: nco@tinyerp.com-20120223054022-9l9hxv3ssiajdf9p --- addons/mail/mail_message.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 1d84468ca85..dc372aec84a 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -441,8 +441,8 @@ class mail_message(osv.osv): if part.get_content_subtype() == 'html': msg['body_html'] = content msg['subtype'] = 'html' # html version prevails - #this filter will remove " " unused charector which generaed by space - body = filter(lambda c: c not in " ", tools.ustr(tools.html2plaintext(content))) + body = tools.ustr(tools.html2plaintext(content)) + body = body.replace(' ', '') elif part.get_content_subtype() == 'plain': body = content elif part.get_content_maintype() in ('application', 'image'): From ff3c7d5002b01ed2f26b93e68ab8184857d68efb Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Thu, 23 Feb 2012 13:20:12 +0530 Subject: [PATCH 008/164] [IMP]Project_*: Remove the default filter on list view from all Project module bzr revid: jap@tinyerp.com-20120223075012-yw00m819wphgpsgw --- addons/project/project_view.xml | 4 ++-- addons/project_issue/project_issue_menu.xml | 2 +- addons/project_long_term/project_long_term_view.xml | 4 ++-- addons/project_scrum/project_scrum_view.xml | 6 +++--- addons/project_timesheet/project_timesheet_view.xml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 26abe86fe99..ed37361e463 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -173,7 +173,7 @@ tree,form,gantt - {'search_default_Current':1} + {} A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section. @@ -525,7 +525,7 @@ kanban,tree,form,calendar,gantt,graph - {"search_default_draft": 1, "search_default_open":1, "search_default_project_id": project_id} + {"search_default_project_id": project_id} A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed. diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml index 9d88418720b..8b5f2045684 100644 --- a/addons/project_issue/project_issue_menu.xml +++ b/addons/project_issue/project_issue_menu.xml @@ -11,7 +11,7 @@ kanban,tree,calendar - {"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1, "search_default_project_id":project_id} + {"search_default_user_id": uid, "search_default_project_id":project_id} Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com) diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 23ae8139bea..3388d42de0c 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -252,7 +252,7 @@ project.phase form gantt,tree,form,calendar - {"search_default_current": 1} + {} A project can be split into the different phases. For each phase, you can define your users allocation, describe different tasks and link your phase to previous and next phases, add date constraints for the automated scheduling. Use the long term planning in order to planify your available users, convert your phases into a series of tasks when you start working on the project. @@ -262,7 +262,7 @@ project.phase form tree,form,calendar - {"search_default_current": 1} + {} diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index 7dc2cc1d4f0..8c5342aaaa4 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -178,7 +178,7 @@ Product Backlogs project.scrum.product.backlog form - {'search_default_current':1, 'search_default_user_id':uid,'search_default_project_id':project_id} + {'search_default_user_id':uid,'search_default_project_id':project_id} The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a development sprint and may be split into several tasks. The product backlog is managed by the product owner of the project. @@ -349,7 +349,7 @@ form tree,form,calendar - {"search_default_current": 1} + {} The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (e.g. one month) during which the team implements a list of product backlogs. The sprint review is organized when the team presents its work to the customer and product owner. @@ -450,7 +450,7 @@ project.scrum.meeting form tree,form,calendar - {'search_default_scrum_daily':1,'search_default_project_id':project_id} + {'search_default_project_id':project_id} The scrum agile methodology is used in software development projects. In this methodology, a daily meeting is organized by the scrum master with his team in order to detect the difficulties the team faced/will face. diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 07873c00592..b850a5e65c8 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -84,7 +84,7 @@ form tree,form [] - {'search_default_to_invoice': 1} + {} You will find here all works made on tasks that you can invoice. In order to invoice the time spent on a project, you must define the @@ -112,7 +112,7 @@ the project form. account.analytic.account form tree,form,graph - {'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1} + {} [('type','=','normal')] You will find here the contracts related to your customer projects in order to track the invoicing progress. From 5356d3f51cc39bd94acfa1a1a6dd08fe4c6a2a04 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 11:29:28 +0530 Subject: [PATCH 009/164] [IMP] sale:-changed menu name from 'Lines to invoice' to 'Order Lines to Invoice' bzr revid: mtr@tinyerp.com-20120224055928-9se9bmscasfboyep --- addons/sale/sale_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 90d3838f5a0..dc454d1c2a7 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -461,7 +461,7 @@ - Lines to Invoice + Order Lines to Invoice ir.actions.act_window sale.order.line form From 8701f17b7639c522ef056780558634a8f0997cb9 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 11:42:20 +0530 Subject: [PATCH 010/164] [IMP] account_analytic_analysis:-changed menu name from 'All Uninvoiced Entries' to 'Time & Costs to Invoice' bzr revid: mtr@tinyerp.com-20120224061220-29ldf0bhgjdrymoe --- .../account_analytic_analysis_menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 86f437ae8bd..1577ecdc3f3 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -3,7 +3,7 @@ - All Uninvoiced Entries + Time & Costs to Invoice account.analytic.line form tree,form From ce1f236f19b34d3643fcff9f894ce97dc4718eeb Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 11:49:40 +0530 Subject: [PATCH 011/164] [IMP] import_google:-reorganised 'Import Google Calendar' and 'Import Google Contacts' menu bzr revid: mtr@tinyerp.com-20120224061940-sqpeum2luvpk29m9 --- addons/import_google/wizard/import_google_data_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml index b35e97645e7..fe099a3cb71 100644 --- a/addons/import_google/wizard/import_google_data_view.xml +++ b/addons/import_google/wizard/import_google_data_view.xml @@ -78,12 +78,12 @@ From 59c177ea67ff64e6a27660c788d0bcf0fa8b221e Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 11:53:31 +0530 Subject: [PATCH 012/164] [IMP] wiki_sale_faq:-changed menu name from Documents->Sales Documents and FAQ->Sales FAQ bzr revid: mtr@tinyerp.com-20120224062331-b3c7v5h1apvqpamf --- addons/wiki_sale_faq/wiki_sale_faq_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml index 9fdaafd96b9..b43649af23a 100644 --- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml +++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml @@ -27,13 +27,13 @@ From 5f92d68c5da18fd7a341f3b7aab3c4e873b713a3 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 14:54:50 +0530 Subject: [PATCH 013/164] [IMP] crm,crm_caldav,import_base,import_google,import_crm:-reorganised the menus(i.e.Meetings,Import) and created 'Import & Synchronize' menu bzr revid: mtr@tinyerp.com-20120224092450-ew4oai64n9ziqt3z --- addons/crm/crm_meeting_menu.xml | 7 +++++-- addons/crm_caldav/crm_caldav_view.xml | 10 +++++----- addons/import_base/import_base_view.xml | 2 +- .../import_google/wizard/import_google_data_view.xml | 4 ++-- addons/import_sugarcrm/import_sugarcrm_view.xml | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index af50149f693..6f29970b492 100644 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -90,9 +90,12 @@ + + + action="crm_case_categ_meet" parent="base.menu_sales" + sequence="20" /> Meeting Invitations diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml index a610095d6a6..ad0d8cde2ad 100644 --- a/addons/crm_caldav/crm_caldav_view.xml +++ b/addons/crm_caldav/crm_caldav_view.xml @@ -11,14 +11,14 @@ form new - + - - + parent="base.menu_import_crm" sequence="1"/> + + - + diff --git a/addons/import_base/import_base_view.xml b/addons/import_base/import_base_view.xml index 1368b50b6e4..3f10a462507 100644 --- a/addons/import_base/import_base_view.xml +++ b/addons/import_base/import_base_view.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml index fe099a3cb71..510160c6247 100644 --- a/addons/import_google/wizard/import_google_data_view.xml +++ b/addons/import_google/wizard/import_google_data_view.xml @@ -78,12 +78,12 @@ diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml index 3c1f9df60fb..4b0b9d295e9 100644 --- a/addons/import_sugarcrm/import_sugarcrm_view.xml +++ b/addons/import_sugarcrm/import_sugarcrm_view.xml @@ -98,7 +98,7 @@ - + From 5433875477294e190ac06ada25a9bf9bb98fdac4 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 15:59:41 +0530 Subject: [PATCH 014/164] [IMP] crm:-commented 'Meetings' and 'Meeting Invitations' menu bzr revid: mtr@tinyerp.com-20120224102941-avqqkxwtro4vrk81 --- addons/crm/crm_meeting_menu.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index 6f29970b492..03d9737f403 100644 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -87,8 +87,8 @@ - + @@ -109,10 +109,10 @@ With Meeting Invitations you can create and manage the meeting invitations sent/to be sent to your colleagues/partners. You can not only invite OpenERP users, but also external parties, such as a customer. - + groups="base.group_no_one" /> --> From 495face5871ffdb320af475b23269d7379c74517 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 16:08:30 +0530 Subject: [PATCH 015/164] [IMP] sale:-added 'Customers','Contacts' and 'Quotations' menu under Sales. bzr revid: mtr@tinyerp.com-20120224103830-o0xc2wu6xlugr8yu --- addons/sale/sale_view.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index dc454d1c2a7..849f5958066 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -8,6 +8,12 @@ parent="base.menu_base_partner" sequence="1" /> + + + @@ -319,7 +325,7 @@ - All Quotations + Quotations ir.actions.act_window sale.order form @@ -328,6 +334,10 @@ + + Old Quotations ir.actions.act_window From f2c5f1a03c7a63f84cafc429d99baf8aab2e2b40 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 16:12:51 +0530 Subject: [PATCH 016/164] [IMP] account_analytic_analysis,crm,crm_todo,sale:-reorganised sequence of menus falling under the Sales menu(base.menu_sales) bzr revid: mtr@tinyerp.com-20120224104251-gvaxno1qh76ss0ep --- .../account_analytic_analysis_menu.xml | 2 +- addons/crm/crm_meeting_menu.xml | 2 +- addons/crm_todo/crm_todo_view.xml | 3 ++- addons/sale/sale_view.xml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 1577ecdc3f3..6d3e047fcfc 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -81,7 +81,7 @@ - + diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index 03d9737f403..04aa133b556 100644 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -95,7 +95,7 @@ + sequence="7" /> Meeting Invitations diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml index c098f908b8a..a587463fedb 100644 --- a/addons/crm_todo/crm_todo_view.xml +++ b/addons/crm_todo/crm_todo_view.xml @@ -57,7 +57,8 @@ + action="crm_todo_action" + sequence="5"/> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 849f5958066..9235d2a47e9 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -300,7 +300,7 @@ {} Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer. - + Sales in Exception From dbeaa1a5502b439b481c4183f432d93d140e8fd7 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 17:05:18 +0530 Subject: [PATCH 017/164] [IMP] account_analytic_analysis,crm_caldav,import_*,sale,stock_planning:-reorganised sequences of menus 'Invoicing','Sales Forecast','Import&Synchronise' bzr revid: mtr@tinyerp.com-20120224113518-9p2z43mxgfz1anaq --- .../account_analytic_analysis_menu.xml | 2 +- addons/crm_caldav/crm_caldav_view.xml | 2 +- addons/import_base/import_base_view.xml | 2 +- addons/import_google/wizard/import_google_data_view.xml | 4 ++-- addons/import_sugarcrm/import_sugarcrm_view.xml | 2 +- addons/sale/sale_view.xml | 2 +- addons/stock_planning/stock_planning_view.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 6d3e047fcfc..964383246dd 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -11,7 +11,7 @@ {'search_default_to_invoice': 1} - + account.analytic.account.search diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml index ad0d8cde2ad..e33f56dd036 100644 --- a/addons/crm_caldav/crm_caldav_view.xml +++ b/addons/crm_caldav/crm_caldav_view.xml @@ -17,7 +17,7 @@ action="action_caldav_browse" id="menu_caldav_browse" icon="STOCK_EXECUTE" - parent="base.menu_import_crm" sequence="1"/> + parent="base.menu_import_crm" sequence="10"/> diff --git a/addons/import_base/import_base_view.xml b/addons/import_base/import_base_view.xml index 3f10a462507..8d4735be00a 100644 --- a/addons/import_base/import_base_view.xml +++ b/addons/import_base/import_base_view.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml index 510160c6247..4a5096c38a4 100644 --- a/addons/import_google/wizard/import_google_data_view.xml +++ b/addons/import_google/wizard/import_google_data_view.xml @@ -80,12 +80,12 @@ + sequence="5" /> + sequence="15" /> diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml index 4b0b9d295e9..f90451c69f5 100644 --- a/addons/import_sugarcrm/import_sugarcrm_view.xml +++ b/addons/import_sugarcrm/import_sugarcrm_view.xml @@ -98,7 +98,7 @@ - + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 9235d2a47e9..852cef1f2f1 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -509,7 +509,7 @@ groups="base.group_sale_salesman"/> - + diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml index 3cbee4d53d8..1dc6b88e3fc 100644 --- a/addons/stock_planning/stock_planning_view.xml +++ b/addons/stock_planning/stock_planning_view.xml @@ -184,7 +184,7 @@ + parent="base.menu_base_partner" sequence="5" groups="base.group_extended"/> stock.sale.forecast.list.select From fbe9f81acfc34c1d651f57e2bd656a1689b04141 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 24 Feb 2012 18:30:20 +0530 Subject: [PATCH 018/164] [IMP] crm_caldav:-renamed menu Synchronize This Calendar=>Synchronize Your Meetings bzr revid: mtr@tinyerp.com-20120224130020-lbwt21go6jm9fsyj --- addons/crm_caldav/crm_caldav_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml index e33f56dd036..287e301532e 100644 --- a/addons/crm_caldav/crm_caldav_view.xml +++ b/addons/crm_caldav/crm_caldav_view.xml @@ -13,7 +13,7 @@ Date: Fri, 24 Feb 2012 18:34:00 +0530 Subject: [PATCH 019/164] [IMP] crm_claim,crm_helpdesk:- moved 'After-Sale Services' menu to project bzr revid: mtr@tinyerp.com-20120224130400-ovvxe5fnc50rd748 --- addons/crm_claim/crm_claim_menu.xml | 2 +- addons/crm_helpdesk/crm_helpdesk_menu.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index f33b6f7ad31..f5405cea5bb 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -4,7 +4,7 @@ + parent="base.menu_main_pm" sequence="7" /> diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 31ee27345b0..88388e4548f 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -2,7 +2,7 @@ + parent="base.menu_main_pm" sequence="7" /> From 2a6155b6b426d0289f3f1b453e916672582bd2fc Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 27 Feb 2012 10:11:08 +0530 Subject: [PATCH 020/164] [IMP] sale:-removed previously added 'Customer' and 'Contacts' menu from sale bzr revid: mtr@tinyerp.com-20120227044108-p7l72e5dl0rr1w02 --- addons/sale/sale_view.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 852cef1f2f1..93ac3b59c9f 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -8,12 +8,6 @@ parent="base.menu_base_partner" sequence="1" /> - - - From 2c5781c2c9de8ec111ecc85334b29e179d3ba3bf Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 27 Feb 2012 10:14:29 +0530 Subject: [PATCH 021/164] [IMP] sale:-removed 'Sales' menu bzr revid: mtr@tinyerp.com-20120227044429-a5n176n9vnpmahav --- addons/sale/sale_view.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 93ac3b59c9f..3789fb08b2a 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -4,10 +4,6 @@ id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/> - - From a5d3bbdbaa721ab19362a6a1f0a7c1630cc7cdbf Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Mon, 27 Feb 2012 10:45:16 +0530 Subject: [PATCH 022/164] [IMP] remove the default filter on list view in mrp_* module bzr revid: jap@tinyerp.com-20120227051516-7z4eqh76h2efhc0a --- addons/mrp/mrp_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 9c3fd6eb335..6dec0cf1396 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -834,7 +834,7 @@ tree,form,calendar,graph,gantt - {'search_default_ready':1} + {} Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumption of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed. Date: Mon, 27 Feb 2012 11:21:14 +0530 Subject: [PATCH 023/164] [IMP] purchase:-removed 'Address Book' menu, added 'Contacts' menu and reorganise 'Supplier' menu bzr revid: mtr@tinyerp.com-20120227055114-clf0yuvuuwqw1hei --- addons/purchase/purchase_view.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 1c936055aff..ba817ca4c13 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -82,11 +82,12 @@ - - + + - + purchase.order.tree purchase.order From e7408736975293c4b2e27ab48c407e1148ccdf3a Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 27 Feb 2012 12:48:13 +0530 Subject: [PATCH 024/164] [IMP] mrp:-renamed menu Manufacturing Orders => Orders Planning bzr revid: mtr@tinyerp.com-20120227071813-p9ez8j1y4ajtxr6l --- addons/mrp/mrp_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 9c3fd6eb335..84a4174452e 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -1022,7 +1022,7 @@ parent="base.menu_mrp_root" sequence="2" groups="base.group_extended"/> From cb5f74d139bde9041890c8e934e9a63f29baa2c8 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 27 Feb 2012 12:49:52 +0530 Subject: [PATCH 025/164] [IMP] mrp:-renamed menu Work Orders => Work Orders By Resource and removed 'Work Centers' from menu bzr revid: mtr@tinyerp.com-20120227071952-1df5e4ix6qzz5dy2 --- addons/mrp_operations/mrp_operations_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index c40b9611fb5..00b4947122e 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -261,17 +261,17 @@ id="menu_mrp_production_wc_order" action="mrp_production_wc_action_form" groups="base.group_extended" sequence="2"/> - - + groups="base.group_extended"/>--> From bb7489af1b5a7826e0956624c7b21f1438367c45 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Mon, 27 Feb 2012 14:01:47 +0530 Subject: [PATCH 026/164] [IMP] remove the default filter on list view in purchase_* module bzr revid: jap@tinyerp.com-20120227083147-j85viti2zhedmfb0 --- addons/purchase_requisition/purchase_requisition_view.xml | 2 +- addons/stock/stock_view.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index bd47d093df0..d6a736eea9c 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -166,7 +166,7 @@ purchase.requisition form tree,form - {"search_default_create_uid":uid,'search_default_draft': 1} + {"search_default_create_uid":uid} A purchase requisition is the step before a request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to suppliers. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others. diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 4264a488436..9895fd0bfa6 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1274,7 +1274,7 @@ form tree,form,calendar [('type','=','in')] - {'contact_display': 'partner_address',"search_default_available":1} + {'contact_display': 'partner_address'} The Incoming Shipments is the list of all orders you will receive from your suppliers. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially. @@ -1735,7 +1735,7 @@ tree,form ['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')] - + Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line. From 2db178061446bcc20be7f0e18e70f2e80aeb043f Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Mon, 27 Feb 2012 14:52:25 +0530 Subject: [PATCH 027/164] [IMP] remove the default filter on list view in stock_* module bzr revid: jap@tinyerp.com-20120227092225-wq3kqokatbtu0sks --- addons/stock/stock_view.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 4264a488436..cd9a34be973 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -406,7 +406,7 @@ form - {"search_default_available":1} + {} This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers. form tree,form,calendar [('type','=','out')] - {'default_type': 'out', 'contact_display': 'partner_address', 'search_default_confirmed': 1, 'search_default_available': 1} + {'default_type': 'out', 'contact_display': 'partner_address'} This is the list of all delivery orders that have to be prepared, according to your different sales orders and your logistics rules. @@ -1274,7 +1274,7 @@ form tree,form,calendar [('type','=','in')] - {'contact_display': 'partner_address',"search_default_available":1} + {'contact_display': 'partner_address'} The Incoming Shipments is the list of all orders you will receive from your suppliers. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially. @@ -1520,7 +1520,7 @@ form - {'search_default_ready':1} + {} This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product. @@ -1735,7 +1735,7 @@ tree,form ['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')] - + Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line. @@ -1870,7 +1870,7 @@ tree,form ['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')] - + You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field). From 694203ea012a7686c0b614b66dc85394d4ac3175 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 27 Feb 2012 16:29:16 +0530 Subject: [PATCH 028/164] [IMP] project_messages:- remove 'Project Messages' from menu bzr revid: mtr@tinyerp.com-20120227105916-wn2r4yupbedfo7t8 --- addons/project_messages/project_messages_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml index 85e2c02f8ff..127209c2e35 100644 --- a/addons/project_messages/project_messages_view.xml +++ b/addons/project_messages/project_messages_view.xml @@ -100,6 +100,6 @@ tree,form - + From 254655c205b80c31c8ff2748f764f0d19aaffe32 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 27 Feb 2012 16:31:38 +0530 Subject: [PATCH 029/164] [IMP] project_scrum:- reorganised the seq for 'Scrum' menu bzr revid: mtr@tinyerp.com-20120227110138-o101wffx3ufr2om1 --- addons/project_scrum/project_scrum_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index 7dc2cc1d4f0..33cf504c1ae 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -4,7 +4,7 @@ + parent="base.menu_main_pm" sequence="7"/> From d69e21b1bd6270dd1c13045e7a9af9ff8ad4a4bf Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 27 Feb 2012 16:35:35 +0530 Subject: [PATCH 030/164] [IMP] project_timesheet:- removed 'Time Tracking' menu bzr revid: mtr@tinyerp.com-20120227110535-pd2ao6kb2oxgoeh3 --- addons/project_timesheet/project_timesheet_data.xml | 8 ++++---- addons/project_timesheet/project_timesheet_view.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/project_timesheet/project_timesheet_data.xml b/addons/project_timesheet/project_timesheet_data.xml index 59a25c142b5..ed87cb8c65f 100644 --- a/addons/project_timesheet/project_timesheet_data.xml +++ b/addons/project_timesheet/project_timesheet_data.xml @@ -1,8 +1,8 @@ - - + + + diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 07873c00592..72550140470 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -101,11 +101,11 @@ the project form. parent="base.menu_main_pm" sequence="5"/> - + - + Customer Projects From 675e5ab272921565b8efacbe51710890257f574d Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 27 Feb 2012 16:37:35 +0530 Subject: [PATCH 031/164] [IMP] project_timesheet:- added 'Timesheets by Project' menu bzr revid: mtr@tinyerp.com-20120227110735-cqf07dj2196j0rbl --- .../project_timesheet/project_timesheet_view.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 72550140470..4f3559a179e 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -120,5 +120,19 @@ the project form. + + + + Timesheets by Project + ir.actions.act_window + hr_timesheet_sheet.sheet.account + form + + {} + + + + From 434294dfc452b018362d8c03e540216d35b5f0d3 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 27 Feb 2012 16:59:02 +0530 Subject: [PATCH 032/164] [IMP] crm_claim, crm_helpdesk:- reverted previously committed changes at revision 6638 for 'After-Sale Services' menu bzr revid: mtr@tinyerp.com-20120227112902-n6spkh8ha14x5090 --- addons/crm_claim/crm_claim_menu.xml | 2 +- addons/crm_helpdesk/crm_helpdesk_menu.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index f5405cea5bb..f33b6f7ad31 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -4,7 +4,7 @@ + parent="base.menu_base_partner" sequence="7" /> diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 88388e4548f..31ee27345b0 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -2,7 +2,7 @@ + parent="base.menu_base_partner" sequence="7" /> From eaf8ed3be2396d61a07baf615eec2ade0c972318 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Mon, 27 Feb 2012 18:17:13 +0530 Subject: [PATCH 033/164] [IMP] stock: renamed menu Warehouse Management=>Receive/Deliver By Orders and Products Moves => Receive/Deliver Products bzr revid: jap@tinyerp.com-20120227124713-64p5lvcjkmtax6w7 --- addons/stock/stock_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 4264a488436..95576d66e4e 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -6,8 +6,8 @@ groups="group_stock_manager,group_stock_user" sequence="5" web_icon="images/warehouse.png" web_icon_hover="images/warehouse-hover.png"/> - - + + From 2c1bb5c15d4b4b7863ac220ea12320c4327a48c7 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 10:35:36 +0530 Subject: [PATCH 034/164] [IMP] sale:- reorganised reporting menu bzr revid: mtr@tinyerp.com-20120228050536-h3riwk18q1zea7qi --- addons/sale/report/sale_report_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 5cc7c4f5ca1..4c1a85a7b86 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -128,8 +128,8 @@ This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application. - - + + From aa50b7dada3802cefdde69ccd349c837e5b1025c Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 10:50:06 +0530 Subject: [PATCH 035/164] [IMP] crm, crm_fundraising, crm_partner_assign:- reorganised sequences for reporting menu bzr revid: mtr@tinyerp.com-20120228052006-33b8ye99dneac3i4 --- addons/crm/report/crm_lead_report_view.xml | 4 ++-- addons/crm/report/crm_phonecall_report_view.xml | 2 +- .../report/crm_fundraising_report_view.xml | 2 +- addons/crm_partner_assign/report/crm_lead_report_view.xml | 8 ++++---- .../crm_partner_assign/report/crm_partner_report_view.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 32fbe65c337..b2cb3b1bfea 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -263,10 +263,10 @@ + parent="base.next_id_64" action="action_report_crm_lead" sequence="1"/> + parent="base.next_id_64" action="action_report_crm_opportunity" sequence="5"/> diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index e171388d08f..f745d93e3ef 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -157,7 +157,7 @@ + id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="15"/> diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml index 19334f2fe4c..46f989629d2 100644 --- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml +++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml @@ -191,7 +191,7 @@ + id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="30"/> diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml index a0bbd62c131..9f6546aee4a 100644 --- a/addons/crm_partner_assign/report/crm_lead_report_view.xml +++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml @@ -12,7 +12,7 @@ - - + graph - + + parent="base.next_id_64" action="action_report_crm_opportunity_assign" sequence="20"/> diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml index 528233fc183..e7581f5bab5 100644 --- a/addons/crm_partner_assign/report/crm_partner_report_view.xml +++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml @@ -77,7 +77,7 @@ + parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="25"/> From be40aa1a0e041fc7814cb79af78f23afac26e2fe Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 10:57:42 +0530 Subject: [PATCH 036/164] [IMP] association:- reorganise menu bzr revid: mtr@tinyerp.com-20120228052742-a0sdf7rebt27jjc2 --- addons/association/profile_association.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 5f81769eb1a..cca16c5ae48 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -9,6 +9,6 @@ web_icon="images/association.png" web_icon_hover="images/association-hover.png"/> - + From ab9ee8c65636065e43fd80d4d4ddfe53e1bd75a6 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 10:58:47 +0530 Subject: [PATCH 037/164] [IMP] marketing_campaign:- reorganise menu bzr revid: mtr@tinyerp.com-20120228052847-cvzip3xp1oi4n7ju --- addons/marketing_campaign/report/campaign_analysis_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml index 1bfdf69acf0..00ab20c9120 100644 --- a/addons/marketing_campaign/report/campaign_analysis_view.xml +++ b/addons/marketing_campaign/report/campaign_analysis_view.xml @@ -90,7 +90,7 @@ - + From da22720fc3eefb40c9b7872ce61863b2bd7b6840 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 11:02:47 +0530 Subject: [PATCH 038/164] [IMP] project:- reorganise menu bzr revid: mtr@tinyerp.com-20120228053247-jdkrt0ruyykvg016 --- addons/project/report/project_report_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 5af8706108f..82451081d83 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -2,10 +2,10 @@ - - + From d4eea48daeef3b038524b848449965b18f99582d Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 11:04:43 +0530 Subject: [PATCH 039/164] [IMP] mrp,stock,purchase:- changed reporting menu name and parent bzr revid: mtr@tinyerp.com-20120228053443-v1qbiuif0zwxghyo --- addons/mrp/report/mrp_report_view.xml | 4 ++-- addons/purchase/report/purchase_report_view.xml | 2 +- addons/stock/report/report_stock_move_view.xml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml index b7e51dd7cf0..6b011cab7da 100644 --- a/addons/mrp/report/mrp_report_view.xml +++ b/addons/mrp/report/mrp_report_view.xml @@ -41,8 +41,8 @@ - + diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 095f17090da..5640a100416 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -172,7 +172,7 @@ - diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 4f320ab58a9..c437caf16df 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -4,8 +4,8 @@ + name="Warehouse" + parent="base.menu_reporting"/> report.stock.move.tree @@ -261,7 +261,7 @@ Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company activities. From f29e557956a0f1523c4e460107081ee2015c2233 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 11:54:04 +0530 Subject: [PATCH 040/164] [IMP] board:- reorganise menu bzr revid: mtr@tinyerp.com-20120228062404-nbimt4p9k2r5ohbx --- addons/board/board_data_admin.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml index c5a51795425..8cefd04a3b7 100644 --- a/addons/board/board_data_admin.xml +++ b/addons/board/board_data_admin.xml @@ -160,8 +160,8 @@ - - + + From 7e8b94fc66a10d24dc2fa3a92c0622488937015f Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 12:07:05 +0530 Subject: [PATCH 041/164] [IMP] idea, lunch, survey:- changed reporting menu name and parent bzr revid: mtr@tinyerp.com-20120228063705-w74ykx2bnv6k6ib6 --- addons/idea/idea_view.xml | 2 +- addons/lunch/lunch_view.xml | 6 +++--- addons/survey/survey_view.xml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 23667069b79..612711897b3 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -384,7 +384,7 @@ - + diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index f695d994acd..2e4f62027a6 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -7,8 +7,8 @@ - - + diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 0f1a68145aa..1974cc25e5d 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -8,7 +8,7 @@ - + @@ -1167,14 +1167,14 @@ - - - Date: Tue, 28 Feb 2012 12:07:54 +0530 Subject: [PATCH 042/164] [IMP] hr, hr_timesheet_invoice:- changed reporting menu name and parent bzr revid: mtr@tinyerp.com-20120228063754-63bom71g5d943roa --- addons/hr/hr_board.xml | 2 +- .../report/hr_timesheet_invoice_report_view.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml index 977ca710e52..72c025bb581 100644 --- a/addons/hr/hr_board.xml +++ b/addons/hr/hr_board.xml @@ -25,7 +25,7 @@ - + diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index 33de63ba347..be090dfcdbb 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -3,8 +3,8 @@ From deb3f8cf872e265887af093dc75b16193037d380 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 12:09:26 +0530 Subject: [PATCH 043/164] [IMP] account:- changed reporting menu name and parent bzr revid: mtr@tinyerp.com-20120228063926-1v4ymh97xrw3y5x5 --- addons/account/account_menuitem.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 6c651405c92..ac7ee7b89b0 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -17,7 +17,7 @@ - + From 706836e5858de206da1202a0f33effc6dab9ac7e Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 12:09:54 +0530 Subject: [PATCH 044/164] [IMP] auction:- changed reporting menu name and parent bzr revid: mtr@tinyerp.com-20120228063954-lllxt1cpzsw842p0 --- addons/auction/auction_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 995ffa78959..c8ddbe59f78 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -770,7 +770,7 @@ - + Date: Tue, 28 Feb 2012 12:10:21 +0530 Subject: [PATCH 045/164] [IMP] point_of_sale:- changed reporting menu name and parent bzr revid: mtr@tinyerp.com-20120228064021-vwgm9430c1i1aj9m --- addons/point_of_sale/point_of_sale_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 5461bf690bd..4e5fa0a396e 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -748,7 +748,7 @@ - + From 9403e3327f16378b857e3b2b4d05f4563e1e58f2 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 12:45:26 +0530 Subject: [PATCH 046/164] [IMP] event:- changed parent of 'Events Analysis' to reporting->marketing bzr revid: mtr@tinyerp.com-20120228071526-r7hh2jka5b9dmsto --- addons/event/report/report_event_registration_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index ef69c674e43..bdd093565cc 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -144,7 +144,7 @@ - + From b734b0e75a39833eff00b2d5f0c63278cc22c3e1 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 15:08:31 +0530 Subject: [PATCH 047/164] [IMP] idea, lunch, survey:- changed menu sequence bzr revid: mtr@tinyerp.com-20120228093831-6hyp96wcwjptl5tw --- addons/idea/idea_view.xml | 2 +- addons/lunch/lunch_view.xml | 2 +- addons/survey/survey_view.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 612711897b3..f5784fe6ff4 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -384,7 +384,7 @@ - + diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 2e4f62027a6..4d7a976fd65 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -9,7 +9,7 @@ + id="menu_lunch_reporting_order" sequence="55" /> diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 1974cc25e5d..47c1bf4d025 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -8,7 +8,7 @@ - + From 6d88ea6dac03374da5840f3f7885d91d5e8b3b9c Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 15:12:09 +0530 Subject: [PATCH 048/164] [IMP] project_timesheet:-changed menu name and parent bzr revid: mtr@tinyerp.com-20120228094209-3lb4nmbwykc3tsjc --- addons/project_timesheet/report/task_report_view.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml index e24f604fbe6..b1ba9b8672e 100644 --- a/addons/project_timesheet/report/task_report_view.xml +++ b/addons/project_timesheet/report/task_report_view.xml @@ -3,8 +3,8 @@ @@ -43,7 +43,7 @@ + help="Task hours of last month"/> @@ -58,7 +58,7 @@ - + report.timesheet.task.user.graph report.timesheet.task.user @@ -71,7 +71,7 @@ - + Task Hours Per Month report.timesheet.task.user From 77d579560eb461359423b5c971f4e90450003428 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 15:17:41 +0530 Subject: [PATCH 049/164] [IMP] mrp,pos,purchase,stock:-changed menu sequence for reporting bzr revid: mtr@tinyerp.com-20120228094741-hnj7eces0fwquu7c --- addons/mrp/report/mrp_report_view.xml | 2 +- addons/point_of_sale/point_of_sale_view.xml | 2 +- addons/purchase/report/purchase_report_view.xml | 4 ++-- addons/stock/report/report_stock_move_view.xml | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml index 6b011cab7da..251eafc89ea 100644 --- a/addons/mrp/report/mrp_report_view.xml +++ b/addons/mrp/report/mrp_report_view.xml @@ -42,7 +42,7 @@ + parent="base.menu_reporting" sequence="20"/> diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 4e5fa0a396e..22ad2097ab7 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -748,7 +748,7 @@ - + diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 5640a100416..0ac69172612 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -172,7 +172,7 @@ - @@ -185,7 +185,7 @@ {'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,'search_default_year':1,} Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries. - + diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index c437caf16df..029e514c33e 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -5,6 +5,7 @@ From 0e0b9523d069936877c0b280750c60884ae9717e Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 15:20:26 +0530 Subject: [PATCH 050/164] [IMP] account, auction, hr, project:-changed menu sequence for reporting bzr revid: mtr@tinyerp.com-20120228095026-y9591tptbml7ec9u --- addons/account/account_menuitem.xml | 2 +- addons/auction/auction_view.xml | 2 +- addons/hr/hr_board.xml | 2 +- addons/project/report/project_report_view.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index ac7ee7b89b0..21d3d87f27a 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -17,7 +17,7 @@ - + diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index c8ddbe59f78..0d2a4dd49f8 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -770,7 +770,7 @@ - + - + diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 82451081d83..b0dd3107dc6 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -4,7 +4,7 @@ + parent="base.menu_reporting" sequence="30"/> From 3d0cc26eb06971db18131ff85754b73681dc0ffe Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 15:21:58 +0530 Subject: [PATCH 051/164] [IMP] association, marketing_campaign:-changed menu sequence for reporting bzr revid: mtr@tinyerp.com-20120228095158-82f6s0qoo9lh396a --- addons/association/profile_association.xml | 2 +- addons/marketing_campaign/report/campaign_analysis_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index cca16c5ae48..e94ac97e921 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -9,6 +9,6 @@ web_icon="images/association.png" web_icon_hover="images/association-hover.png"/> - + diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml index 00ab20c9120..ea1ddc9a397 100644 --- a/addons/marketing_campaign/report/campaign_analysis_view.xml +++ b/addons/marketing_campaign/report/campaign_analysis_view.xml @@ -90,7 +90,7 @@ - + From b9c1b6057fe968390b1e6fd185c31da3f08a483b Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 16:18:18 +0530 Subject: [PATCH 052/164] [IMP] crm_claim, crm_helpdesk:-added project menu bzr revid: mtr@tinyerp.com-20120228104818-ajy4dwazdik1jsmc --- addons/crm_claim/crm_claim_menu.xml | 8 +++++++- addons/crm_helpdesk/crm_helpdesk_menu.xml | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index f33b6f7ad31..b23110c3da3 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -1,10 +1,16 @@ + + parent="base.menu_main_pm" sequence="7" /> diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 31ee27345b0..278a3ed0f16 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -1,8 +1,15 @@ + + + + parent="base.menu_main_pm" sequence="7" /> From a3382d6247c4bfbae59315ff9506eb77d31c641b Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 28 Feb 2012 16:20:20 +0530 Subject: [PATCH 053/164] [IMP] account: change sequence of Periodical Processing and Assets menu and remove the first level menu Statements put Statements Reconciliation into Reconciliation menu bzr revid: jap@tinyerp.com-20120228105020-gmdn1xqgc2fhnusf --- addons/account/account_menuitem.xml | 2 +- addons/account/account_view.xml | 2 +- addons/account_asset/account_asset_view.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 6c651405c92..d49ef5175f6 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -10,7 +10,7 @@ - + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 3d782c2b4c4..b6fd901a155 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -740,7 +740,7 @@ - + diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index 8f8a017c376..dfcdebb9cf1 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -288,7 +288,7 @@ - + Date: Tue, 28 Feb 2012 17:11:30 +0530 Subject: [PATCH 054/164] [IMP] board, base_report_designer:- changed parent menu of 'Dashboard definition' and 'Report Designer' bzr revid: mtr@tinyerp.com-20120228114130-ktwi3n47m5mk7pod --- .../base_report_designer/base_report_designer_installer.xml | 4 ++-- addons/board/board_view.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml index 2774767af26..ae4fd85dda0 100644 --- a/addons/base_report_designer/base_report_designer_installer.xml +++ b/addons/base_report_designer/base_report_designer_installer.xml @@ -66,10 +66,10 @@ form form new - {'menu':True} + {'menu':True} - + diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml index 36d75002476..172b5fed4f4 100644 --- a/addons/board/board_view.xml +++ b/addons/board/board_view.xml @@ -68,7 +68,7 @@ - + From 479af87cdcdb80def95dbcaf81bce9a07295f257 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 17:33:29 +0530 Subject: [PATCH 055/164] [IMP] product_margin:- added 'Product Margin' under reporting menu of purchase bzr revid: mtr@tinyerp.com-20120228120329-wakgdp3q4fup2fre --- addons/product_margin/product_margin_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml index 8b1f2d279b0..6c083bca6b0 100644 --- a/addons/product_margin/product_margin_view.xml +++ b/addons/product_margin/product_margin_view.xml @@ -88,7 +88,8 @@ - + + From 53e054b7b61e69b602607f01a6f8aa28b4534142 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 17:47:48 +0530 Subject: [PATCH 056/164] [IMP] account:-changed menu name and its parent to transfer it under reporting->config bzr revid: mtr@tinyerp.com-20120228121748-nq20eqp91q7bs8f9 --- addons/account/account_menuitem.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 21d3d87f27a..d507f8737f0 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -30,7 +30,7 @@ - + Date: Tue, 28 Feb 2012 18:00:42 +0530 Subject: [PATCH 057/164] [IMP] project_issue: revert the change on kanban view bzr revid: jap@tinyerp.com-20120228123042-0zbg6jzxfnd6rvrl --- addons/project_issue/project_issue_menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml index 8b5f2045684..12df938651c 100644 --- a/addons/project_issue/project_issue_menu.xml +++ b/addons/project_issue/project_issue_menu.xml @@ -11,7 +11,7 @@ kanban,tree,calendar - {"search_default_user_id": uid, "search_default_project_id":project_id} + {"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1,"search_default_project_id":project_id} Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com) From ebd0a345654524a5f0ed14217e7c1acecf6248f1 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 18:38:20 +0530 Subject: [PATCH 058/164] [IMP] event:-added menu 'Marketing' bzr revid: mtr@tinyerp.com-20120228130820-jkbd5aogufi4ypuk --- addons/event/report/report_event_registration_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index bdd093565cc..b69f5503b45 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -144,6 +144,7 @@ + From 1e89b11a7381e344ff6840e39e78c8c0189f1559 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 28 Feb 2012 18:42:27 +0530 Subject: [PATCH 059/164] [IMP] crm:-changed menu name and its parent bzr revid: mtr@tinyerp.com-20120228131227-xn14j6dfczgm53p7 --- addons/crm/crm_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index c1203d27659..e07bb8a49a7 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -2,7 +2,7 @@ - - + From cdc2488d08aae39d922eeb6d8f3179ed0ab122db Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Wed, 29 Feb 2012 10:24:18 +0530 Subject: [PATCH 060/164] [IMP] crm_claim, crm_helpdesk:-changed seq for menu 'After-sale services bzr revid: mtr@tinyerp.com-20120229045418-ekiz76xn2a3yepb9 --- addons/crm_claim/crm_claim_menu.xml | 2 +- addons/crm_helpdesk/crm_helpdesk_menu.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index f33b6f7ad31..ea9dd473f33 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -4,7 +4,7 @@ + parent="base.menu_base_partner" sequence="2" /> diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 31ee27345b0..9d87ca0d403 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -2,7 +2,7 @@ + parent="base.menu_base_partner" sequence="2" /> From bb5b18e33acec4b10cc0ccba3682a6884888ac6b Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Wed, 29 Feb 2012 10:34:56 +0530 Subject: [PATCH 061/164] [IMP] project_long_term, project_planning:-changed seq for menu bzr revid: mtr@tinyerp.com-20120229050456-52uo4do36x81j38y --- addons/project_long_term/project_long_term_view.xml | 6 +++--- addons/project_planning/project_planning_view.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 23ae8139bea..69326b10465 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -2,7 +2,7 @@ - + # ------------------------------------------------------ # Project User Allocation @@ -124,7 +124,7 @@
- + @@ -334,7 +334,7 @@ res_model="project.phase" src_model="project.project" view_mode="tree,form" - view_type="form" + view_type="form" /> # ------------------------------------------------------ diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml index 83da24292ae..079df3f66a6 100644 --- a/addons/project_planning/project_planning_view.xml +++ b/addons/project_planning/project_planning_view.xml @@ -214,8 +214,8 @@ With its global system to schedule all resources of a company (people and material), OpenERP allows you to encode and then automatically compute tasks and phases scheduling, track resource allocation and availability. - + From 8769a5fea832dd5b0aaadf261061f5292cbe321c Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Wed, 29 Feb 2012 11:24:48 +0530 Subject: [PATCH 062/164] [IMP] mrp:- changed parent menu and seq for 'Routings' and 'Work Centers' bzr revid: mtr@tinyerp.com-20120229055448-99q97gr3hwno381y --- addons/mrp/mrp_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 84a4174452e..968b1940fc3 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -304,7 +304,7 @@ Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials. - + diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 9d87ca0d403..7a2b3b35a54 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -1,8 +1,13 @@ - + + + From c1465fa47eda19fb8ccdb727d35d6f5fb446d32f Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Wed, 29 Feb 2012 11:55:14 +0530 Subject: [PATCH 064/164] [IMP] crm_claim, crm_helpdesk:-added 'Project' menu and changed parent menu of 'Claims' and 'Helpdesk' analysis bzr revid: mtr@tinyerp.com-20120229062514-tg0pnjv86ibobma4 --- addons/crm_claim/report/crm_claim_report_view.xml | 6 +++++- addons/crm_helpdesk/report/crm_helpdesk_report_view.xml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index 4505c72237c..e355e0aa21e 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -190,9 +190,13 @@ + + + action="action_report_crm_claim" parent="base.menu_project_report" sequence="6"/> diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml index fd6951b1260..1e7db144a72 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml +++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml @@ -156,9 +156,13 @@ + + + id="menu_report_crm_helpdesks_tree" parent="base.menu_project_report" sequence="7"/>
From ac3d63985a0e2a63d0990844c26253b2fdbc29b3 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Wed, 29 Feb 2012 12:16:24 +0530 Subject: [PATCH 065/164] [IMP] crm_claim, crm_helpdesk:-changed sequence for 'Claims' and 'Helpdesk' analysis menu bzr revid: mtr@tinyerp.com-20120229064624-x12p7quzulm5cs2p --- addons/crm_claim/report/crm_claim_report_view.xml | 2 +- addons/crm_helpdesk/report/crm_helpdesk_report_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index e355e0aa21e..adf4b17c949 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -196,7 +196,7 @@ + action="action_report_crm_claim" parent="base.menu_project_report" sequence="15"/> diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml index 1e7db144a72..7b5cadf1041 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml +++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml @@ -162,7 +162,7 @@ + id="menu_report_crm_helpdesks_tree" parent="base.menu_project_report" sequence="20"/> From 0353a3a067dd63337acbd5e9f8217bf1a70a6c73 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Wed, 29 Feb 2012 12:18:25 +0530 Subject: [PATCH 066/164] [IMP] survey:-renamed menu Surveys=>Print Surveys for surveys reporting bzr revid: mtr@tinyerp.com-20120229064825-ryq1w5aszzq6bwdw --- addons/survey/wizard/survey_print.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml index d9f3ae6fe1e..c6188689fe6 100644 --- a/addons/survey/wizard/survey_print.xml +++ b/addons/survey/wizard/survey_print.xml @@ -35,7 +35,7 @@ new - From adace0e88f206fd42480e1434391531bf094d37c Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Wed, 29 Feb 2012 14:24:28 +0530 Subject: [PATCH 067/164] [IMP] board,base_report_designer:-changed seq for 'Dashboard definition' and 'Report designer' menus bzr revid: mtr@tinyerp.com-20120229085428-yahqkfgat7ymb1vi --- addons/base_report_designer/base_report_designer_installer.xml | 2 +- addons/board/board_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml index ae4fd85dda0..d85c9531733 100644 --- a/addons/base_report_designer/base_report_designer_installer.xml +++ b/addons/base_report_designer/base_report_designer_installer.xml @@ -69,7 +69,7 @@ {'menu':True} - + diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml index 172b5fed4f4..9a3745df2e2 100644 --- a/addons/board/board_view.xml +++ b/addons/board/board_view.xml @@ -68,7 +68,7 @@ - + From e0e2594c750c72d5e7ad87e6d052861b4e1a6588 Mon Sep 17 00:00:00 2001 From: "JAP(OpenERP)" <> Date: Wed, 29 Feb 2012 18:32:14 +0530 Subject: [PATCH 068/164] [IMP] crm, crm_fundraising:- improved default filter bzr revid: mtr@tinyerp.com-20120229130214-kmj2ap3pdn97ap21 --- addons/crm/crm_lead_menu.xml | 2 +- addons/crm/crm_phonecall_menu.xml | 2 +- addons/crm_fundraising/crm_fundraising_menu.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index 777b58ac60a..78ab4832609 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -9,7 +9,7 @@ ['|', ('type','=','lead'), ('type','=',False)] - {'search_default_new':1, 'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'} + {'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'} Leads allow you to manage and keep track of all initial contacts with a prospect or partner showing interest in your products or services. A lead is usually the first step in your sales cycle. Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities. You can import a database of prospects, keep track of your business cards or integrate your website's contact form with the OpenERP Leads. Leads can be connected to the email gateway: new emails may create leads, each of them automatically gets the history of the conversation with the prospect. diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index d8d00710420..4b7174028ed 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -105,7 +105,7 @@ tree,calendar [('state','!=','done')] - + Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team. diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml index f693cd3a8dc..ba44c456028 100644 --- a/addons/crm_fundraising/crm_fundraising_menu.xml +++ b/addons/crm_fundraising/crm_fundraising_menu.xml @@ -13,7 +13,7 @@ crm.fundraising tree,form,graph - {"search_default_user_id":uid,"search_default_current":1, 'search_default_section_id': section_id} + {"search_default_user_id":uid, 'search_default_section_id': section_id} If you need to collect money for your organization or a campaign, Fund Raising allows you to track all your fund raising activities. In the search list, filter by funds description, email, history and probability of success. From 609b704c9f771c993b8b7b61fcd14b35261ec0fe Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Wed, 29 Feb 2012 18:51:35 +0530 Subject: [PATCH 069/164] [IMP] marketing: renamed menu Events Organisation => Events and change the sequence of Campaign Followup and Campaigns bzr revid: jap@tinyerp.com-20120229132135-qjvwh8utbd3ndoap --- addons/event/event_view.xml | 2 +- addons/marketing_campaign/marketing_campaign_view.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 31fb353c113..1fd95f0fc3c 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -5,7 +5,7 @@ - + diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 9ddd8093a3d..ac7fe6b9a3a 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -122,7 +122,7 @@ - + @@ -491,7 +491,7 @@ diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml index a1c39165c82..0b999476ba6 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -206,7 +206,7 @@ - + From 017eac1e460f29e88a5d631f40071c6265ce7165 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Thu, 1 Mar 2012 10:54:46 +0530 Subject: [PATCH 074/164] [IMP] event: remove default filter on list view bzr revid: jap@tinyerp.com-20120301052446-fz17h38eq1zuuj28 --- addons/event/event_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index a948d831238..2366b82497b 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -270,7 +270,7 @@ event.event form tree,form,calendar,graph - {"search_default_draft": "1", "search_default_section_id": section_id} + {"search_default_section_id": section_id} Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events. @@ -480,7 +480,7 @@ form tree,form,calendar,graph - {"search_default_draft": "1"} + {} From fa4c786c81484ecdf5c79b932453a9da97290f3f Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Thu, 1 Mar 2012 11:10:44 +0530 Subject: [PATCH 075/164] [IMP] project,project_gtd,project_issue,project_timesheet:- changed sequence for 'Project' menu bzr revid: mtr@tinyerp.com-20120301054044-sfyt8lrp945b7d2p --- addons/project/project_view.xml | 2 +- addons/project_gtd/project_gtd_view.xml | 2 +- addons/project_issue/project_issue_menu.xml | 2 +- addons/project_timesheet/project_timesheet_view.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 26abe86fe99..07adbe5738e 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -540,7 +540,7 @@ - + Overpassed Tasks diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml index 66e7a8a69e3..2907df4dfa6 100644 --- a/addons/project_gtd/project_gtd_view.xml +++ b/addons/project_gtd/project_gtd_view.xml @@ -140,7 +140,7 @@ form tree,form,calendar,gantt,graph,kanban - + diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml index 9d88418720b..d8792c26195 100644 --- a/addons/project_issue/project_issue_menu.xml +++ b/addons/project_issue/project_issue_menu.xml @@ -54,6 +54,6 @@ view_type="form"/> + action="project_issue_categ_act0" sequence="15"/> diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 4f3559a179e..2c93c80b288 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -132,7 +132,7 @@ the project form. - From a001f66057931a63042eb914abe1ce53fd091f4b Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Thu, 1 Mar 2012 12:12:06 +0530 Subject: [PATCH 076/164] [IMP] crm_claim,crm_helpdesk:- added 'After-Sale Services' menu bzr revid: mtr@tinyerp.com-20120301064206-01mf7vetrdvw7cl5 --- addons/crm_claim/crm_claim_menu.xml | 8 +++++++- addons/crm_helpdesk/crm_helpdesk_menu.xml | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index f33b6f7ad31..399d5749568 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -1,10 +1,16 @@ + + parent="base.menu_main_pm" sequence="2" /> diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 31ee27345b0..4365bd0cef6 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -1,8 +1,15 @@ + + + + parent="base.menu_main_pm" sequence="2" /> From 8984b7115db2f43d3b57dc53c9094d6b6cedd4f8 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Thu, 1 Mar 2012 12:15:13 +0530 Subject: [PATCH 077/164] [IMP] project_long_term:- renamed menu Planning=>Long Term Planning and change its seq bzr revid: mtr@tinyerp.com-20120301064513-sd1w66smqzug18va --- addons/project_long_term/project_long_term_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 23ae8139bea..69326b10465 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -2,7 +2,7 @@ - + # ------------------------------------------------------ # Project User Allocation @@ -124,7 +124,7 @@
- + @@ -334,7 +334,7 @@ res_model="project.phase" src_model="project.project" view_mode="tree,form" - view_type="form" + view_type="form" /> # ------------------------------------------------------ From fa7fb51e03f3c5bb1ad72145e8a020302adc7dac Mon Sep 17 00:00:00 2001 From: "JAP(OpenERP)" <> Date: Thu, 1 Mar 2012 12:18:59 +0530 Subject: [PATCH 078/164] [IMP] crm_claim. crm_helpdesk:- improved default filter bzr revid: mtr@tinyerp.com-20120301064859-6jf2vpb3l0v3w7vt --- addons/crm_claim/crm_claim_menu.xml | 2 +- addons/crm_helpdesk/crm_helpdesk_menu.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index 399d5749568..c54f161dab3 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -20,7 +20,7 @@ form tree,calendar,form - {'search_default_section_id': section_id, "search_default_current":1,"search_default_user_id":uid, "stage_type":'claim'} + {'search_default_section_id': section_id,"search_default_user_id":uid, "stage_type":'claim'} Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module. diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 4365bd0cef6..e17ca8445c4 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -19,7 +19,7 @@ tree,calendar,form - {"search_default_user_id":uid, "search_default_current":1, 'search_default_section_id': section_id} + {"search_default_user_id":uid, 'search_default_section_id': section_id} Helpdesk and Support allow you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary. You can also assign a priority level. Use the OpenERP Issues system to manage your support activities. Issues can be connected to the email gateway: new emails may create issues, each of them automatically gets the history of the conversation with the customer. From 66974d570d451f20ae01a8c5587ca80e72e641de Mon Sep 17 00:00:00 2001 From: "JAP(OpenERP)" <> Date: Fri, 2 Mar 2012 12:05:58 +0530 Subject: [PATCH 079/164] [IMP] stock:- removed search_default for the 'Incoming Shipments' and 'Receive Products' menus bzr revid: mtr@tinyerp.com-20120302063558-rk00mld6g1tvfp15 --- addons/stock/stock_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 4264a488436..9895fd0bfa6 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1274,7 +1274,7 @@ form tree,form,calendar [('type','=','in')] - {'contact_display': 'partner_address',"search_default_available":1} + {'contact_display': 'partner_address'} The Incoming Shipments is the list of all orders you will receive from your suppliers. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially. @@ -1735,7 +1735,7 @@ tree,form ['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')] - + Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line. From e04df551f3e3a2298034d44812647414a929861d Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 2 Mar 2012 12:13:52 +0530 Subject: [PATCH 080/164] [IMP] stock:- reverted search_default changes for the 'Incoming Shipments' and 'Receive Products' menus bzr revid: mtr@tinyerp.com-20120302064352-hyp50omnpie9hlbc --- addons/stock/stock_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 35b91051fd5..6e28bfb1aa1 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1274,7 +1274,7 @@ form tree,form,calendar [('type','=','in')] - {'contact_display': 'partner_address'} + {'contact_display': 'partner_address',"search_default_available":1} The Incoming Shipments is the list of all orders you will receive from your suppliers. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially. @@ -1735,7 +1735,7 @@ tree,form ['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')] - + Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line. From 5e5f839d03cd167516bd0cfe85dea2e977ae5468 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Fri, 2 Mar 2012 15:51:53 +0530 Subject: [PATCH 081/164] [IMP] sale:-added search_default for 'Quotations' and 'Sales orders' bzr revid: mtr@tinyerp.com-20120302102153-9rfe6rom5itxxlls --- addons/sale/sale_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 3789fb08b2a..d2f4cc0b0c0 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -256,8 +256,8 @@ search - - + + @@ -287,7 +287,7 @@ form tree,form,calendar,graph - {} + {"search_default_sales":1} Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer. @@ -320,7 +320,7 @@ sale.order form tree,form,calendar,graph - [('state','=','draft')] + {"search_default_draft":1} From 9c6ad44d46d97d484818e661804e85e63dd3a7df Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Fri, 2 Mar 2012 15:53:56 +0530 Subject: [PATCH 082/164] [IMP] association: add the first level menu Members, Events and Registrations bzr revid: jap@tinyerp.com-20120302102356-y22kr07odb92z7ne --- addons/event/event_view.xml | 5 +++-- addons/membership/membership_view.xml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 2366b82497b..f9a7f6616fd 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -7,6 +7,7 @@ + @@ -294,7 +295,7 @@ view_type="form"/> - + @@ -491,7 +492,7 @@ diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml index 0b999476ba6..921afcd1b54 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -126,7 +126,7 @@ - + @@ -206,7 +206,7 @@ - + From 211341b41a6338940c777191fb97eca234b81f08 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Fri, 2 Mar 2012 17:59:20 +0530 Subject: [PATCH 083/164] [IMP] association: remove first level menu Events and Registrations bzr revid: jap@tinyerp.com-20120302122920-16jnktgrt0u1gdmd --- addons/event/event_view.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index f9a7f6616fd..6b7331a10e2 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -6,8 +6,6 @@ - - @@ -295,7 +293,6 @@ view_type="form"/> - @@ -490,10 +487,6 @@ id="menu_action_registration" parent="base.menu_event_main" action="action_registration"/> -
From 9d13109ea3c8a00bfa50cec3220e6f3837e682fd Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Fri, 2 Mar 2012 18:33:03 +0530 Subject: [PATCH 084/164] [IMP] idea: remove menus Ideas by Categories, Give Vote and Votes bzr revid: jap@tinyerp.com-20120302130303-zzbfnmy1ip5ntidk --- addons/idea/idea_view.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 23667069b79..616cd44a6f9 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -81,15 +81,6 @@ - - - @@ -398,7 +389,6 @@ - From b3b39b86994e06a1d93d03653cefafd862c96d41 Mon Sep 17 00:00:00 2001 From: ado Date: Fri, 2 Mar 2012 14:22:20 +0100 Subject: [PATCH 085/164] [FIX] account move entry should be created with 0.0 value when cost price is 0.0 bzr revid: xal@openerp.com-20120302132220-015g1apibi2x5bmc --- addons/stock/stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 885f7cd2077..d26ca8f0da3 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2165,7 +2165,7 @@ class stock_move(osv.osv): context = {} currency_ctx = dict(context, currency_id = move.company_id.currency_id.id) amount_unit = move.product_id.price_get('standard_price', context=currency_ctx)[move.product_id.id] - reference_amount = amount_unit * qty or 1.0 + reference_amount = amount_unit * qty return reference_amount, reference_currency_id From f3979cefa6042e4717371d118adc40045aecfab9 Mon Sep 17 00:00:00 2001 From: eLBati Date: Mon, 5 Mar 2012 10:14:59 +0100 Subject: [PATCH 086/164] [IMP] l10n_it - using account types provided by account module This also fixes problems related to P&L and balance sheet reports bzr revid: lorenzo.battistini@agilebg.com-20120305091459-gi60io9cthqg75z8 --- addons/l10n_it/__openerp__.py | 3 +- .../l10n_it/data/account.account.template.csv | 468 +++++++++--------- addons/l10n_it/data/account.account.type.csv | 11 - 3 files changed, 235 insertions(+), 247 deletions(-) delete mode 100644 addons/l10n_it/data/account.account.type.csv diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py index edc453f8ba0..96f3b3510ff 100644 --- a/addons/l10n_it/__openerp__.py +++ b/addons/l10n_it/__openerp__.py @@ -9,7 +9,7 @@ # Domsense srl # Albatos srl # -# Copyright (C) 2011 +# Copyright (C) 2011-2012 # Associazione OpenERP Italia () # # This program is free software: you can redistribute it and/or modify @@ -44,7 +44,6 @@ Italian accounting chart and localization. 'init_xml': [ ], 'update_xml': [ - 'data/account.account.type.csv', 'data/account.account.template.csv', 'data/account.tax.code.template.csv', 'account_chart.xml', diff --git a/addons/l10n_it/data/account.account.template.csv b/addons/l10n_it/data/account.account.template.csv index 47ae1388233..b06a3fe8574 100644 --- a/addons/l10n_it/data/account.account.template.csv +++ b/addons/l10n_it/data/account.account.template.csv @@ -1,235 +1,235 @@ id,code,name,parent_id:id,user_type:id,type,reconcile -0,0,Azienda,,account_type_view,view,FALSE -1,1,ATTIVO ,0,account_type_view,view,TRUE -11,11,IMMOBILIZZAZIONI IMMATERIALI ,1,account_type_view,view,TRUE -1101,1101,costi di impianto ,11,account_type_asset,other,TRUE -1106,1106,software ,11,account_type_asset,other,TRUE -1108,1108,avviamento ,11,account_type_asset,other,TRUE -1111,1111,fondo ammortamento costi di impianto ,11,account_type_asset,other,TRUE -1116,1116,fondo ammortamento software ,11,account_type_asset,other,TRUE -1118,1118,fondo ammortamento avviamento ,11,account_type_asset,other,TRUE -12,12,IMMOBILIZZAZIONI MATERIALI ,1,account_type_view,view,TRUE -1201,1201,fabbricati ,12,account_type_asset,other,TRUE -1202,1202,impianti e macchinari ,12,account_type_asset,other,TRUE -1204,1204,attrezzature commerciali ,12,account_type_asset,other,TRUE -1205,1205,macchine d'ufficio ,12,account_type_asset,other,TRUE -1206,1206,arredamento ,12,account_type_asset,other,TRUE -1207,1207,automezzi ,12,account_type_asset,other,TRUE -1208,1208,imballaggi durevoli ,12,account_type_asset,other,TRUE -1211,1211,fondo ammortamento fabbricati ,12,account_type_asset,other,TRUE -1212,1212,fondo ammortamento impianti e macchinari ,12,account_type_asset,other,TRUE -1214,1214,fondo ammortamento attrezzature commerciali ,12,account_type_asset,other,TRUE -1215,1215,fondo ammortamento macchine d'ufficio ,12,account_type_asset,other,TRUE -1216,1216,fondo ammortamento arredamento ,12,account_type_asset,other,TRUE -1217,1217,fondo ammortamento automezzi ,12,account_type_asset,other,TRUE -1218,1218,fondo ammortamento imballaggi durevoli ,12,account_type_asset,other,TRUE -1220,1220,fornitori immobilizzazioni c/acconti ,12,account_type_asset,other,TRUE -13,13,IMMOBILIZZAZIONI FINANZIARIE ,1,account_type_view,view,TRUE -1301,1301,mutui attivi ,13,account_type_asset,other,TRUE -14,14,RIMANENZE ,1,account_type_view,view,TRUE -1401,1401,materie di consumo ,14,account_type_asset,other,TRUE -1404,1404,merci ,14,account_type_asset,other,TRUE -1410,1410,fornitori c/acconti ,14,account_type_asset,other,TRUE -15,15,CREDITI COMMERCIALI ,1,account_type_view,view,TRUE -1501,1501,crediti v/clienti ,15,account_type_receivable,receivable,TRUE -1502,1502,crediti commerciali diversi ,15,account_type_receivable,other,TRUE -1503,1503,clienti c/spese anticipate ,15,account_type_receivable,receivable,TRUE -1505,1505,cambiali attive ,15,account_type_receivable,other,TRUE -1506,1506,cambiali allo sconto ,15,account_type_receivable,other,TRUE -1507,1507,cambiali all'incasso ,15,account_type_receivable,other,TRUE -1509,1509,fatture da emettere ,15,account_type_receivable,other,TRUE -1510,1510,crediti insoluti ,15,account_type_receivable,other,TRUE -1511,1511,cambiali insolute ,15,account_type_receivable,other,TRUE -1531,1531,crediti da liquidare ,15,account_type_receivable,other,TRUE -1540,1540,fondo svalutazione crediti ,15,account_type_receivable,other,TRUE -1541,1541,fondo rischi su crediti ,15,account_type_receivable,other,TRUE -16,16,CREDITI DIVERSI ,1,account_type_view,view,TRUE -1601,1601,IVA n/credito ,16,account_type_tax,other,TRUE -1602,1602,IVA c/acconto ,16,account_type_tax,other,TRUE -1605,1605,crediti per IVA ,16,account_type_tax,other,TRUE -1607,1607,imposte c/acconto ,16,account_type_tax,other,TRUE -1608,1608,crediti per imposte ,16,account_type_tax,other,TRUE -1609,1609,crediti per ritenute subite ,16,account_type_asset,other,TRUE -1610,1610,crediti per cauzioni ,16,account_type_asset,other,TRUE -1620,1620,personale c/acconti ,16,account_type_asset,other,TRUE -1630,1630,crediti v/istituti previdenziali ,16,account_type_asset,other,TRUE -1640,1640,debitori diversi ,16,account_type_receivable,receivable,TRUE -18,18,DISPONIBILITÀ LIQUIDE ,1,account_type_view,view,TRUE -1801,1801,banche c/c ,18,account_type_bank,liquidity,TRUE -1810,1810,c/c postali ,18,account_type_cash,liquidity,TRUE -1820,1820,denaro in cassa ,18,account_type_cash,liquidity,TRUE -1821,1821,assegni ,18,account_type_cash,liquidity,TRUE -1822,1822,valori bollati ,18,account_type_cash,liquidity,TRUE -19,19,RATEI E RISCONTI ATTIVI ,1,account_type_view,view,TRUE -1901,1901,ratei attivi ,19,account_type_asset,other,TRUE -1902,1902,risconti attivi ,19,account_type_asset,other,TRUE -2,2,PASSIVO ,0,account_type_view,view,TRUE -20,20,PATRIMONIO NETTO ,2,account_type_view,view,TRUE -2101,2101,patrimonio netto ,20,account_type_asset,other,TRUE -2102,2102,utile d'esercizio ,20,account_type_asset,other,TRUE -2103,2103,perdita d'esercizio ,20,account_type_asset,other,TRUE -2104,2104,prelevamenti extra gestione ,20,account_type_asset,other,TRUE -2105,2105,titolare c/ritenute subite ,20,account_type_asset,other,TRUE -22,22,FONDI PER RISCHI E ONERI ,2,account_type_view,view,TRUE -2201,2201,fondo per imposte ,22,account_type_asset,other,TRUE -2204,2204,fondo responsabilità civile ,22,account_type_asset,other,TRUE -2205,2205,fondo spese future ,22,account_type_asset,other,TRUE -2211,2211,fondo manutenzioni programmate ,22,account_type_asset,other,TRUE -23,23,TRATTAMENTO FINE RAPPORTO DI LAVORO ,2,account_type_view,view,TRUE -2301,2301,debiti per TFRL ,23,account_type_asset,other,TRUE -24,24,DEBITI FINANZIARI ,2,account_type_view,view,TRUE -2410,2410,mutui passivi ,24,account_type_asset,other,TRUE -2411,2411,banche c/sovvenzioni ,24,account_type_asset,other,TRUE -2420,2420,banche c/c passivi ,24,account_type_asset,other,TRUE -2421,2421,banche c/RIBA all'incasso ,24,account_type_asset,other,TRUE -2422,2422,banche c/cambiali all'incasso ,24,account_type_asset,other,TRUE -2423,2423,banche c/anticipi su fatture ,24,account_type_asset,other,TRUE -2440,2440,debiti v/altri finanziatori ,24,account_type_asset,other,TRUE -25,25,DEBITI COMMERCIALI ,2,account_type_view,view,TRUE -2501,2501,debiti v/fornitori ,25,account_type_payable,payable,TRUE -2503,2503,cambiali passive ,25,account_type_asset,other,TRUE -2520,2520,fatture da ricevere ,25,account_type_asset,other,TRUE -2521,2521,debiti da liquidare ,25,account_type_asset,other,TRUE -2530,2530,clienti c/acconti ,25,account_type_payable,payable,TRUE -26,26,DEBITI DIVERSI ,2,account_type_view,view,TRUE -2601,2601,IVA n/debito ,26,account_type_tax,other,TRUE -2602,2602,debiti per ritenute da versare ,26,account_type_payable,payable,TRUE -2605,2605,erario c/IVA ,26,account_type_payable,payable,TRUE -2606,2606,debiti per imposte ,26,account_type_tax,other,TRUE -2619,2619,debiti per cauzioni ,26,account_type_asset,other,TRUE -2620,2620,personale c/retribuzioni ,26,account_type_asset,other,TRUE -2621,2621,personale c/liquidazioni ,26,account_type_asset,other,TRUE -2622,2622,clienti c/cessione ,26,account_type_asset,other,TRUE -2630,2630,debiti v/istituti previdenziali ,26,account_type_asset,other,TRUE -2640,2640,creditori diversi ,26,account_type_payable,payable,TRUE -27,27,RATEI E RISCONTI PASSIVI ,2,account_type_view,view,TRUE -2701,2701,ratei passivi ,27,account_type_asset,other,TRUE -2702,2702,risconti passivi ,27,account_type_asset,other,TRUE -28,28,CONTI TRANSITORI E DIVERSI ,2,account_type_view,view,TRUE -2801,2801,bilancio di apertura ,28,account_type_asset,other,TRUE -2802,2802,bilancio di chiusura ,28,account_type_asset,other,TRUE -2810,2810,IVA c/liquidazioni ,28,account_type_asset,other,TRUE -2811,2811,istituti previdenziali ,28,account_type_asset,other,TRUE -2820,2820,banca ... c/c ,28,account_type_asset,other,TRUE -2821,2821,banca ... c/c ,28,account_type_asset,other,TRUE -2822,2822,banca ... c/c ,28,account_type_asset,other,TRUE -29,29,CONTI DEI SISTEMI SUPPLEMENTARI ,2,account_type_view,view,TRUE -2901,2901,beni di terzi ,29,account_type_asset,other,TRUE -2902,2902,depositanti beni ,29,account_type_asset,other,TRUE -2911,2911,merci da ricevere ,29,account_type_asset,other,TRUE -2912,2912,fornitori c/impegni ,29,account_type_asset,other,TRUE -2913,2913,impegni per beni in leasing ,29,account_type_asset,other,TRUE -2914,2914,creditori c/leasing ,29,account_type_asset,other,TRUE -2916,2916,clienti c/impegni ,29,account_type_asset,other,TRUE -2917,2917,merci da consegnare ,29,account_type_asset,other,TRUE -2921,2921,rischi per effetti scontati ,29,account_type_asset,other,TRUE -2922,2922,banche c/effetti scontati ,29,account_type_asset,other,TRUE -2926,2926,rischi per fideiussioni ,29,account_type_asset,other,TRUE -2927,2927,creditori per fideiussioni ,29,account_type_asset,other,TRUE -2931,2931,rischi per avalli ,29,account_type_asset,other,TRUE -2932,2932,creditori per avalli ,29,account_type_asset,other,TRUE -3,3,VALORE DELLA PRODUZIONE ,0,account_type_view,view,TRUE -31,31,VENDITE E PRESTAZIONI ,3,account_type_view,view,TRUE -3101,3101,merci c/vendite ,31,account_type_income,other,TRUE -3103,3103,rimborsi spese di vendita ,31,account_type_income,other,TRUE -3110,3110,resi su vendite ,31,account_type_income,other,TRUE -3111,3111,ribassi e abbuoni passivi ,31,account_type_income,other,TRUE -3112,3112,premi su vendite ,31,account_type_income,other,TRUE -32,32,RICAVI E PROVENTI DIVERSI ,3,account_type_view,view,TRUE -3201,3201,fitti attivi ,32,account_type_income,other,TRUE -3202,3202,proventi vari ,32,account_type_income,other,TRUE -3210,3210,arrotondamenti attivi ,32,account_type_income,other,TRUE -3220,3220,plusvalenze ordinarie diverse ,32,account_type_income,other,TRUE -3230,3230,sopravvenienze attive ordinarie diverse ,32,account_type_income,other,TRUE -3240,3240,insussistenze attive ordinarie diverse ,32,account_type_income,other,TRUE -4,4,COSTI DELLA PRODUZIONE ,0,account_type_view,view,TRUE -41,41,COSTO DEL VENDUTO ,4,account_type_view,view,TRUE -4101,4101,merci c/acquisti ,41,account_type_expense,other,TRUE -4102,4102,materie di consumo c/acquisti ,41,account_type_expense,other,TRUE -4105,4105,merci c/apporti ,41,account_type_expense,other,TRUE -4110,4110,resi su acquisti ,41,account_type_expense,other,TRUE -4111,4111,ribassi e abbuoni attivi ,41,account_type_expense,other,TRUE -4112,4112,premi su acquisti ,41,account_type_expense,other,TRUE -4121,4121,merci c/esistenze iniziali ,41,account_type_expense,other,TRUE -4122,4122,materie di consumo c/esistenze iniziali ,41,account_type_expense,other,TRUE -4131,4131,merci c/rimanenze finali ,41,account_type_expense,other,TRUE -4132,4132,materie di consumo c/rimanenze finali ,41,account_type_expense,other,TRUE -42,42,COSTI PER SERVIZI ,4,account_type_view,view,TRUE -4201,4201,costi di trasporto ,42,account_type_expense,other,TRUE -4202,4202,costi per energia ,42,account_type_expense,other,TRUE -4203,4203,costi di pubblicità ,42,account_type_expense,other,TRUE -4204,4204,costi di consulenze ,42,account_type_expense,other,TRUE -4205,4205,costi postali ,42,account_type_expense,other,TRUE -4206,4206,costi telefonici ,42,account_type_expense,other,TRUE -4207,4207,costi di assicurazione ,42,account_type_expense,other,TRUE -4208,4208,costi di vigilanza ,42,account_type_expense,other,TRUE -4209,4209,costi per i locali ,42,account_type_expense,other,TRUE -4210,4210,costi di esercizio automezzi ,42,account_type_expense,other,TRUE -4211,4211,costi di manutenzione e riparazione ,42,account_type_expense,other,TRUE -4212,4212,provvigioni passive ,42,account_type_expense,other,TRUE -4213,4213,spese di incasso ,42,account_type_expense,other,TRUE -43,43,COSTI PER GODIMENTO BENI DI TERZI ,4,account_type_view,view,TRUE -4301,4301,fitti passivi ,43,account_type_expense,other,TRUE -4302,4302,canoni di leasing ,43,account_type_expense,other,TRUE -44,44,COSTI PER IL PERSONALE ,4,account_type_view,view,TRUE -4401,4401,salari e stipendi ,44,account_type_expense,other,TRUE -4402,4402,oneri sociali ,44,account_type_expense,other,TRUE -4403,4403,TFRL ,44,account_type_expense,other,TRUE -4404,4404,altri costi per il personale ,44,account_type_expense,other,TRUE -45,45,AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ,4,account_type_view,view,TRUE -4501,4501,ammortamento costi di impianto ,45,account_type_p_l,other,TRUE -4506,4506,ammortamento software ,45,account_type_p_l,other,TRUE -4508,4508,ammortamento avviamento ,45,account_type_p_l,other,TRUE -46,46,AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ,4,account_type_view,view,TRUE -4601,4601,ammortamento fabbricati ,46,account_type_p_l,other,TRUE -4602,4602,ammortamento impianti e macchinari ,46,account_type_p_l,other,TRUE -4604,4604,ammortamento attrezzature commerciali ,46,account_type_p_l,other,TRUE -4605,4605,ammortamento macchine d'ufficio ,46,account_type_p_l,other,TRUE -4606,4606,ammortamento arredamento ,46,account_type_p_l,other,TRUE -4607,4607,ammortamento automezzi ,46,account_type_p_l,other,TRUE -4608,4608,ammortamento imballaggi durevoli ,46,account_type_p_l,other,TRUE -47,47,SVALUTAZIONI ,4,account_type_view,view,TRUE -4701,4701,svalutazioni immobilizzazioni immateriali ,47,account_type_p_l,other,TRUE -4702,4702,svalutazioni immobilizzazioni materiali ,47,account_type_p_l,other,TRUE -4706,4706,svalutazione crediti ,47,account_type_p_l,other,TRUE -48,48,ACCANTONAMENTI ,4,account_type_view,view,TRUE -481,481,ACCANTONAMENTI PER RISCHI ,48,account_type_view,view,TRUE -4814,4814,accantonamento per responsabilità civile ,481,account_type_p_l,other,TRUE -482,482,ALTRI ACCANTONAMENTI ,48,account_type_view,view,TRUE -4821,4821,accantonamento per spese future ,482,account_type_p_l,other,TRUE -4823,4823,accantonamento per manutenzioni programmate ,482,account_type_p_l,other,TRUE -49,49,ONERI DIVERSI ,4,account_type_view,view,TRUE -4901,4901,oneri fiscali diversi ,49,account_type_p_l,other,TRUE -4903,4903,oneri vari ,49,account_type_p_l,other,TRUE -4905,4905,perdite su crediti ,49,account_type_p_l,other,TRUE -4910,4910,arrotondamenti passivi ,49,account_type_p_l,other,TRUE -4920,4920,minusvalenze ordinarie diverse ,49,account_type_p_l,other,TRUE -4930,4930,sopravvenienze passive ordinarie diverse ,49,account_type_p_l,other,TRUE -4940,4940,insussistenze passive ordinarie diverse ,49,account_type_p_l,other,TRUE -5,5,PROVENTI E ONERI FINANZIARI ,0,account_type_view,view,TRUE -51,51,PROVENTI FINANZIARI ,5,account_type_view,view,TRUE -5110,5110,interessi attivi v/clienti ,51,account_type_p_l,other,TRUE -5115,5115,interessi attivi bancari ,51,account_type_p_l,other,TRUE -5116,5116,interessi attivi postali ,51,account_type_p_l,other,TRUE -5140,5140,proventi finanziari diversi ,51,account_type_p_l,other,TRUE -52,52,ONERI FINANZIARI ,5,account_type_view,view,TRUE -5201,5201,interessi passivi v/fornitori ,52,account_type_p_l,other,TRUE -5202,5202,interessi passivi bancari ,52,account_type_p_l,other,TRUE -5203,5203,sconti passivi bancari ,52,account_type_p_l,other,TRUE -5210,5210,interessi passivi su mutui ,52,account_type_p_l,other,TRUE -5240,5240,oneri finanziari diversi ,52,account_type_p_l,other,TRUE -7,7,PROVENTI E ONERI STRAORDINARI ,0,account_type_view,view,TRUE -71,71,PROVENTI STRAORDINARI ,7,account_type_view,view,TRUE -7101,7101,plusvalenze straordinarie ,71,account_type_p_l,other,TRUE -7102,7102,sopravvenienze attive straordinarie ,71,account_type_p_l,other,TRUE -7103,7103,insussistenze attive straordinarie ,71,account_type_p_l,other,TRUE -72,72,ONERI STRAORDINARI ,7,account_type_view,view,TRUE -7201,7201,minusvalenze straordinarie ,72,account_type_p_l,other,TRUE -7202,7202,sopravvenienze passive straordinarie ,72,account_type_p_l,other,TRUE -7203,7203,insussistenze passive straordinarie ,72,account_type_p_l,other,TRUE -7204,7204,imposte esercizi precedenti ,72,account_type_p_l,other,TRUE -8,8,IMPOSTE DELL'ESERCIZIO ,0,account_type_view,view,TRUE -8101,8101,imposte dell'esercizio ,8,account_type_p_l,other,TRUE -9,9,CONTI DI RISULTATO ,0,account_type_view,view,TRUE -9101,9101,conto di risultato economico ,9,account_type_p_l,other,TRUE -9102,9102,stato patrimoniale,9,account_type_p_l,other,TRUE +0,0,Azienda,,account.data_account_type_view,view,FALSE +1,1,ATTIVO ,0,account.data_account_type_view,view,TRUE +11,11,IMMOBILIZZAZIONI IMMATERIALI ,1,account.data_account_type_view,view,TRUE +1101,1101,costi di impianto ,11,account.data_account_type_asset,other,TRUE +1106,1106,software ,11,account.data_account_type_asset,other,TRUE +1108,1108,avviamento ,11,account.data_account_type_asset,other,TRUE +1111,1111,fondo ammortamento costi di impianto ,11,account.data_account_type_asset,other,TRUE +1116,1116,fondo ammortamento software ,11,account.data_account_type_asset,other,TRUE +1118,1118,fondo ammortamento avviamento ,11,account.data_account_type_asset,other,TRUE +12,12,IMMOBILIZZAZIONI MATERIALI ,1,account.data_account_type_view,view,TRUE +1201,1201,fabbricati ,12,account.data_account_type_asset,other,TRUE +1202,1202,impianti e macchinari ,12,account.data_account_type_asset,other,TRUE +1204,1204,attrezzature commerciali ,12,account.data_account_type_asset,other,TRUE +1205,1205,macchine d'ufficio ,12,account.data_account_type_asset,other,TRUE +1206,1206,arredamento ,12,account.data_account_type_asset,other,TRUE +1207,1207,automezzi ,12,account.data_account_type_asset,other,TRUE +1208,1208,imballaggi durevoli ,12,account.data_account_type_asset,other,TRUE +1211,1211,fondo ammortamento fabbricati ,12,account.data_account_type_asset,other,TRUE +1212,1212,fondo ammortamento impianti e macchinari ,12,account.data_account_type_asset,other,TRUE +1214,1214,fondo ammortamento attrezzature commerciali ,12,account.data_account_type_asset,other,TRUE +1215,1215,fondo ammortamento macchine d'ufficio ,12,account.data_account_type_asset,other,TRUE +1216,1216,fondo ammortamento arredamento ,12,account.data_account_type_asset,other,TRUE +1217,1217,fondo ammortamento automezzi ,12,account.data_account_type_asset,other,TRUE +1218,1218,fondo ammortamento imballaggi durevoli ,12,account.data_account_type_asset,other,TRUE +1220,1220,fornitori immobilizzazioni c/acconti ,12,account.data_account_type_asset,other,TRUE +13,13,IMMOBILIZZAZIONI FINANZIARIE ,1,account.data_account_type_view,view,TRUE +1301,1301,mutui attivi ,13,account.data_account_type_asset,other,TRUE +14,14,RIMANENZE ,1,account.data_account_type_view,view,TRUE +1401,1401,materie di consumo ,14,account.data_account_type_asset,other,TRUE +1404,1404,merci ,14,account.data_account_type_asset,other,TRUE +1410,1410,fornitori c/acconti ,14,account.data_account_type_asset,other,TRUE +15,15,CREDITI COMMERCIALI ,1,account.data_account_type_view,view,TRUE +1501,1501,crediti v/clienti ,15,account.data_account_type_receivable,receivable,TRUE +1502,1502,crediti commerciali diversi ,15,account.data_account_type_asset,other,TRUE +1503,1503,clienti c/spese anticipate ,15,account.data_account_type_receivable,receivable,TRUE +1505,1505,cambiali attive ,15,account.data_account_type_asset,other,TRUE +1506,1506,cambiali allo sconto ,15,account.data_account_type_asset,other,TRUE +1507,1507,cambiali all'incasso ,15,account.data_account_type_asset,other,TRUE +1509,1509,fatture da emettere ,15,account.data_account_type_asset,other,TRUE +1510,1510,crediti insoluti ,15,account.data_account_type_asset,other,TRUE +1511,1511,cambiali insolute ,15,account.data_account_type_asset,other,TRUE +1531,1531,crediti da liquidare ,15,account.data_account_type_asset,other,TRUE +1540,1540,fondo svalutazione crediti ,15,account.data_account_type_asset,other,TRUE +1541,1541,fondo rischi su crediti ,15,account.data_account_type_asset,other,TRUE +16,16,CREDITI DIVERSI ,1,account.data_account_type_view,view,TRUE +1601,1601,IVA n/credito ,16,account.data_account_type_asset,other,TRUE +1602,1602,IVA c/acconto ,16,account.data_account_type_asset,other,TRUE +1605,1605,crediti per IVA ,16,account.data_account_type_asset,other,TRUE +1607,1607,imposte c/acconto ,16,account.data_account_type_asset,other,TRUE +1608,1608,crediti per imposte ,16,account.data_account_type_asset,other,TRUE +1609,1609,crediti per ritenute subite ,16,account.data_account_type_asset,other,TRUE +1610,1610,crediti per cauzioni ,16,account.data_account_type_asset,other,TRUE +1620,1620,personale c/acconti ,16,account.data_account_type_asset,other,TRUE +1630,1630,crediti v/istituti previdenziali ,16,account.data_account_type_asset,other,TRUE +1640,1640,debitori diversi ,16,account.data_account_type_receivable,receivable,TRUE +18,18,DISPONIBILITÀ LIQUIDE ,1,account.data_account_type_view,view,TRUE +1801,1801,banche c/c ,18,account.data_account_type_bank,liquidity,TRUE +1810,1810,c/c postali ,18,account.data_account_type_bank,liquidity,TRUE +1820,1820,denaro in cassa ,18,account.data_account_type_cash,liquidity,TRUE +1821,1821,assegni ,18,account.data_account_type_cash,liquidity,TRUE +1822,1822,valori bollati ,18,account.data_account_type_cash,liquidity,TRUE +19,19,RATEI E RISCONTI ATTIVI ,1,account.data_account_type_view,view,TRUE +1901,1901,ratei attivi ,19,account.data_account_type_asset,other,TRUE +1902,1902,risconti attivi ,19,account.data_account_type_asset,other,TRUE +2,2,PASSIVO ,0,account.data_account_type_view,view,TRUE +20,20,PATRIMONIO NETTO ,2,account.data_account_type_view,view,TRUE +2101,2101,patrimonio netto ,20,account.data_account_type_liability,other,TRUE +2102,2102,utile d'esercizio ,20,account.data_account_type_liability,other,TRUE +2103,2103,perdita d'esercizio ,20,account.data_account_type_liability,other,TRUE +2104,2104,prelevamenti extra gestione ,20,account.data_account_type_liability,other,TRUE +2105,2105,titolare c/ritenute subite ,20,account.data_account_type_liability,other,TRUE +22,22,FONDI PER RISCHI E ONERI ,2,account.data_account_type_view,view,TRUE +2201,2201,fondo per imposte ,22,account.data_account_type_liability,other,TRUE +2204,2204,fondo responsabilità civile ,22,account.data_account_type_liability,other,TRUE +2205,2205,fondo spese future ,22,account.data_account_type_liability,other,TRUE +2211,2211,fondo manutenzioni programmate ,22,account.data_account_type_liability,other,TRUE +23,23,TRATTAMENTO FINE RAPPORTO DI LAVORO ,2,account.data_account_type_view,view,TRUE +2301,2301,debiti per TFRL ,23,account.data_account_type_liability,other,TRUE +24,24,DEBITI FINANZIARI ,2,account.data_account_type_view,view,TRUE +2410,2410,mutui passivi ,24,account.data_account_type_liability,other,TRUE +2411,2411,banche c/sovvenzioni ,24,account.data_account_type_liability,other,TRUE +2420,2420,banche c/c passivi ,24,account.data_account_type_liability,other,TRUE +2421,2421,banche c/RIBA all'incasso ,24,account.data_account_type_liability,other,TRUE +2422,2422,banche c/cambiali all'incasso ,24,account.data_account_type_liability,other,TRUE +2423,2423,banche c/anticipi su fatture ,24,account.data_account_type_liability,other,TRUE +2440,2440,debiti v/altri finanziatori ,24,account.data_account_type_liability,other,TRUE +25,25,DEBITI COMMERCIALI ,2,account.data_account_type_view,view,TRUE +2501,2501,debiti v/fornitori ,25,account.data_account_type_payable,payable,TRUE +2503,2503,cambiali passive ,25,account.data_account_type_liability,other,TRUE +2520,2520,fatture da ricevere ,25,account.data_account_type_liability,other,TRUE +2521,2521,debiti da liquidare ,25,account.data_account_type_liability,other,TRUE +2530,2530,clienti c/acconti ,25,account.data_account_type_payable,payable,TRUE +26,26,DEBITI DIVERSI ,2,account.data_account_type_view,view,TRUE +2601,2601,IVA n/debito ,26,account.data_account_type_liability,other,TRUE +2602,2602,debiti per ritenute da versare ,26,account.data_account_type_payable,payable,TRUE +2605,2605,erario c/IVA ,26,account.data_account_type_payable,payable,TRUE +2606,2606,debiti per imposte ,26,account.data_account_type_liability,other,TRUE +2619,2619,debiti per cauzioni ,26,account.data_account_type_liability,other,TRUE +2620,2620,personale c/retribuzioni ,26,account.data_account_type_liability,other,TRUE +2621,2621,personale c/liquidazioni ,26,account.data_account_type_liability,other,TRUE +2622,2622,clienti c/cessione ,26,account.data_account_type_liability,other,TRUE +2630,2630,debiti v/istituti previdenziali ,26,account.data_account_type_liability,other,TRUE +2640,2640,creditori diversi ,26,account.data_account_type_payable,payable,TRUE +27,27,RATEI E RISCONTI PASSIVI ,2,account.data_account_type_view,view,TRUE +2701,2701,ratei passivi ,27,account.data_account_type_liability,other,TRUE +2702,2702,risconti passivi ,27,account.data_account_type_liability,other,TRUE +28,28,CONTI TRANSITORI E DIVERSI ,2,account.data_account_type_view,view,TRUE +2801,2801,bilancio di apertura ,28,account.data_account_type_liability,other,TRUE +2802,2802,bilancio di chiusura ,28,account.data_account_type_liability,other,TRUE +2810,2810,IVA c/liquidazioni ,28,account.data_account_type_liability,other,TRUE +2811,2811,istituti previdenziali ,28,account.data_account_type_liability,other,TRUE +2820,2820,banca ... c/c ,28,account.data_account_type_liability,other,TRUE +2821,2821,banca ... c/c ,28,account.data_account_type_liability,other,TRUE +2822,2822,banca ... c/c ,28,account.data_account_type_liability,other,TRUE +29,29,CONTI DEI SISTEMI SUPPLEMENTARI ,2,account.data_account_type_view,view,TRUE +2901,2901,beni di terzi ,29,account.data_account_type_liability,other,TRUE +2902,2902,depositanti beni ,29,account.data_account_type_liability,other,TRUE +2911,2911,merci da ricevere ,29,account.data_account_type_liability,other,TRUE +2912,2912,fornitori c/impegni ,29,account.data_account_type_liability,other,TRUE +2913,2913,impegni per beni in leasing ,29,account.data_account_type_liability,other,TRUE +2914,2914,creditori c/leasing ,29,account.data_account_type_liability,other,TRUE +2916,2916,clienti c/impegni ,29,account.data_account_type_liability,other,TRUE +2917,2917,merci da consegnare ,29,account.data_account_type_liability,other,TRUE +2921,2921,rischi per effetti scontati ,29,account.data_account_type_liability,other,TRUE +2922,2922,banche c/effetti scontati ,29,account.data_account_type_liability,other,TRUE +2926,2926,rischi per fideiussioni ,29,account.data_account_type_liability,other,TRUE +2927,2927,creditori per fideiussioni ,29,account.data_account_type_liability,other,TRUE +2931,2931,rischi per avalli ,29,account.data_account_type_liability,other,TRUE +2932,2932,creditori per avalli ,29,account.data_account_type_liability,other,TRUE +3,3,VALORE DELLA PRODUZIONE ,0,account.data_account_type_view,view,TRUE +31,31,VENDITE E PRESTAZIONI ,3,account.data_account_type_view,view,TRUE +3101,3101,merci c/vendite ,31,account.data_account_type_income,other,TRUE +3103,3103,rimborsi spese di vendita ,31,account.data_account_type_income,other,TRUE +3110,3110,resi su vendite ,31,account.data_account_type_income,other,TRUE +3111,3111,ribassi e abbuoni passivi ,31,account.data_account_type_income,other,TRUE +3112,3112,premi su vendite ,31,account.data_account_type_income,other,TRUE +32,32,RICAVI E PROVENTI DIVERSI ,3,account.data_account_type_view,view,TRUE +3201,3201,fitti attivi ,32,account.data_account_type_income,other,TRUE +3202,3202,proventi vari ,32,account.data_account_type_income,other,TRUE +3210,3210,arrotondamenti attivi ,32,account.data_account_type_income,other,TRUE +3220,3220,plusvalenze ordinarie diverse ,32,account.data_account_type_income,other,TRUE +3230,3230,sopravvenienze attive ordinarie diverse ,32,account.data_account_type_income,other,TRUE +3240,3240,insussistenze attive ordinarie diverse ,32,account.data_account_type_income,other,TRUE +4,4,COSTI DELLA PRODUZIONE ,0,account.data_account_type_view,view,TRUE +41,41,COSTO DEL VENDUTO ,4,account.data_account_type_view,view,TRUE +4101,4101,merci c/acquisti ,41,account.data_account_type_expense,other,TRUE +4102,4102,materie di consumo c/acquisti ,41,account.data_account_type_expense,other,TRUE +4105,4105,merci c/apporti ,41,account.data_account_type_expense,other,TRUE +4110,4110,resi su acquisti ,41,account.data_account_type_expense,other,TRUE +4111,4111,ribassi e abbuoni attivi ,41,account.data_account_type_expense,other,TRUE +4112,4112,premi su acquisti ,41,account.data_account_type_expense,other,TRUE +4121,4121,merci c/esistenze iniziali ,41,account.data_account_type_expense,other,TRUE +4122,4122,materie di consumo c/esistenze iniziali ,41,account.data_account_type_expense,other,TRUE +4131,4131,merci c/rimanenze finali ,41,account.data_account_type_expense,other,TRUE +4132,4132,materie di consumo c/rimanenze finali ,41,account.data_account_type_expense,other,TRUE +42,42,COSTI PER SERVIZI ,4,account.data_account_type_view,view,TRUE +4201,4201,costi di trasporto ,42,account.data_account_type_expense,other,TRUE +4202,4202,costi per energia ,42,account.data_account_type_expense,other,TRUE +4203,4203,costi di pubblicità ,42,account.data_account_type_expense,other,TRUE +4204,4204,costi di consulenze ,42,account.data_account_type_expense,other,TRUE +4205,4205,costi postali ,42,account.data_account_type_expense,other,TRUE +4206,4206,costi telefonici ,42,account.data_account_type_expense,other,TRUE +4207,4207,costi di assicurazione ,42,account.data_account_type_expense,other,TRUE +4208,4208,costi di vigilanza ,42,account.data_account_type_expense,other,TRUE +4209,4209,costi per i locali ,42,account.data_account_type_expense,other,TRUE +4210,4210,costi di esercizio automezzi ,42,account.data_account_type_expense,other,TRUE +4211,4211,costi di manutenzione e riparazione ,42,account.data_account_type_expense,other,TRUE +4212,4212,provvigioni passive ,42,account.data_account_type_expense,other,TRUE +4213,4213,spese di incasso ,42,account.data_account_type_expense,other,TRUE +43,43,COSTI PER GODIMENTO BENI DI TERZI ,4,account.data_account_type_view,view,TRUE +4301,4301,fitti passivi ,43,account.data_account_type_expense,other,TRUE +4302,4302,canoni di leasing ,43,account.data_account_type_expense,other,TRUE +44,44,COSTI PER IL PERSONALE ,4,account.data_account_type_view,view,TRUE +4401,4401,salari e stipendi ,44,account.data_account_type_expense,other,TRUE +4402,4402,oneri sociali ,44,account.data_account_type_expense,other,TRUE +4403,4403,TFRL ,44,account.data_account_type_expense,other,TRUE +4404,4404,altri costi per il personale ,44,account.data_account_type_expense,other,TRUE +45,45,AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ,4,account.data_account_type_view,view,TRUE +4501,4501,ammortamento costi di impianto ,45,account.data_account_type_expense,other,TRUE +4506,4506,ammortamento software ,45,account.data_account_type_expense,other,TRUE +4508,4508,ammortamento avviamento ,45,account.data_account_type_expense,other,TRUE +46,46,AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ,4,account.data_account_type_view,view,TRUE +4601,4601,ammortamento fabbricati ,46,account.data_account_type_expense,other,TRUE +4602,4602,ammortamento impianti e macchinari ,46,account.data_account_type_expense,other,TRUE +4604,4604,ammortamento attrezzature commerciali ,46,account.data_account_type_expense,other,TRUE +4605,4605,ammortamento macchine d'ufficio ,46,account.data_account_type_expense,other,TRUE +4606,4606,ammortamento arredamento ,46,account.data_account_type_expense,other,TRUE +4607,4607,ammortamento automezzi ,46,account.data_account_type_expense,other,TRUE +4608,4608,ammortamento imballaggi durevoli ,46,account.data_account_type_expense,other,TRUE +47,47,SVALUTAZIONI ,4,account.data_account_type_view,view,TRUE +4701,4701,svalutazioni immobilizzazioni immateriali ,47,account.data_account_type_expense,other,TRUE +4702,4702,svalutazioni immobilizzazioni materiali ,47,account.data_account_type_expense,other,TRUE +4706,4706,svalutazione crediti ,47,account.data_account_type_expense,other,TRUE +48,48,ACCANTONAMENTI ,4,account.data_account_type_view,view,TRUE +481,481,ACCANTONAMENTI PER RISCHI ,48,account.data_account_type_view,view,TRUE +4814,4814,accantonamento per responsabilità civile ,481,account.data_account_type_expense,other,TRUE +482,482,ALTRI ACCANTONAMENTI ,48,account.data_account_type_view,view,TRUE +4821,4821,accantonamento per spese future ,482,account.data_account_type_expense,other,TRUE +4823,4823,accantonamento per manutenzioni programmate ,482,account.data_account_type_expense,other,TRUE +49,49,ONERI DIVERSI ,4,account.data_account_type_view,view,TRUE +4901,4901,oneri fiscali diversi ,49,account.data_account_type_expense,other,TRUE +4903,4903,oneri vari ,49,account.data_account_type_expense,other,TRUE +4905,4905,perdite su crediti ,49,account.data_account_type_expense,other,TRUE +4910,4910,arrotondamenti passivi ,49,account.data_account_type_expense,other,TRUE +4920,4920,minusvalenze ordinarie diverse ,49,account.data_account_type_expense,other,TRUE +4930,4930,sopravvenienze passive ordinarie diverse ,49,account.data_account_type_expense,other,TRUE +4940,4940,insussistenze passive ordinarie diverse ,49,account.data_account_type_expense,other,TRUE +5,5,PROVENTI E ONERI FINANZIARI ,0,account.data_account_type_view,view,TRUE +51,51,PROVENTI FINANZIARI ,5,account.data_account_type_view,view,TRUE +5110,5110,interessi attivi v/clienti ,51,account.data_account_type_income,other,TRUE +5115,5115,interessi attivi bancari ,51,account.data_account_type_income,other,TRUE +5116,5116,interessi attivi postali ,51,account.data_account_type_income,other,TRUE +5140,5140,proventi finanziari diversi ,51,account.data_account_type_income,other,TRUE +52,52,ONERI FINANZIARI ,5,account.data_account_type_view,view,TRUE +5201,5201,interessi passivi v/fornitori ,52,account.data_account_type_expense,other,TRUE +5202,5202,interessi passivi bancari ,52,account.data_account_type_expense,other,TRUE +5203,5203,sconti passivi bancari ,52,account.data_account_type_expense,other,TRUE +5210,5210,interessi passivi su mutui ,52,account.data_account_type_expense,other,TRUE +5240,5240,oneri finanziari diversi ,52,account.data_account_type_expense,other,TRUE +7,7,PROVENTI E ONERI STRAORDINARI ,0,account.data_account_type_view,view,TRUE +71,71,PROVENTI STRAORDINARI ,7,account.data_account_type_view,view,TRUE +7101,7101,plusvalenze straordinarie ,71,account.data_account_type_income,other,TRUE +7102,7102,sopravvenienze attive straordinarie ,71,account.data_account_type_income,other,TRUE +7103,7103,insussistenze attive straordinarie ,71,account.data_account_type_income,other,TRUE +72,72,ONERI STRAORDINARI ,7,account.data_account_type_view,view,TRUE +7201,7201,minusvalenze straordinarie ,72,account.data_account_type_expense,other,TRUE +7202,7202,sopravvenienze passive straordinarie ,72,account.data_account_type_expense,other,TRUE +7203,7203,insussistenze passive straordinarie ,72,account.data_account_type_expense,other,TRUE +7204,7204,imposte esercizi precedenti ,72,account.data_account_type_expense,other,TRUE +8,8,IMPOSTE DELL'ESERCIZIO ,0,account.data_account_type_view,view,TRUE +8101,8101,imposte dell'esercizio ,8,account.data_account_type_expense,other,TRUE +9,9,CONTI DI RISULTATO ,0,account.data_account_type_view,view,TRUE +9101,9101,conto di risultato economico ,9,account.data_account_type_expense,other,TRUE +9102,9102,stato patrimoniale,9,account.data_account_type_expense,other,TRUE diff --git a/addons/l10n_it/data/account.account.type.csv b/addons/l10n_it/data/account.account.type.csv deleted file mode 100644 index 36eeebbbe89..00000000000 --- a/addons/l10n_it/data/account.account.type.csv +++ /dev/null @@ -1,11 +0,0 @@ -"id","code","name","close_method","report_type" -"account_type_receivable","receivable","Crediti","unreconciled","asset" -"account_type_payable","payable","Debiti","unreconciled","liability" -"account_type_view","view","Gerarchia","none", -"account_type_income","income","Entrate","none","income" -"account_type_expense","expense","Uscite","none","expense" -"account_type_tax","tax","Tasse","balance", -"account_type_cash","cash","Liquidità","balance","asset" -"account_type_asset","asset","Beni","balance","asset" -"account_type_bank","bank","Banca","balance","asset" -"account_type_p_l","p_l","Conto Economico","none", From d11cc6d66c8f585902b1f60a26c5df746d7fdd03 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 5 Mar 2012 15:17:32 +0530 Subject: [PATCH 087/164] [IMP] account,auction,crm,document,hr,mrp,project_*,purchase,sale,stock:- improved Dashboard menus bzr revid: mtr@tinyerp.com-20120305094732-ykp7rv9w0oep7kma --- addons/account/board_account_view.xml | 2 +- addons/auction/board_auction_view.xml | 2 +- addons/crm/board_crm_statistical_view.xml | 4 ++-- addons/document/board_document_view.xml | 6 +++--- addons/event/board_association_view.xml | 2 ++ addons/hr/hr_board.xml | 2 +- addons/mrp/board_manufacturing_view.xml | 4 ++-- addons/project/board_project_view.xml | 11 ++++++----- addons/project_issue/board_project_issue_view.xml | 2 +- addons/project_planning/project_planning_view.xml | 2 +- addons/project_scrum/board_project_scrum_view.xml | 2 +- addons/purchase/board_purchase_view.xml | 4 ++-- addons/sale/board_sale_view.xml | 4 ++-- addons/stock/board_warehouse_view.xml | 2 +- 14 files changed, 26 insertions(+), 23 deletions(-) diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index ffd2811cba7..0ec75e7b5c8 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -61,7 +61,7 @@ - + diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml index 668c5d4352b..cb5ed07804c 100644 --- a/addons/auction/board_auction_view.xml +++ b/addons/auction/board_auction_view.xml @@ -93,7 +93,7 @@ - + - + diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml index 02d45f03dc1..da848bc7fdc 100644 --- a/addons/event/board_association_view.xml +++ b/addons/event/board_association_view.xml @@ -65,6 +65,8 @@ form + - + diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml index 9956aae4ffe..1815c4ceb12 100644 --- a/addons/mrp/board_manufacturing_view.xml +++ b/addons/mrp/board_manufacturing_view.xml @@ -28,8 +28,8 @@ - + + id="menu_project_dasboard" + name="Project" + sequence="25" + parent="base.menu_dasboard" + /> menu - diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml index 079df3f66a6..17237ca18f0 100644 --- a/addons/project_planning/project_planning_view.xml +++ b/addons/project_planning/project_planning_view.xml @@ -299,7 +299,7 @@ + parent="project.menu_project_dasboard"/> diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml index dd01832b575..7d993dd90c9 100644 --- a/addons/project_scrum/board_project_scrum_view.xml +++ b/addons/project_scrum/board_project_scrum_view.xml @@ -98,7 +98,7 @@ diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml index 0bf011e5cc5..74f34a45cb6 100644 --- a/addons/purchase/board_purchase_view.xml +++ b/addons/purchase/board_purchase_view.xml @@ -4,8 +4,8 @@ + name="Purchase" + parent="base.menu_dasboard" sequence="5"/> Request for Quotations diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml index 1e8600232bc..57eee7f184b 100644 --- a/addons/sale/board_sale_view.xml +++ b/addons/sale/board_sale_view.xml @@ -30,8 +30,8 @@ - - + + diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index 38ff4a9d854..5c52c6412f3 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -68,7 +68,7 @@ - + From b369760376763eb5d806bc213ad3ef7885fa2e20 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 5 Mar 2012 16:09:09 +0530 Subject: [PATCH 088/164] [IMP] project, project_timesheet:- added 'Projects' menu and removed 'Timesheets by Projects' menu bzr revid: mtr@tinyerp.com-20120305103909-27pjpsv7hyqf4nch --- addons/project/project_view.xml | 2 +- .../project_timesheet/project_timesheet_view.xml | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 0116106f4d1..d1e6c26d635 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -627,7 +627,7 @@ - + diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index f4e01c64d99..0412bdabb38 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -120,19 +120,5 @@ the project form. - - - - Timesheets by Project - ir.actions.act_window - hr_timesheet_sheet.sheet.account - form - - {} - - - - From 768b87a5c0977d4f7dcd27c24cdb05c78c0cd6fd Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 5 Mar 2012 16:20:56 +0530 Subject: [PATCH 089/164] [IMP] event:- removed conflicts bzr revid: mtr@tinyerp.com-20120305105056-ohmobei5pwt4v0ux --- addons/event/event_view.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 517fdc7070c..9936624c243 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -5,12 +5,9 @@ -<<<<<<< TREE - - -======= - ->>>>>>> MERGE-SOURCE + + + From d9611b715584b73d86ca5f21d134d9f6c04d1aef Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 5 Mar 2012 16:30:19 +0530 Subject: [PATCH 090/164] [IMP] account:-moved 'Legal Reports' and 'Generic Reporting' from reporting to accounting menu bzr revid: mtr@tinyerp.com-20120305110019-kpd5rpwawu11qz4t --- addons/account/account_menuitem.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 6112e92db5d..13fa4fdaba7 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -19,16 +19,17 @@ - + + - + - + From 56df8b48388d152a43a310dd9a0fde27251068ab Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 5 Mar 2012 16:57:50 +0530 Subject: [PATCH 091/164] [IMP] base:-added 'Dashboard' and 'Configuration' menu and changed seq bzr revid: mtr@tinyerp.com-20120305112750-v3q17s3zbw960r90 --- openerp/addons/base/base_menu.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index c79b86e6af4..442ca120c6a 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -27,8 +27,10 @@ parent="base.menu_custom" name="Reporting" sequence="30" /> - + + + + From d4d46882014ab61c3b1262303ad79d2e7a78d22c Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 5 Mar 2012 16:58:30 +0530 Subject: [PATCH 092/164] [IMP] base:-reorganised menus and changed sequence bzr revid: mtr@tinyerp.com-20120305112830-z1fki8czis3e5gbc --- openerp/addons/base/res/res_partner_view.xml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 1f0e8f88b1c..51d44bd0cb8 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -6,7 +6,11 @@ web_icon_hover="data/sales-hover.png" groups="base.group_sale_salesman"/> - + + + @@ -175,7 +179,7 @@ - + Addresses ir.actions.act_window @@ -200,7 +204,7 @@ + parent="base.menu_sales" sequence="30"/> - + Leave Requests diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 92a88f9177a..a860b33f4b0 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -2,7 +2,7 @@ - + From cd7948d5f1e42b96d52c3825ef3efec033b86529 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 5 Mar 2012 18:38:10 +0530 Subject: [PATCH 095/164] [IMP] hr_timesheet, hr_timesheet_invoice:-reorganised timesheet reports bzr revid: mtr@tinyerp.com-20120305130810-x3tkpil9ua4uijzq --- addons/hr_timesheet/hr_timesheet_view.xml | 3 +++ .../hr_timesheet/wizard/hr_timesheet_print_employee_view.xml | 2 +- addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml | 2 +- .../wizard/hr_timesheet_analytic_profit_view.xml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 8b038191794..a2dff95e5d2 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -111,6 +111,9 @@ + + + diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml index 63e493cfab7..063481f5211 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml @@ -34,7 +34,7 @@ diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml index 95b7bd3b93e..f51ccc769c4 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml @@ -37,7 +37,7 @@ diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml index 1ed51fc0a63..ee6b619ceeb 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml @@ -38,7 +38,7 @@ + parent="hr_timesheet.menu_hr_timesheet_reports" groups="base.group_extended" icon="STOCK_PRINT"/> From 031cecc67798d418421caf770bfecae268d51c12 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 5 Mar 2012 18:40:28 +0530 Subject: [PATCH 096/164] [IMP] account:-renamed menu Reports=>Reporting bzr revid: mtr@tinyerp.com-20120305131028-qgwhr85s1nxeeg4l --- addons/account/account_menuitem.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 13fa4fdaba7..f86d5f3a359 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -19,7 +19,7 @@ - + From 7c1bbaf4929ad58efc939199485951db45e9f11e Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Mon, 5 Mar 2012 18:59:15 +0530 Subject: [PATCH 097/164] [IMP] survey:-reorganised survey reports menu bzr revid: mtr@tinyerp.com-20120305132915-ro9tzwh6gbnc7b3s --- addons/survey/survey_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 47c1bf4d025..4673bcd9846 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -8,7 +8,7 @@ - + From b4e6775929dc9a78bbc27dbb4e7a413f16e63a90 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 6 Mar 2012 11:12:38 +0530 Subject: [PATCH 098/164] [IMP] point_of_sale: add new menu reporting and Sale Details bzr revid: jap@tinyerp.com-20120306054238-rs8l9ne8mt128k82 --- addons/point_of_sale/point_of_sale_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 22ad2097ab7..adb05fec578 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -770,8 +770,10 @@ [('origin','like','POS')] + + + id="menu_pos_details" parent="menu_point_of_sale_reporting" sequence="6" /> Start Point of Sale From 3c9f6cbfdd34511c1103856c87b956ffcd8fb3e6 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Tue, 6 Mar 2012 11:25:41 +0530 Subject: [PATCH 099/164] [IMP] idea:-removed 'Vote Statistics' menu bzr revid: mtr@tinyerp.com-20120306055541-zv2mhhkoyzto8fc6 --- addons/idea/idea_view.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 08c44d5a3fd..4ad479e763f 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -377,9 +377,6 @@ - - Idea's Votes From 70c7af2e7d9732538fc20163be7af34b494ac144 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 6 Mar 2012 12:04:18 +0530 Subject: [PATCH 100/164] [IMP] hr: add new menu Leaves and Leaves by Department in Reporting bzr revid: jap@tinyerp.com-20120306063418-x7gfvebgtupf24yi --- addons/hr/hr_view.xml | 1 + .../wizard/hr_holidays_summary_department_view.xml | 4 +++- addons/hr_timesheet/hr_timesheet_view.xml | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index fececd99600..9ece120f0f0 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -10,6 +10,7 @@ + - - + Date: Tue, 6 Mar 2012 18:38:07 +0530 Subject: [PATCH 102/164] [IMP] Knowledge: renamed menu Document =>> Knowledge bzr revid: jap@tinyerp.com-20120306130807-na61ox6j6vizwh2t --- addons/document/board_document_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml index a61f459a44a..ee6fc61f896 100644 --- a/addons/document/board_document_view.xml +++ b/addons/document/board_document_view.xml @@ -35,7 +35,7 @@ Date: Wed, 7 Mar 2012 15:21:24 +0530 Subject: [PATCH 103/164] [IMP] change sequence association, event, project in Reporting menu and chege sequence event and project in dashbord menu bzr revid: jap@tinyerp.com-20120307095124-kmpzl4539eguj4mr --- addons/association/profile_association.xml | 2 +- addons/event/board_association_view.xml | 2 +- addons/event/report/report_event_registration_view.xml | 2 +- addons/project/board_project_view.xml | 2 +- addons/project/report/project_report_view.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index e94ac97e921..9be0b6919c7 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -9,6 +9,6 @@ web_icon="images/association.png" web_icon_hover="images/association-hover.png"/> - + diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml index 995e0111f1f..b9187227b1c 100644 --- a/addons/event/board_association_view.xml +++ b/addons/event/board_association_view.xml @@ -63,7 +63,7 @@ + parent="base.menu_dasboard" sequence="25"/> - + diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml index 4d571501919..34de37fd9a7 100644 --- a/addons/project/board_project_view.xml +++ b/addons/project/board_project_view.xml @@ -106,7 +106,7 @@ diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index b0dd3107dc6..87f563f8878 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -4,7 +4,7 @@ + parent="base.menu_reporting" sequence="25"/> From 4eede5cb41476653dd26baad0a062c4e39ed5d40 Mon Sep 17 00:00:00 2001 From: "Meera Trambadia (OpenERP)" Date: Wed, 7 Mar 2012 18:08:01 +0530 Subject: [PATCH 104/164] [IMP] purchase:-removed 'Contacts' menu bzr revid: mtr@tinyerp.com-20120307123801-wbqn9qgel0reh0w8 --- addons/purchase/purchase_view.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index ba817ca4c13..d20448236b3 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -85,9 +85,6 @@ - Date: Wed, 7 Mar 2012 18:09:28 +0530 Subject: [PATCH 105/164] [IMP] base:-removed 'Contacts' menu for sales bzr revid: mtr@tinyerp.com-20120307123928-julgdz7un33vxoqr --- openerp/addons/base/res/res_partner_view.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 51d44bd0cb8..4c0aa349b24 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -202,9 +202,6 @@ - - -%s -%s - -""" + xml1, xml2 = [], [] - xml1.append('' % _('Applications')) + xml1.append(E.separator(string=_('Application'), colspan="4")) for app, kind, gs in self.get_groups_by_application(cr, uid, context): if kind == 'selection': # application name with a selection field field_name = name_selection_groups(map(int, gs)) - xml1.append('' % field_name) - xml1.append('') + xml1.append(E.field(name=field_name)) + xml1.append(E.newline()) else: # application separator with boolean fields app_name = app and app.name or _('Other') - xml2.append('' % app_name) + xml2.append(E.separator(string=app_name, colspan="4")) for g in gs: field_name = name_boolean_group(g.id) - xml2.append('' % field_name) - view.write({'arch': xml % ('\n'.join(xml1), '\n'.join(xml2))}) + xml2.append(E.field(name=field_name)) + + xml = E.field(*(xml1 + xml2), name="groups_id", position="replace") + xml.addprevious(etree.Comment("GENERATED AUTOMATICALLY BY GROUPS")) + xml_content = etree.tostring(xml, pretty_print=True, xml_declaration=True, encoding="utf-8") + view.write({'arch': xml_content}) return True def get_user_groups_view(self, cr, uid, context=None): From 289e318773e72c6916005ba027fcd6676c3352fd Mon Sep 17 00:00:00 2001 From: "Anup (SerpentCS)" Date: Tue, 13 Mar 2012 11:24:24 +0530 Subject: [PATCH 108/164] [IMP] base : Added Symbol of INR bzr revid: anup.chavda@serpentcs.com-20120313055424-jss671oiu8eeosra --- openerp/addons/base/base_data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml index 2503adc5525..a0e66de8dba 100644 --- a/openerp/addons/base/base_data.xml +++ b/openerp/addons/base/base_data.xml @@ -1373,7 +1373,7 @@ INR - Rs + ₹ 0.01 4 From 5f61cb054f7c1ad548cbb80d473a3ceb0d81f6e0 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 13 Mar 2012 14:58:50 +0530 Subject: [PATCH 109/164] [IMP] purchase: renamed menu Purchase management => Purchase bzr revid: jap@tinyerp.com-20120313092850-kzgb867h3i4fp5re --- addons/purchase/purchase_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index d20448236b3..8fd9b88c249 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -5,7 +5,7 @@ groups="group_purchase_manager,group_purchase_user" web_icon="images/purchases.png" web_icon_hover="images/purchases-hover.png"/> - Date: Tue, 13 Mar 2012 18:44:43 +0530 Subject: [PATCH 110/164] [IMP] crm,sale,sale_order_dates: add group_no_one on field(create_date,write_date etc..) bzr revid: jap@tinyerp.com-20120313131443-05imo5hx69b6cjqp --- addons/crm/crm_lead_view.xml | 12 ++++++------ addons/sale/sale_view.xml | 4 ++-- addons/sale_order_dates/sale_order_dates_view.xml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 44d83f47634..8204fb76fbf 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -178,10 +178,10 @@ - - - - + + + + @@ -190,8 +190,8 @@ - - + + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 90d3838f5a0..7a47f82d1cf 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -237,8 +237,8 @@ - - + + diff --git a/addons/sale_order_dates/sale_order_dates_view.xml b/addons/sale_order_dates/sale_order_dates_view.xml index c6544d5238f..9ccd935cae7 100644 --- a/addons/sale_order_dates/sale_order_dates_view.xml +++ b/addons/sale_order_dates/sale_order_dates_view.xml @@ -9,11 +9,11 @@ - + - - + + From d226aef16737a68d4e6d5f96e29df7a9602efec2 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 13 Mar 2012 18:55:48 +0530 Subject: [PATCH 111/164] [IMP] crm_claim,crm_helpdesk: add group_no_one on field create_date, date_closed and write_date in crm_claim_view.xml, crm_helpdesk_view.xml bzr revid: jap@tinyerp.com-20120313132548-pgdf15gnm35id4xw --- addons/crm_claim/crm_claim_view.xml | 6 +++--- addons/crm_helpdesk/crm_helpdesk_view.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index 6bb7e089baa..ba5c91421ac 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -132,9 +132,9 @@ - - - + + + diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 3d48a3b88ac..68328c6f319 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -118,9 +118,9 @@ - - - + + + From 3683fcafcadbda2b7434db27fab5e7852588128c Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 13 Mar 2012 19:00:37 +0530 Subject: [PATCH 112/164] [IMP] crm_fundraising: add group_no_one on field create_date date_closed duration in crm_fundraising_view.xml bzr revid: jap@tinyerp.com-20120313133037-0q8qcbrvoj2hd0fn --- addons/crm_fundraising/crm_fundraising_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml index cc58b793c17..79620bb7da4 100644 --- a/addons/crm_fundraising/crm_fundraising_view.xml +++ b/addons/crm_fundraising/crm_fundraising_view.xml @@ -164,9 +164,9 @@ - - - + + + From fad2b78740431ac2bcaf22556917afb755b04e62 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Wed, 14 Mar 2012 10:41:15 +0530 Subject: [PATCH 113/164] [IMP] wiki,document,crm_claim: apply group_no_one on field (create_date,write_date ...) bzr revid: jap@tinyerp.com-20120314051115-jlnpdup6fh9wymnf --- addons/crm_claim/crm_claim_view.xml | 4 ++-- addons/document/document_view.xml | 12 ++++++------ addons/wiki/wiki_view.xml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index ba5c91421ac..befca3fe3ab 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -49,7 +49,7 @@ - +