From ada7a18cefe285500fde3a0a9cda9d7f1ca123e5 Mon Sep 17 00:00:00 2001
From: "RGA(Open ERP)" <>
Date: Thu, 3 Jun 2010 14:21:24 +0530
Subject: [PATCH 01/13] [IMP,FIX] Sales Configuration menu Improved
bzr revid: vir@tinyerp.com-20100603085124-4az0nn4t3pq12ayd
---
addons/crm/crm_lead_view.xml | 17 ++++++-----
addons/crm/crm_meeting_view.xml | 4 +--
addons/crm/crm_opportunity_view.xml | 14 ++++-----
addons/crm/crm_phonecall_view.xml | 11 ++++---
addons/crm/crm_view.xml | 35 ++++++++++++++---------
addons/mail_gateway/mail_gateway_view.xml | 8 ++----
6 files changed, 48 insertions(+), 41 deletions(-)
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 31872e27ef4..dbfbeedf0a8 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -12,9 +12,11 @@
[('object_id.model', '=', 'crm.lead')]
{'object_id':'crm.lead'}
-
+
+
+
@@ -26,10 +28,11 @@
[('object_id.model', '=', 'crm.lead')]
{'object_id':'crm.lead'}
-
+
+
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e84bbb673ee..e2decc30340 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -13,8 +13,8 @@
{'object_id':'crm.meeting'}
-
+
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 8b5cc42c502..407c3c53cf4 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,8 +14,8 @@
+ id="menu_crm_case_opportunity-act" name="Categories"
+ parent="menu_crm_config_opportunity" />
@@ -29,8 +29,8 @@
+ id="menu_crm_opportunity_stage_act" name="Stages"
+ parent="menu_crm_config_opportunity" />
@@ -44,8 +44,8 @@
+ id="menu_crm_opportunity_resource_act" name="Resource"
+ parent="menu_crm_config_opportunity" />
@@ -329,7 +329,7 @@
-
+
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 65b77ed5abe..c5813a38b09 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -13,8 +13,8 @@
{'object_id':'crm.phonecall'}
-
+
@@ -27,10 +27,9 @@
{'object_id':'crm.phonecall'}
-
-
+
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 52450419fd2..f854981858c 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,8 +1,20 @@
-
+
+
+
+
+
+
+
+
+
@@ -117,9 +129,7 @@
-
-
-
+
crm.case.categ.form
@@ -156,11 +166,11 @@
form
-
+ id="menu_crm_case_section_act" sequence="4"
+ parent="base.menu_crm_config_sales" />
+
@@ -201,8 +211,6 @@
form
-
Cases by section
@@ -342,10 +350,11 @@
form
tree,form
-
+ groups="base.group_extended" sequence="5"
+ parent="base.menu_crm_config_sales" />
view.users.form.crm.modif.inherited1
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 611416055f7..e5b7b426fe9 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -165,13 +165,9 @@
+
-
Date: Thu, 3 Jun 2010 14:57:55 +0530
Subject: [PATCH 02/13] [IMP] stock_*, survey : New icons are added for views
bzr revid: vir@tinyerp.com-20100603092755-f9lah87tbak53yq0
---
.../stock/report/report_stock_move_view.xml | 34 ++---
.../report/report_stock_picking_view.xml | 30 ++--
addons/stock/report/report_stock_view.xml | 16 +--
addons/stock/stock_view.xml | 128 +++++++++---------
addons/stock_planning/stock_planning_view.xml | 2 +-
addons/survey/survey_view.xml | 10 +-
6 files changed, 110 insertions(+), 110 deletions(-)
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 673fd14e76e..a3771b4a480 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -44,16 +44,16 @@
-
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index e570e2b55ea..a14298ff771 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -54,38 +54,38 @@
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 27f18d4ff43..34121d0c9ed 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -9,17 +9,17 @@
-
-
-
+
+
+
-
-
+
+
@@ -155,12 +155,12 @@
search
-
-
-
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 92653501ed3..e9e5fa8b5e3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -55,9 +55,9 @@
-
-
-
+
+
+
@@ -271,7 +271,7 @@
-
+
@@ -280,8 +280,8 @@
-
-
+
+
@@ -438,11 +438,11 @@
search
-
-
-
@@ -712,10 +712,10 @@
-
-
+
+
-
+
@@ -723,10 +723,10 @@
-
-
-
-
+
+
+
+
@@ -859,20 +859,20 @@
-
-
+
+
-
+
-
-
-
-
+
+
+
+
@@ -1041,8 +1041,8 @@
-
-
+
+
@@ -1051,11 +1051,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -1216,9 +1216,9 @@
-
+
-
+
@@ -1226,13 +1226,13 @@
-
-
+
+
-
+
-
-
+
+
@@ -1275,20 +1275,20 @@
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1397,9 +1397,9 @@
-
+
-
+
@@ -1407,18 +1407,18 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
-
+
+
@@ -1526,9 +1526,9 @@
-
-
-
+
+
+
@@ -1539,12 +1539,12 @@
-
-
-
+
+
+
-
-
+
+
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index dfca96b0163..1bfb1d0f1aa 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -239,7 +239,7 @@
-
+
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index f838739d0da..a604b7c7c37 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -255,8 +255,8 @@
-
-
+
+
@@ -1065,13 +1065,13 @@
-
-
+
+
-
+
From d497f5c6e979971f6221480b3578714f0b07ee72 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Wed, 2 Jun 2010 15:06:25 +0200
Subject: [PATCH 03/13] [FIX] Define the local variable 'res'
bzr revid: stephane@openerp.com-20100602130625-0xl1sqo57h6f0kue
---
addons/account/account.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/addons/account/account.py b/addons/account/account.py
index 04a0bb5da68..61319f7f973 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1965,13 +1965,12 @@ class account_add_tmpl_wizard(osv.osv_memory):
if not tids or not tids[0]['parent_id']:
return False
ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]],['code'])
+ res = None
if not ptids or not ptids[0]['code']:
raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
res = acc_obj.search(cr,uid,[('code','=',ptids[0]['code'])])
- if res:
- return res[0]
- else:
- return False
+
+ return res and res[0] or False
_columns = {
'cparent_id':fields.many2one('account.account', 'Parent target', help="Creates an account with the selected template under this existing parent.", required=True),
From feb6c1ed59ada372c46aff35c60b0a829028abc5 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Thu, 3 Jun 2010 11:49:51 +0200
Subject: [PATCH 04/13] [FIX] Typo
bzr revid: stephane@openerp.com-20100603094951-vx4fxk1qsldkep4l
---
addons/stock/stock_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e9e5fa8b5e3..d821ab39d51 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1451,7 +1451,7 @@
-
+
From 235193bc757e12f891b1bb63130f29c14381d91a Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Thu, 3 Jun 2010 11:50:41 +0200
Subject: [PATCH 05/13] [FIX] Remove the duplicated xml_id
bzr revid: stephane@openerp.com-20100603095041-i1588xri2lefsi75
---
addons/purchase/report/purchase_report_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 00c1c62f0ff..8fb7836468d 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -1,7 +1,7 @@
-
+
product.month.graph
purchase.report
graph
From 859b9b84c56f5d197c8f01046ae844758cd5ff6a Mon Sep 17 00:00:00 2001
From: Stephane Wirtel
Date: Thu, 3 Jun 2010 11:51:06 +0200
Subject: [PATCH 06/13] [REF] Refactor the code of the wizard 'Sign In / Sign
Out' [FIX] Remove the unless exception handling
bzr revid: stephane@openerp.com-20100603095106-4v2uvxg3g6eakp82
---
.../wizard/hr_timesheet_sign_in_out.py | 43 ++++++-------------
1 file changed, 14 insertions(+), 29 deletions(-)
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index fa57cfdd1a5..dc1a6723786 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -115,31 +115,19 @@ class hr_si_project(osv.osv_memory):
# get the latest action (sign_in or out) for this employee
cr.execute('select action from hr_attendance where employee_id=%s and action in (\'sign_in\',\'sign_out\') order by name desc limit 1', (emp_id,))
res = (cr.fetchone() or ('sign_out',))[0]
+ in_out = res == 'sign_out' and 'out' or 'in'
#TODO: invert sign_in et sign_out
- if res == 'sign_out':
- model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_in')])
- resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
- return {
- 'name': 'Sign in / Sign out',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'hr.sign.in.project',
- 'views': [(False,'tree'), (resource_id,'form')],
- 'type': 'ir.actions.act_window',
- 'target': 'new'
- }
- else:
- model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_out')])
- resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
- return {
- 'name': 'Sign in / Sign out',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'hr.sign.out.project',
- 'views': [(False,'tree'), (resource_id,'form')],
- 'type': 'ir.actions.act_window',
- 'target': 'new'
- }
+ model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_%s' % in_out)])
+ resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+ return {
+ 'name': 'Sign in / Sign out',
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'hr.sign.%s.project' % in_out,
+ 'views': [(False,'tree'), (resource_id,'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new'
+ }
def _get_empid(self, cr, uid, context=None):
emp_obj = self.pool.get('hr.employee')
@@ -153,10 +141,7 @@ class hr_si_project(osv.osv_memory):
emp_obj = self.pool.get('hr.employee')
data = self.read(cr, uid, ids, [], context)[0]
emp_id = data['emp_id']
- try:
- success = emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data['date'] or False)
- except except_osv, e:
- raise osv.except_osv(e.name, e.value)
+ success = emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data['date'] or False)
return {}
def default_get(self, cr, uid, fields_list, context=None):
@@ -166,4 +151,4 @@ class hr_si_project(osv.osv_memory):
hr_si_project()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
From 8ce1789a575992f1cc7eab99ee1f1d6a9839d4c3 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)"
Date: Thu, 3 Jun 2010 17:10:23 +0530
Subject: [PATCH 07/13] [FIX]: crm: context problem of onchange in forward to
partner wizard
bzr revid: rpa@tinyerp.com-20100603114023-2uwwm7sopkw6ccle
---
addons/crm/wizard/crm_forward_to_partner.py | 4 ++--
addons/crm/wizard/crm_forward_to_partner_view.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 156ab3311f4..945066506d7 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -107,8 +107,8 @@ class crm_lead_forward_to_partner(osv.osv_memory):
#TODO: ids and context are not comming
res = False
msg_val = ''
- res_id = False # Comes from context
- model = None # Comes from context
+ res_id = context.get('active_id')
+ model = context.get('active_model')
model_pool = self.pool.get(model)
if not res_id or not model:
return res
diff --git a/addons/crm/wizard/crm_forward_to_partner_view.xml b/addons/crm/wizard/crm_forward_to_partner_view.xml
index 1e8c6fc8583..b6295cfa3a9 100644
--- a/addons/crm/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm/wizard/crm_forward_to_partner_view.xml
@@ -9,7 +9,7 @@
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index d02c76bc44c..a3e4cac2a5f 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -13,8 +13,8 @@
-
-
+
+
@@ -243,15 +243,15 @@
-
-
-
+
+
+
-
-
@@ -261,12 +261,12 @@
-
-
-
-
+
+
+
+
-
+
@@ -344,10 +344,10 @@
-
+
-
+
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 6ccd1e80ab9..5406a7a3fbd 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -42,32 +42,32 @@
-
-
-
-
@@ -75,16 +75,16 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 8aa0802fcda..90ee35d21e2 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -61,15 +61,15 @@
-
+
-
-
+ action="action_idea_select"/>
@@ -139,7 +139,7 @@
-
+
@@ -153,10 +153,10 @@
-
-
-
-
+
+
+
+
@@ -218,20 +218,20 @@
-
-
+
+
-
+
-
+
@@ -249,7 +249,7 @@
-
+
@@ -263,9 +263,9 @@
-
-
@@ -273,10 +273,10 @@
-
-
-
-
+
+
+
+
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index fb88b6d283d..3e2d7330291 100755
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -29,20 +29,20 @@
-
+
-
+
-
+
-
+
+
+
@@ -121,7 +121,7 @@
-
+
@@ -139,19 +139,19 @@
search
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
@@ -165,12 +165,12 @@
{'group_by': [], 'search_default_draft': 1, 'search_default_test': 1}
-
+
-
+
-
+
-
+
From 3a06274ee161512c84200c5b2857817980f6e3b2 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting
Date: Fri, 4 Jun 2010 04:45:36 +0100
Subject: [PATCH 10/13] Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100604034536-exdvtemphfb3tt5s
---
addons/account/i18n/de.po | 20 +++++++++++---------
addons/base_vat/i18n/id.po | 2 +-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 4f9893960bf..d2659e92d1c 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-16 09:47+0000\n"
+"PO-Revision-Date: 2010-06-03 20:09+0000\n"
"Last-Translator: Ferdinand @ ChriCar \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-04 03:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -272,10 +272,6 @@ msgid ""
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
-"zeigt die Ansicht des Journalberichtes. Open ERP wird gezeigt welche Felder "
-"sichtbar sein sollen, welche erforderlich sind oder keine Schreibrechte habe "
-"und in der Reihenfolge der Auftragsnummern. Sie können einen eigenen View "
-"für eine schnellere Buchungsbearbeitung herstellen."
#. module: account
#: help:account.invoice,date_due:0
@@ -2176,7 +2172,8 @@ msgid "Analytic Entry"
msgstr "Buchung Analysekonto"
#. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
msgstr "Text Zahlungserinnerung"
@@ -3314,7 +3311,9 @@ msgstr "Buchen OP Ausgleich"
#. module: account
#: wizard_view:account.wizard_paid_open,init:0
msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(Rechnungen müssen ausgeglichen werden)"
+msgstr ""
+"(Rechnungen dürfen nicht ausgeglichen sein, wenn diese wieder geöffnet "
+"werden sollen)"
#. module: account
#: view:account.invoice:0
@@ -5314,7 +5313,7 @@ msgstr "Benutze Buchungsvorlage"
#. module: account
#: wizard_button:account.wizard_paid_open,init,end:0
msgid "No"
-msgstr "Nummer"
+msgstr "Nein"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_partner_account_move
@@ -6062,3 +6061,6 @@ msgstr "Aktivieren, wenn Benutzer das Konto ausgleichen dürfen."
#: wizard_button:account.subscription.generate,init,generate:0
msgid "Compute Entry Dates"
msgstr "Berechne eingegebene Daten"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"
diff --git a/addons/base_vat/i18n/id.po b/addons/base_vat/i18n/id.po
index e969ecfa9ad..b6255217c5a 100644
--- a/addons/base_vat/i18n/id.po
+++ b/addons/base_vat/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-03 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-04 03:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_vat
From 222abd4e03a566ce43e07c5130cb4c470f7e7513 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)"
Date: Fri, 4 Jun 2010 11:32:25 +0530
Subject: [PATCH 11/13] [MOD,IMP]
hr_expense,hr_holidays,hr_recruitment,hr_timesheet,hr_timesheet_invoice_hr_timesheet_sheet
: Icons are changed to new icons
bzr revid: vir@tinyerp.com-20100604060225-0q1hy0m129m3ifah
---
addons/hr_expense/hr_expense_view.xml | 16 +++---
.../report/hr_expense_report_view.xml | 38 ++++++-------
addons/hr_holidays/hr_holidays_view.xml | 20 +++----
.../report/available_holidays_view.xml | 26 ++++-----
.../report/hr_holidays_report_view.xml | 36 ++++++-------
addons/hr_recruitment/hr_recruitment_view.xml | 30 +++++------
.../report/hr_recruitment_report_view.xml | 36 ++++++-------
addons/hr_timesheet/hr_timesheet_view.xml | 2 +-
.../hr_timesheet_invoice_report_view.xml | 54 ++++++++-----------
.../report/report_analytic_view.xml | 16 +++---
.../hr_timesheet_sheet_view.xml | 12 ++---
.../report/timesheet_report_view.xml | 40 +++++++-------
12 files changed, 157 insertions(+), 169 deletions(-)
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index abce10e80f3..35ffc931831 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -127,18 +127,18 @@
@@ -146,18 +146,18 @@
-
-
-
-
+
+
+
-
+
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 6507ff87342..a4aa15e7076 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -51,29 +51,29 @@
-
-
-
@@ -87,22 +87,22 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 74546ff1388..fc9626d831d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -8,27 +8,27 @@
-
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
+
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 34f14271758..5fd9a9c0199 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -48,21 +48,21 @@
-
-
-
-
-
-
@@ -82,15 +82,15 @@
-
-
+
+
-
-
+
+
-
-
-
+
+
+
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index b6afe32fb25..24ea6745270 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -45,36 +45,36 @@
-
-
-
-
-
@@ -83,20 +83,20 @@
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
@@ -105,7 +105,7 @@
-
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 65d5db06fe3..5183587e992 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -216,20 +216,20 @@
search
-
-
-
-
@@ -238,27 +238,27 @@
-
+
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 8a9e913a454..4fca4a8b239 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -47,29 +47,29 @@
-
-
-
@@ -83,21 +83,21 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d7c12b14df7..947f0d34c41 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -50,7 +50,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 880e5837fd2..5712aff7736 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
@@ -47,21 +47,21 @@
-
-
-
-
@@ -69,24 +69,12 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -177,8 +165,8 @@
-
-
+
+
@@ -316,8 +304,8 @@
-
-
+
+
@@ -390,8 +378,8 @@
-
-
+
+
report.analytic.account.close.tree
report.analytic.account.close
@@ -36,7 +36,7 @@
-
+
report.analytic.account.close.graph
report.analytic.account.close
@@ -45,11 +45,11 @@
-
+
-
+
Expired analytic accounts
report.analytic.account.close
@@ -116,8 +116,8 @@
-
-
+
+
@@ -138,6 +138,6 @@
-
+
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 35c20fdce08..f686daf575e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -192,21 +192,21 @@
-
-
+
+
-
-
-
-
+
+
+
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 32e8bda4f7f..0cba7ad179b 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -46,29 +46,29 @@
-
-
-
-
-
-
@@ -76,25 +76,25 @@
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
@@ -103,7 +103,7 @@
-
From fba4d8075c6d9655e12e8ab47b04cec1b2648ffb Mon Sep 17 00:00:00 2001
From: "RGA(Open ERP)" <>
Date: Fri, 4 Jun 2010 11:51:45 +0530
Subject: [PATCH 12/13] [IMP] Improvements in Configuration wizard
bzr revid: vir@tinyerp.com-20100604062145-2d23i9y84ticq0cg
---
addons/base_setup/base_setup_todo.xml | 2 +-
addons/base_setup/gtk_contact_form.py | 5 ++---
addons/base_setup/gtk_contact_form.xml | 4 +---
addons/crm/crm_installer_view.xml | 7 +++++++
addons/marketing/marketing_view.xml | 9 ++++++++-
addons/mrp/mrp_installer.xml | 3 +++
addons/project/project_installer.xml | 3 +++
addons/purchase/wizard/purchase_installer.xml | 4 +++-
addons/report_designer/report_designer_installer.xml | 3 +++
9 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 97c9ea0d301..2d6b400d2c5 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -28,9 +28,9 @@
-
+
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index a9fde39ffde..c62951b13b7 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -71,7 +71,6 @@ class base_gtkcontactform(osv.osv_memory):
'other':fields.boolean('Other'),
'ebook':fields.boolean('ebook'),
'updates':fields.boolean('Updates'),
- 'contact_me':fields.boolean('Contact Me'),
}
def execute(self, cr, uid, ids, context=None):
if context is None:
@@ -81,10 +80,10 @@ class base_gtkcontactform(osv.osv_memory):
company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context)
company_data = company_data and company_data[0] or {}
country = ''
-
+
if company_data.get('country_id', False):
country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name']
-
+
for res in self.read(cr, uid, ids, context=context):
email = res.get('email','')
result = "\ncompany: "+ tools.ustr(company_data.get('name',''))
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index c5578f9bc9a..41711032bf0 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -24,9 +24,7 @@
-
-
-
+
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index e0d84c6eed2..9d92f6f1b95 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -17,6 +17,13 @@
You can enhance OpenERP's basic CRM support with a few additional OpenERP applications
+
+
+ 13
+
+
+
+ Configure
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index cc6200537cf..78f5a742bb6 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -1,7 +1,7 @@
-
+
@@ -21,6 +21,13 @@
position="attributes">
OpenERP provides tools to automate your leads process, design marketing campaigns and profile efficiently your customers.
+
+ 13
+
+
+
+ Configure
+
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index fe4fb6b8348..c3929df10af 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -21,6 +21,9 @@
+
+ Configure
+
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index a127333544f..f7c46066178 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -22,6 +22,9 @@
position="attributes">
Various OpenERP applications are available to bring your project management to the next levels of control and flexibility.
+
+ Configure
+
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index b105b6ba3aa..635297d0f21 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -22,7 +22,9 @@
position="attributes">
After having installed the core purchase application, you can extend it with more modules on needs of your organization
-
+
+ Configure
+
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index bcd0250fb7e..6a48c919460 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -22,6 +22,9 @@
OpenERP's built-in reporting abilities can be improved even further with some of the following applications
+
+ Configure
+
From 47b0585fb5dd89d8373996fe030e74058719d2b1 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)"
Date: Fri, 4 Jun 2010 13:02:54 +0530
Subject: [PATCH 13/13] [IMP,MOD] hr_timesheet_invoice,project : Icon modified.
event : icon changed to new icons
bzr revid: vir@tinyerp.com-20100604073254-tu5cuv89s6ipikt5
---
.../email_template/email_template_account_view.xml | 14 +++++++-------
addons/event/event_view.xml | 8 ++++----
.../report/hr_timesheet_invoice_report_view.xml | 6 +++---
addons/project/project_view.xml | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 5f11fa033f4..573b03e7027 100755
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -1,10 +1,10 @@
-
+
-
+
email_template.account.form
email_template.account
@@ -74,12 +74,12 @@
search
-
-
-
+
+
+
-
-
+
+
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 8bc1712dbf9..a238f637dad 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -127,8 +127,8 @@
-
-
+
+
@@ -282,8 +282,8 @@
-
-
+
+
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 5712aff7736..b3f81e5fbb1 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
@@ -76,9 +76,9 @@
-
-
-
+
+
+
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e979632bab4..f58f026d484 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -412,7 +412,7 @@
-
+