pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge with trunk addons

Browse Source 
bzr revid: mra@mra-laptop-20100630111118-dw01xhu17k2i0n7x
bzr revid: mra@mra-laptop-20100630114208-4wz4g5hv61fqsy9f
bzr revid: mra@mra-laptop-20100630122122-30k9ubhfezja0ufm
This commit is contained in:
Mustufa Rangwala
2010-06-30 17:51:22 +05:30
parent 5436d87aaf 853388377f
commit ab84b0a9ef
9 changed files with 6 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/board_crm_view.xml
-1
View File
@@ -90,7 +90,6 @@
<field name="view_id" ref="board_crm_form"/>
</record>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
<menuitem
name="CRM Configuration" parent="base.dashboard"
id="menu_board_crm_config"
addons/crm/wizard/crm_send_email.py
+1 -1
View File
@@ -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': str(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:
addons/event/wizard/event_make_invoice_view.xml
+2 -2
View File
@@ -8,7 +8,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create invoices">
<separator colspan="4" string="Do you really want to create the invoices ?" />
<separator colspan="4" string="Do you really want to create the invoice(s) ?" />
<field name="grouped" />
<field name="invoice_date"/>
<group colspan="4">
@@ -38,4 +38,4 @@
view_mode="form" target="new" view_type="form" />
</data>
</openerp>
</openerp>
addons/mrp/i18n/mrp.pot
-6
View File
@@ -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"
addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create invoices">
<separator colspan="4" string="Do you really want to create the invoices ?" />
<separator colspan="4" string="Do you really want to create the invoice(s) ?" />
<field name="group"/>
<newline/>
<group col="2" colspan="4">
addons/project/i18n/project.pot
-162
View File
@@ -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
@@ -1305,17 +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"
msgstr ""
#. module: project
#: selection:report.task.user.pipeline.open,task_state:0
msgid "No Task"
@@ -1326,70 +1310,12 @@ msgstr ""
msgid "Report on tasks by user for projects"
msgstr ""
#. module: project
#: view:report.closed.task:0
msgid "Delay"
msgstr ""
#. module: project
#: selection:report.closed.task,priority:0
msgid "Very Low"
msgstr ""
#. module: project
#: selection:report.closed.task,state:0
#: selection:report.task.user.pipeline.open,task_state:0
msgid "Draft"
msgstr ""
#. module: project
#: selection:report.closed.task,priority:0
msgid "Low"
msgstr ""
#. module: project
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
#. module: project
#: field:report.closed.task,name:0
msgid "Task summary"
msgstr ""
#. module: project
#: selection:report.closed.task,state:0
#: selection:report.task.user.pipeline.open,task_state:0
msgid "Pending"
msgstr ""
#. module: project
#: field:report.closed.task,state:0
#: field:report.task.user.pipeline.open,task_state:0
msgid "Status"
msgstr ""
#. module: project
#: selection:report.closed.task,priority:0
msgid "Medium"
msgstr ""
#. module: project
#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
#: model:ir.ui.menu,name:project.menu_timesheet_task_user
msgid "Timesheet / Task Hours Per Month"
msgstr ""
#. module: project
#: field:report.closed.task,progress:0
msgid "Progress (%)"
msgstr ""
#. module: project
#: field:report.closed.task,priority:0
msgid "Importance"
msgstr ""
#. module: project
#: field:report.task.user.pipeline.open,company_id:0
msgid "Company"
@@ -1406,49 +1332,17 @@ msgid ""
"Gives statistics on tasks by user on projects to check the pipeline of users."
msgstr ""
#. module: project
#: field:report.task.user.pipeline.open,user_id:0
#: field:report.timesheet.task.user,user_id:0
msgid "User"
msgstr ""
#. module: project
#: model:ir.actions.act_window,name:project.action_closed_task_board
msgid "Task Closed Within Past 15 Days"
msgstr ""
#. module: project
#: selection:report.closed.task,priority:0
msgid "Very urgent"
msgstr ""
#. module: project
#: selection:report.closed.task,state:0
#: selection:report.task.user.pipeline.open,task_state:0
msgid "Done"
msgstr ""
#. module: project
#: field:report.task.user.pipeline.open,task_hrs:0
#: field:report.timesheet.task.user,task_hrs:0
msgid "Task Hours"
msgstr ""
#. module: project
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: project
#: field:report.closed.task,delay_hours:0
msgid "Delay Hours"
msgstr ""
#. module: project
#: field:report.closed.task,project_id:0
msgid "Project"
msgstr ""
#. module: project
#: field:report.task.user.pipeline.open,task_nbr:0
msgid "Task Number"
@@ -1459,22 +1353,6 @@ msgstr ""
msgid "report.timesheet.task.user"
msgstr ""
#. module: project
#: model:ir.model,name:project.model_report_task_user_pipeline_open
msgid "Tasks by user and project"
msgstr ""
#. module: project
#: view:report.closed.task:0
msgid "Planned"
msgstr ""
#. module: project
#: selection:report.closed.task,state:0
#: selection:report.task.user.pipeline.open,task_state:0
msgid "Cancelled"
msgstr ""
#. module: project
#: view:report.timesheet.task.user:0
msgid "Timesheet/Task hours Report Per Month"
@@ -1485,41 +1363,11 @@ msgstr ""
msgid "Task Progress"
msgstr ""
#. module: project
#: field:report.closed.task,date_close:0
msgid "Date Closed"
msgstr ""
#. module: project
#: field:report.closed.task,user_id:0
msgid "Assigned to"
msgstr ""
#. module: project
#: field:report.closed.task,sequence:0
msgid "Sequence"
msgstr ""
#. module: project
#: model:ir.model,name:project.model_report_closed_task
msgid "Closed Task Report"
msgstr ""
#. module: project
#: field:report.timesheet.task.user,name:0
msgid "Month"
msgstr ""
#. module: project
#: selection:report.closed.task,priority:0
msgid "Urgent"
msgstr ""
#. module: project
#: field:report.closed.task,date_deadline:0
msgid "Deadline"
msgstr ""
#. module: project
#: field:report.timesheet.task.user,timesheet_hrs:0
msgid "Timesheet Hours"
@@ -1529,13 +1377,3 @@ msgstr ""
#: view:report.closed.task:0
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"
msgstr ""
addons/purchase/i18n/purchase.pot
-8
View File
@@ -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
addons/sale/wizard/sale_line_invoice.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create invoices">
<separator colspan="4" string="Do you really want to create the invoices ?" />
<separator colspan="4" string="Do you really want to create the invoice(s) ?" />
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
</form>
addons/sale/wizard/sale_make_invoice.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create invoices">
<separator colspan="4" string="Do you really want to create the invoices ?" />
<separator colspan="4" string="Do you really want to create the invoice(s) ?" />
<field name="grouped"/>
<newline/>
<field name="invoice_date"/>