From 3e195a7ceebfff3a4c72b23f842f60522549e126 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 30 Jun 2010 13:18:08 +0200 Subject: [PATCH 1/8] [IMP] crm: another encoding issue fixed in crm + cleanup bzr revid: odo@openerp.com-20100630111808-zrkcjrahu3ija53t --- addons/crm/board_crm_view.xml | 1 - addons/crm/wizard/crm_send_email.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index 4729ab7283d..30caaeb5ac9 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -90,7 +90,6 @@ - Date: Wed, 30 Jun 2010 16:53:18 +0530 Subject: [PATCH 2/8] [FIX] mrp: mrp.pot duplication of msg id fixed bzr revid: mra@mra-laptop-20100630112318-lruso2l4ihpt5n2c --- addons/mrp/i18n/mrp.pot | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot index 5a1dde3c2a9..bd5bcdb2587 100644 --- a/addons/mrp/i18n/mrp.pot +++ b/addons/mrp/i18n/mrp.pot @@ -1947,12 +1947,6 @@ msgstr "" msgid "Stock value variation" msgstr "" - -#. module: mrp -#: view:board.board:0 -msgid "Stock value variation" -msgstr "" - #. module: mrp #: view:board.board:0 msgid "Next production orders" From dfd29b154e1f0e158b026c9bda325a0418351869 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 30 Jun 2010 13:25:27 +0200 Subject: [PATCH 3/8] [IMP] crm: another encoding issue fixed in crm + cleanup bzr revid: odo@openerp.com-20100630112527-1vf0fciy34vuw8o8 --- addons/crm/wizard/crm_send_email.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index bf0390cc2ef..01e14375d89 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -174,7 +174,7 @@ class crm_send_new_email(osv.osv_memory): if 'email_from' in fields: res.update({'email_from': user_mail_from}) if 'subject' in fields: - res.update({'subject': ustr(context.get('subject', case.name) or '')}) + res.update({'subject': tools.ustr(context.get('subject', case.name) or '')}) if 'email_cc' in fields: res.update({'email_cc': case.email_cc or ''}) if 'text' in fields: From c8f509dd939f13ea361e75ff7bba33872f673855 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 30 Jun 2010 16:57:16 +0530 Subject: [PATCH 4/8] [FIX] purchase: purchase.pot duplication of msg id fixed bzr revid: mra@mra-laptop-20100630112716-141sx7ez9uvwf4y3 --- addons/purchase/i18n/purchase.pot | 8 -------- 1 file changed, 8 deletions(-) diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot index 9b0d906c3fa..5ff4c01d9ff 100644 --- a/addons/purchase/i18n/purchase.pot +++ b/addons/purchase/i18n/purchase.pot @@ -857,20 +857,12 @@ msgstr "" msgid "Waiting Schedule" msgstr "" - -#. module: purchase -#: selection:report.purchase.order.category,state:0 -#: selection:report.purchase.order.product,state:0 -msgid "Invoice Exception" -msgstr "" - #. module: purchase #: field:report.purchase.order.category,price_total:0 #: field:report.purchase.order.product,price_total:0 msgid "Total Price" msgstr "" - #. module: purchase #: selection:report.purchase.order.category,state:0 #: selection:report.purchase.order.product,state:0 From ed3c20582ab1aed343cb6a7653ea2c053ccb1b10 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 30 Jun 2010 17:08:01 +0530 Subject: [PATCH 5/8] [FIX] project: project.pot duplication of msg id fixed bzr revid: mra@mra-laptop-20100630113801-evyxbe51mlwi9gcy --- addons/project/i18n/project.pot | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot index 05d651eeda7..e6038a49b39 100644 --- a/addons/project/i18n/project.pot +++ b/addons/project/i18n/project.pot @@ -1293,11 +1293,6 @@ msgstr "" msgid "Tasks Closed by Project" msgstr "" -#. module: project -#: selection:report.closed.task,state:0 -msgid "In Progress" -msgstr "" - #. module: project #: model:ir.actions.act_window,name:project.action_project_task #: model:ir.ui.menu,name:project.menu_project_task_user_tree @@ -1530,11 +1525,6 @@ msgstr "" msgid "Closed Tasks" msgstr "" -#. module: project -#: selection:report.task.user.pipeline.open,task_state:0 -msgid "Open" -msgstr "" - #. module: project #: field:report.closed.task,planned_hours:0 msgid "Planned Hours" From 8e5d585551133fc835877dbb46dc42f6c655ef0e Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 30 Jun 2010 17:15:40 +0530 Subject: [PATCH 6/8] [FIX] project: project.pot duplication of msg id fixed bzr revid: mra@mra-laptop-20100630114540-k8snk50vqc7f5lwd --- addons/project/i18n/project.pot | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot index e6038a49b39..2f99ea0ccf2 100644 --- a/addons/project/i18n/project.pot +++ b/addons/project/i18n/project.pot @@ -1300,12 +1300,6 @@ msgstr "" msgid "Tasks by User" msgstr "" -#. module: project -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" -msgstr "" - #. module: project #: field:report.closed.task,remaining_hours:0 msgid "Remaining Hours" From a8e3cdf803948baa3ebfaa8e63ceece5f87dfc6e Mon Sep 17 00:00:00 2001 From: "Anup (OpenERP)" Date: Wed, 30 Jun 2010 17:33:13 +0530 Subject: [PATCH 7/8] [IMP] event,mrp_repair,sale : Minor edit on notification messages bzr revid: ach@tinyerp.com-20100630120313-nmsy7o8z9kpfo8ps --- addons/event/wizard/event_make_invoice_view.xml | 4 ++-- addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml | 2 +- addons/sale/wizard/sale_line_invoice.xml | 2 +- addons/sale/wizard/sale_make_invoice.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/event/wizard/event_make_invoice_view.xml b/addons/event/wizard/event_make_invoice_view.xml index 68a07ceeee8..ce9a9e2375f 100644 --- a/addons/event/wizard/event_make_invoice_view.xml +++ b/addons/event/wizard/event_make_invoice_view.xml @@ -8,7 +8,7 @@ form
- + @@ -38,4 +38,4 @@ view_mode="form" target="new" view_type="form" /> - \ No newline at end of file + diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml index f914d198d06..f856ffa8e22 100644 --- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml +++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml @@ -10,7 +10,7 @@ form - + diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml index 0420a8c3404..eb9100c6777 100644 --- a/addons/sale/wizard/sale_line_invoice.xml +++ b/addons/sale/wizard/sale_line_invoice.xml @@ -7,7 +7,7 @@ form - +