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

[MERGE]

Browse Source 
bzr revid: uco@tinyerp.co.in-20100203131837-ev4fqk1w35vs0yhk
bzr revid: uco@tinyerp.co.in-20100204050020-dstaqr69sn2z3mq2
This commit is contained in:
uco (OpenERP)
2010-02-04 10:30:20 +05:30
parent 243e3d2fe0 6da6d27f86
commit 1c2bd4c353
56 changed files with 358 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/i18n/it.po
+10 -5
View File
@@ -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-01-29 14:02+0000\n"
"Last-Translator: Carlo <Unknown>\n"
"PO-Revision-Date: 2010-02-03 19:01+0000\n"
"Last-Translator: Davide Corio <davide.corio@domsense.com>\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-01-30 04:39+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -288,6 +288,11 @@ msgid ""
"date empty, it means direct payment. The payment term may compute several "
"due dates, for example 50% now, 50% in one month."
msgstr ""
"Se vengono utilizzati i termini di pagamento, la data di scadenza verrà "
"calcolata automaticamente alla generazione dei movimenti contabili. Se i "
"termini di pagamento e la data di scadenza non vengono valorizzati, equivale "
"al pagamento diretto. Il termine di pagamento può essere calcolato a fronte "
"di diverse scadenze, per esempio 50% subito e 50% dopo un mese."
#. module: account
#: selection:account.tax,type:0
@@ -321,7 +326,7 @@ msgstr "Origine"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Move Name"
msgstr ""
msgstr "Nome Movimento"
#. module: account
#: xsl:account.transfer:0
@@ -353,7 +358,7 @@ msgstr "Tassa"
#. module: account
#: rml:account.general.journal:0
msgid "Debit Trans."
msgstr ""
msgstr "Debito Trans."
#. module: account
#: field:account.analytic.line,account_id:0
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+2 -1
View File
@@ -1,6 +1,7 @@
<openerp>
<data>
<menuitem id="next_id_71" name="Financial Project Management" parent="project.menu_main" groups="account.group_account_invoice" sequence="20"/>
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
<menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>
<menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/>
<record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
addons/account_analytic_analysis/i18n/nl.po
+1 -1
View File
@@ -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-02-02 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_anglo_saxon/i18n/pl.po
+1 -1
View File
@@ -14,7 +14,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-02-03 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
addons/account_budget/crossovered_budget_view.xml
+8
View File
@@ -294,6 +294,14 @@
auto="False"
menu="False"/>-->
<!--Menu for project management-->
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
<menuitem id="base.menu_pm_invoicing" name="Invoicing" parent="base.menu_main_pm" sequence="7"/>
<menuitem id="menu_pm_budget" name="Budgets" parent="base.menu_pm_invoicing"/>
<menuitem action="open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
<menuitem parent="menu_pm_budget"
id="menu_act_pm_crossovered_budget_view"
action="act_crossovered_budget_view" />
</data>
</openerp>
addons/account_followup/i18n/nl.po
+1 -1
View File
@@ -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-02-02 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
addons/account_reporting/i18n/ru.po
+1 -1
View File
@@ -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-02-03 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
addons/auction/i18n/pt_BR.po
+1 -1
View File
@@ -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-02-02 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
addons/base_calendar/base_calendar_data.xml
+13 -3
View File
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
<data noupdate="1">
<!-- Event attributes-->
@@ -54,7 +54,12 @@
<field name="name">valarm</field>
<field name="type">vevent</field>
</record>
<record model="basic.calendar.attributes" id="field_event_vtimezone">
<field name="name">vtimezone</field>
<field name="type">vevent</field>
</record>
<record model="basic.calendar.attributes" id="field_event_priority">
<field name="name">priority</field>
<field name="type">vevent</field>
@@ -172,7 +177,12 @@
<field name="name">seq</field>
<field name="type">vtodo</field>
</record>
<record model="basic.calendar.attributes" id="field_todo_vtimezone">
<field name="name">vtimezone</field>
<field name="type">vtodo</field>
</record>
<record model="basic.calendar.attributes" id="field_todo_url">
<field name="name">url</field>
<field name="type">vtodo</field>
addons/base_contact/i18n/nl.po
+1 -1
View File
@@ -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-02-02 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
addons/base_module_merge/i18n/ru.po
+4 -4
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 06:51+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-02-03 23:27+0000\n"
"Last-Translator: Artyom Packhomov <Unknown>\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: 2009-12-16 05:26+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_merge
@@ -60,7 +60,7 @@ msgstr "Версия"
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
msgstr ""
msgstr "Запись модуля"
#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
addons/base_module_quality/i18n/ru.po
+1 -1
View File
@@ -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-02-03 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
addons/base_report_creator/i18n/zh_CN.po
+1 -1
View File
@@ -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-02-03 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_creator
addons/base_setup/i18n/ru.po
+1 -1
View File
@@ -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-02-03 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
addons/base_vat/i18n/ru.po
+1 -1
View File
@@ -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-02-03 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_vat
addons/board_crm_configuration/i18n/it.po
+1 -1
View File
@@ -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-02-03 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_crm_configuration
addons/board_warehouse/board_warehouse_view.xml
+11 -2
View File
@@ -5,6 +5,15 @@
<field name="name">Warehouse</field>
</record>
<record id="action_reception_picking_move_board" model="ir.actions.act_window">
<field name="name">Reception Picking Stock Move</field>
<field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('picking_id','!=',False),('picking_id.type','=','in'),('date','&lt;=',time.strftime('%Y-%m-%d 23:59:59'))]</field>
<field name="view_id" ref="stock.view_move_tree_reception_picking"/>
</record>
<record id="board_warehouse_form" model="ir.ui.view">
<field name="name">board.warehouse.form</field>
@@ -15,11 +24,11 @@
<hpaned position="100">
<child1>
<action colspan="4" name="%(mrp.mrp_procurement_action5)d" string="Procurement Exceptions" width="510" />
<action colspan="4" name="%(stock.action_reception_picking_move)d" string="Products To Receive" />
<action colspan="4" name="%(action_reception_picking_move_board)d" string="Products To Receive" />
</child1>
<child2>
<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Products To Receive" width="510"/>
<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Number of Products to receive Vs planned" width="510"/>
<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
</child2>
</hpaned>
addons/caldav/caldav.py
+18 -20
View File
@@ -188,13 +188,6 @@ class calendar_attendee(osv.osv):
name = name[0]
result = {}
def get_delegate_data(user):
if not user.address_id.email:
raise osv.except_osv(_('Error!'), \
("User does not have an email Address"))
email = (user.address_id and ('MAILTO:' + user.address_id.email)) or ''
return email
for attdata in self.browse(cr, uid, ids, context=context):
id = attdata.id
result[id] = {}
@@ -213,13 +206,10 @@ class calendar_attendee(osv.osv):
else:
result[id][name] = self._get_address(None, attdata.email)
if name == 'delegated_to':
user_obj = self.pool.get('res.users')
todata = map(get_delegate_data, attdata.del_to_user_ids)
todata = map(lambda x:('MAILTO:' + x.email) or '', attdata.del_to_user_ids)
result[id][name] = ', '.join(todata)
if name == 'delegated_from':
dstring = []
user_obj = self.pool.get('res.users')
fromdata = map(get_delegate_data, attdata.del_from_user_ids)
fromdata = map(lambda x:('MAILTO:' + x.email) or '', attdata.del_from_user_ids)
result[id][name] = ', '.join(fromdata)
if name == 'event_date':
if attdata.ref:
@@ -288,11 +278,11 @@ class calendar_attendee(osv.osv):
string='Delegated To', type="char", size=124, store=True, \
multi='delegated_to', help="The users that the original \
request was delegated to"),
'del_to_user_ids': fields.many2many('res.users', 'att_del_to_user_rel',
'del_to_user_ids': fields.many2many('calendar.attendee', 'att_del_to_user_rel',
'attendee_id', 'user_id', 'Users'),
'delegated_from': fields.function(_compute_data, method=True, string=\
'Delegated From', type="char", store=True, size=124, multi='delegated_from'),
'del_from_user_ids': fields.many2many('res.users', 'att_del_from_user_rel', \
'del_from_user_ids': fields.many2many('calendar.attendee', 'att_del_from_user_rel', \
'attendee_id', 'user_id', 'Users'),
'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"),
'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'),
@@ -1169,6 +1159,9 @@ class invite_attendee_wizard(osv.osv_memory):
}
def do_invite(self, cr, uid, ids, context={}):
model2field = {
'calendar.attendee': 'del_to_user_ids',
'crm.meeting': 'attendee_ids'}
datas = self.read(cr, uid, ids)[0]
if not context or not context.get('model'):
return {}
@@ -1178,7 +1171,9 @@ class invite_attendee_wizard(osv.osv_memory):
res_obj = obj.browse(cr, uid, context['active_id'])
type = datas.get('type')
att_obj = self.pool.get('calendar.attendee')
vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))}
vals = {}
if not model == 'calendar.attendee':
vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))}
if type == 'internal':
user_obj = self.pool.get('res.users')
for user_id in datas.get('user_ids', []):
@@ -1189,7 +1184,7 @@ class invite_attendee_wizard(osv.osv_memory):
vals.update({'user_id': user_id,
'email': user.address_id.email})
att_id = att_obj.create(cr, uid, vals)
obj.write(cr, uid, res_obj.id, {'attendee_ids': [(4, att_id)]})
obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
elif type == 'external' and datas.get('email'):
vals.update({'email': datas['email']})
@@ -1200,7 +1195,7 @@ class invite_attendee_wizard(osv.osv_memory):
(att.partner_id and att.partner_id.name) or \
att.email) + ' - Status: ' + att.state.title())
att_id = att_obj.create(cr, uid, vals)
obj.write(cr, uid, res_obj.id, {'attendee_ids': [(4, att_id)]})
obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
sign = res_obj.user_id and res_obj.user_id.signature or ''
sign = '<br>'.join(sign and sign.split('\n') or [])
sub = '[%s Invitation][%d] %s' % (company, att_id, res_obj.name)
@@ -1217,22 +1212,25 @@ class invite_attendee_wizard(osv.osv_memory):
body = html_invitation % body_vals
mail_to = [datas['email']]
tools.email_send(
tools.config.get('email_from',False),
tools.config.get('email_from', False),
mail_to,
sub,
body,
subtype='html',
reply_to=tools.config.get('email_from',False)
reply_to=tools.config.get('email_from', False)
)
elif type == 'partner':
add_obj = self.pool.get('res.partner.address')
for contact in add_obj.browse(cr, uid, datas['contact_ids']):
if not contact.email:
raise osv.except_osv(_('Error!'), \
("Partner does not have an email Address"))
vals.update({
'partner_address_id': contact.id,
'email': contact.email})
att_id = att_obj.create(cr, uid, vals)
obj.write(cr, uid, res_obj.id, {'attendee_ids': [(4, att_id)]})
obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
return {}
addons/crm/crm.py
+8 -8
View File
@@ -22,14 +22,14 @@
import time
import re
import os
import mx.DateTime
import base64
import tools
import mx.DateTime
from tools.translate import _
import tools
from osv import fields,osv,orm
from osv import fields
from osv import osv
from osv import orm
from osv.orm import except_orm
MAX_LEVEL = 15
@@ -584,7 +584,7 @@ class crm_case(osv.osv):
"Reminder: [%s] %s" % (str(case.id), case.name, ),
self.format_body(body),
reply_to=case.section_id.reply_to,
tinycrm=str(case.id),
openobject_id=str(case.id),
attach=attach_to_send
)
if flag:
@@ -644,7 +644,7 @@ class crm_case(osv.osv):
'['+str(case.id)+'] '+case.name,
self.format_body(body),
reply_to=case.section_id.reply_to,
tinycrm=str(case.id)
openobject_id=str(case.id)
)
return True
@@ -840,7 +840,7 @@ class crm_email_add_cc_wizard(osv.osv_memory):
subject or '['+str(case.id)+'] '+case.name,
crm_case.format_body(body),
email_cc = [email],
tinycrm=str(case.id)
openobject_id=str(case.id)
)
if flag:
crm_case.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc +','+ email or email})
addons/crm/crm_lead.py
+3 -2
View File
@@ -33,10 +33,11 @@ class crm_lead(osv.osv):
_order = "id desc"
_inherit = 'crm.case'
_columns = {
'name': fields.char('Lead Subject', size=64),
'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
'type_id': fields.many2one('crm.case.resource.type', 'Lead Type Name', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
'partner_name': fields.char("Employee's Name", size=64),
'partner_name2': fields.char('Employee Email', size=64),
'partner_name': fields.char("Lead Name", size=64),
'partner_name2': fields.char('Email', size=64),
'partner_phone': fields.char('Phone', size=32),
'partner_mobile': fields.char('Mobile', size=32),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
addons/crm/crm_lead_view.xml
+85 -85
View File
@@ -26,87 +26,89 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Leads Form">
<group colspan="4" col="7">
<field name="name" select="1" string="Lead Subject"/>
<field name="section_id" colspan="1" widget="selection"/>
<field name="opportunity_id" string="Opportunity Case"/>
<button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
<label string="Stage: " align="1.0"/>
<group colspan="1" col="2">
<field name="stage_id" select="1" nolabel="1"/>
<button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
<group colspan="4" col="4">
<field name="partner_name" string="Lead Name" required="1"/>
<field name="name" string="Lead Subject"/>
<field name="partner_name2" string="Contact Name"/>
<field name="email_from" string="Email"/>
<newline/>
<group colspan="4" col="5">
<label string="" colspan="2"/>
<button string="Create Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>
<button string="Convert to Partner"
icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
/>
</group>
</group>
<field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
<field name="type_id" string="Campaign Type" select="1"/>
<newline/>
<field name="date"/>
<field name="date_deadline"/>
<field name="user_id" select="2"/>
</group>
<notebook colspan="4">
<page string="Leads">
<separator string="Lead Information" colspan="4"/>
<field name="partner_name" string="Lead Name"/>
<field name="partner_name2" string="Contact Name"/>
<field name="partner_phone"/>
<field name="partner_mobile"/>
<field name="email_from" string="Lead Email"/>
<newline/>
<label string="Partner:" align="1.0"/>
<group colspan="1" col="2">
<field name="partner_id" nolabel="1" colspan="1"/>
<button string="Convert to Partner"
icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
/>
</group>
<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
<group colspan="4" col="4">
<notebook>
<page string="Leads">
<separator colspan="4" string="Communication"/>
<field name="partner_id" string="Partner"/>
<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
<field name="partner_phone"/>
<field name="partner_mobile"/>
<separator colspan="4" string="Status and Categarization"/>
<group colspan="4" col="6">
<field name="user_id" select="2"/>
<field name="stage_id" select="1" string="Status" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
<field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
<field name="type_id" string="Campaign" select="1"/>
<field name="section_id" colspan="1" widget="selection"/>
<field name="priority" string="Priority"/>
<field name="date" string="Create Date"/>
</group>
<separator colspan="4" string="Details"/>
<field name="description" nolabel="1" colspan="4"/>
<field name="priority" string="Priority"/>
<newline/>
<separator colspan="4" string="Lead Details"/>
<field name="description" nolabel="1" colspan="4"/>
<separator colspan="4"/>
<group col="8" colspan="4">
<field name="state" select="2"/>
<button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close"/>
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
</group>
</page>
<page string="Emails" groups="base.group_extended">
<group colspan="4">
<field colspan="4" name="email_cc" string="CC"/>
</group>
<field name="history_line" colspan="4" nolabel="1" mode="form,tree">
<form string="Communication history">
<group col="7" colspan="4">
<field name="date"/>
<separator colspan="4"/>
<group col="8" colspan="4">
<field name="state" select="2"/>
<button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close"/>
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
<button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
</group>
</page>
<page string="Emails" groups="base.group_extended">
<group colspan="4">
<field colspan="4" name="email_cc" string="CC"/>
</group>
<field name="history_line" colspan="4" nolabel="1" mode="form,tree">
<form string="Communication history">
<group col="7" colspan="4">
<field name="date"/>
<field name="email"/>
<field name="canal_id"/>
<button
string="Add a CC"
name="%(crm.action_view_crm_email_add_cc_wizard)d"
icon="gtk-add" type="action"/>
</group>
<newline/>
<field name="description" colspan="4" nolabel="1"/>
<button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-go-forward" type="action"/>
</form>
<tree string="Communication history">
<field name="description"/>
<field name="email"/>
<field name="canal_id"/>
<button
string="Add a CC"
name="%(crm.action_view_crm_email_add_cc_wizard)d"
icon="gtk-add" type="action"/>
</group>
<newline/>
<field name="description" colspan="4" nolabel="1"/>
<button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-go-forward" type="action"/>
</form>
<tree string="Communication history">
<field name="description"/>
<field name="email"/>
<field name="date"/>
</tree>
</field>
<button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
</page>
</notebook>
<field name="date"/>
</tree>
</field>
<button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
</page>
</notebook>
</group>
</form>
</field>
</record>
@@ -115,14 +117,12 @@
<field name="model">crm.lead</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Leads Tree" colors="red:state=='open';black:state in ('draft', 'pending');grey: state in ('cancel','done')">
<field name="id"/>
<field name="name" string="Lead Subject"/>
<field name="partner_phone"/>
<field name="partner_name2" string="Contact Name"/>
<field name="stage_id"/>
<tree string="Leads Tree" colors="red:state=='open';black:state in ('draft', 'pending');grey: state in ('cancel','done')">
<field name="partner_name" string="Lead Name"/>
<field name="stage_id" string="Status"/>
<field name="create_date"/>
<field name="categ_id" string="Lead Source"/>
<field name="type_id" string="Campaign Type"/>
<field name="email_from" string="Email"/>
<field name="user_id"/>
<field name="state"/>
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
addons/crm/crm_meeting_data.xml
+7 -2
View File
@@ -53,8 +53,6 @@
<field name="object_id" search="[('model','=','calendar.attendee')]" />
</record>
<record model="basic.calendar.fields" id="map_event_1">
<field name="name" ref="base_calendar.field_event_uid"/>
<field name="type_id" ref="caldav.calendar_lines_event" />
@@ -68,6 +66,13 @@
<field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]" />
<field name="fn">field</field>
</record>
<record model="basic.calendar.fields" id="map_event_3">
<field name="name" ref="base_calendar.field_event_vtimezone"/>
<field name="type_id" ref="caldav.calendar_lines_event" />
<field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.event')]" />
<field name="fn">field</field>
</record>
<record model="basic.calendar.fields" id="map_event_4">
<field name="name" ref="base_calendar.field_event_attendee" />
addons/crm/crm_opportunity.py
+1
View File
@@ -44,6 +44,7 @@ class crm_opportunity(osv.osv):
'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
'date_closed': fields.datetime('Closed', readonly=True),
'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),
'partner_phone': fields.char('Phone', size=32),
}
crm_opportunity()
addons/crm/crm_opportunity_view.xml
+39 -30
View File
@@ -39,37 +39,45 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Opportunities">
<group colspan="4" col="7">
<field name="name" select="1" string="Opportunity" colspan="2"/>
<field name="section_id" colspan="1" widget="selection"/>
<field name="user_id" select="2" string="Responsible"/>
<button string="Schedule a Meeting"
name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
<newline/>
<label string="Sales Stage: " align="1.0"/>
<group colspan="1" col="2">
<field name="stage_id" select="1" nolabel="1"/>
<button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
</group>
<field name="date" />
<field name="date_deadline"/>
<button string="Schedule a Phone Call"
name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action" />
</group>
<notebook colspan="4">
<page string="Description">
<field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
<field name="email_from" colspan="2"/>
<field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Source"/>
<field name="priority" string="Priority"/>
<field name="type_id" select="1" string="Type"/>
<separator colspan="4" string="Estimates"/>
<field name="planned_revenue"/>
<group colspan="4" col="4">
<field name="name" select="1" string="Opportunity" colspan="4"/>
<field name="planned_revenue" required="1"/>
<field name="planned_cost"/>
<field name="probability"/>
<separator colspan="4" string="Description Information"/>
<field name="description" nolabel="1" colspan="4"/>
<field name="date_deadline" string="Excepted Close Date" required="1"/>
<group colspan="4" col="5">
<label string="" colspan="2"/>
<button string="Schedule Meeting"
name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
<button string="Schedule Call"
name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action" />
</group>
</group>
<group colspan="4" col="4">
<notebook>
<page string="Opportunity">
<separator colspan="4" string="Communication"/>
<field name="partner_id" required="1" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
<field name="email_from" colspan="2" string="Email"/>
<field name="partner_phone" colspan="2"/>
<separator colspan="4" string="Status and Categarization"/>
<group colspan="4" col="6">
<field name="user_id" select="2" string="Responsible"/>
<field name="stage_id" select="1" string="Sales Stage" required="1" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
<field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
<field name="type_id" select="1" string="Campaign"/>
<field name="section_id" colspan="1" widget="selection"/>
<field name="priority" string="Priority"/>
</group>
<separator colspan="4" string="Details"/>
<field name="description" nolabel="1" colspan="4"/>
<separator colspan="4"/>
<group col="8" colspan="4">
@@ -134,6 +142,7 @@
<button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
</page>
</notebook>
</group>
</form>
</field>
</record>
@@ -149,7 +158,7 @@
<field name="partner_id" string="Partner"/>
<field name="planned_revenue"/>
<field name="probability"/>
<field name="date_deadline"/>
<field name="date_deadline" string="Excepted Close Date"/>
<field name="user_id"/>
<field name="state"/>
<button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
addons/crm/i18n/es.po
+1 -1
View File
@@ -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-02-03 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
addons/crm/i18n/it.po
+1 -1
View File
@@ -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-02-03 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
addons/crm/i18n/pt_BR.po
+1 -1
View File
@@ -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-02-03 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
addons/crm/wizard/crm_lead_wizard.py
+1
View File
@@ -117,6 +117,7 @@ class lead2opportunity(wizard.interface):
'date_deadline': lead.date_deadline,
'partner_address_id':lead.partner_address_id.id,
'priority':lead.priority,
'categ_id':lead.categ_id.id,
'date': lead.date,
})
addons/crm/wizard/wizard_crm_new_send_email.py
+2 -2
View File
@@ -89,11 +89,11 @@ def _mass_mail_send(self, cr, uid, data, context):
case.user_id.address_id.email,
emails,
data['form']['subject'],
body,
case_pool.format_body(body),
attach=attach,
reply_to=case.section_id.reply_to,
tinycrm=str(case.id)
openobject_id=str(case.id)
)
if flag:
if data['form']['state'] == 'unchanged':
addons/crm/wizard/wizard_crm_send_email.py
+2 -2
View File
@@ -51,7 +51,7 @@ email_send_fields = {
# this sends an email to ALL the addresses of the selected partners.
def _mass_mail_send(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
case_pool=pool.get('crm.case')
case_pool=pool.get(data['model'])
hist_obj = pool.get('crm.case.history').browse(cr,uid,data['ids'])[0]
case = hist_obj.log_id.case_id
@@ -71,7 +71,7 @@ def _mass_mail_send(self, cr, uid, data, context):
data['form']['subject'],
case_pool.format_body(body),
reply_to=case.section_id.reply_to,
tinycrm=str(case.id)
openobject_id=str(case.id)
)
return {}
addons/crm_project/report_crm_project_bug_view.xml
+8 -8
View File
@@ -35,7 +35,7 @@
</field>
</field>
</record>
<record id="view_crm_project_bug_user_graph" model="ir.ui.view">
<field name="name">report.crm.project.bug.user.graph</field>
<field name="model">report.crm.project.bug.user</field>
@@ -59,7 +59,7 @@
</field>
</field>
</record>
<record id="action_report_crm_project_bug_user_tree" model="ir.actions.act_window">
<field name="name">Project Bug by User and Section</field>
<field name="res_model">report.crm.project.bug.user</field>
@@ -68,11 +68,11 @@
<field name="view_id" ref="view_crm_project_bug_user_graph"/>
<field name="search_view_id" ref="view_crm_project_bug_user_filter"/>
</record>
<menuitem id="menu_project_report" name="Reporting" parent="project.menu_main" sequence="50"/>
<menuitem name="Project Bug" id="menu_crm_project_bug_tree" parent="menu_project_report"/>
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
<menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
<menuitem name="Project Bug" id="menu_crm_project_bug_tree" parent="base.menu_project_report" sequence="1"/>
<menuitem action="action_report_crm_project_bug_user_tree" id="menu_crm_project_bug_user_tree" parent="menu_crm_project_bug_tree"/>
<!-- # Project Bug by section and category of case -->
<record id="view_crm_project_bug_categ_tree" model="ir.ui.view">
@@ -188,6 +188,6 @@
<field name="view_id" ref="view_report_crm_project_bug_section_graph"/>
<field name="search_view_id" ref="view_report_crm_project_bug_section_filter"/>
</record>
<menuitem action="action_report_crm_project_bug_section_tree" id="menu_crm_project_bug_section_tree" parent="menu_crm_project_bug_tree"/>
<menuitem action="action_report_crm_project_bug_section_tree" id="menu_crm_project_bug_section_tree" parent="menu_crm_project_bug_tree"/>
</data>
</openerp>
</openerp>
addons/document/i18n/nl.po
+1 -1
View File
@@ -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-02-02 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
addons/document/i18n/zh_CN.po
+1 -1
View File
@@ -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-02-03 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
addons/event/event.py
+3 -3
View File
@@ -201,7 +201,7 @@ class event_registration(osv.osv):
if reg_id.email_cc:
dest += [reg_id.email_cc]
if dest and src:
tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, tinycrm = str(reg_id.case_id.id))
tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.case_id.id))
if not src:
raise osv.except_osv(_('Error!'), _('You must define a reply-to address in order to mail the participant. You can do this in the Mailing tab of your event. Note that this is also the place where you can configure your event to not send emails automaticly while registering'))
return False
@@ -216,9 +216,9 @@ class event_registration(osv.osv):
if reg_id.event_id.mail_auto_confirm or reg_id.event_id.mail_auto_registr:
if dest and src:
if reg_id.event_id.state in ['draft', 'fixed', 'open','confirm','running'] and reg_id.event_id.mail_auto_registr:
tools.email_send(src, dest,'Auto Registration: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_registr, tinycrm = str(reg_id.case_id.id))
tools.email_send(src, dest,'Auto Registration: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_registr, openobject_id = str(reg_id.case_id.id))
if (reg_id.event_id.state in ['confirm','running']) and reg_id.event_id.mail_auto_confirm:
tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, tinycrm = str(reg_id.case_id.id))
tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.case_id.id))
if not src:
raise osv.except_osv(_('Error!'), _('You must define a reply-to address in order to mail the participant. You can do this in the Mailing tab of your event. Note that this is also the place where you can configure your event to not send emails automaticly while registering'))
return False
addons/google_map/i18n/hi.po
+1 -1
View File
@@ -14,7 +14,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-02-02 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: google_map
addons/hr/i18n/nl.po
+1 -1
View File
@@ -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-02-02 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
addons/hr_attendance/hr_attendance_wizard.xml
+7
View File
@@ -11,6 +11,13 @@
<menuitem action="si_so" id="menu_si_so" parent="menu_hr_time_tracking" type="wizard" sequence="1"
groups="group_hr_attendance"/>
<!--Time Tracking menu for Project Management-->
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
<menuitem
id="base.menu_project_management_time_tracking"
name="Time Tracking"
parent="base.menu_main_pm" sequence="3"/>
<menuitem action="hr_attendance.si_so" id="menu_project_management_si_so" parent="base.menu_project_management_time_tracking" type="wizard" sequence="9"/>
</data>
</openerp>
addons/hr_expense/i18n/nl.po
+1 -1
View File
@@ -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-02-02 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_expense
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+8
View File
@@ -219,6 +219,14 @@
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<!--Time Tracking menu in project Management-->
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
<menuitem
id="base.menu_project_management_time_tracking"
name="Time Tracking"
parent="base.menu_main_pm" sequence="3"/>
<menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
groups="hr.group_hr_manager" sequence="5"/>
<!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
<menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
groups="hr.group_hr_manager"/>
addons/olap/i18n/it.po
+1 -1
View File
@@ -14,7 +14,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-02-03 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap
addons/project/__terp__.py
+1 -1
View File
@@ -26,7 +26,7 @@
"author" : "Tiny",
"website" : "http://www.openerp.com",
"category" : "Generic Modules/Projects & Services",
"depends" : ["product", "account", "hr", "process", "mail_gateway","hr_timesheet_sheet","report_timesheet","account_budget"],
"depends" : ["product", "account", "hr", "process", "mail_gateway"],
"description": """Project management module that track multi-level projects, tasks,
works done on tasks, eso. It is able to render planning, order tasks, eso.
""",
addons/project/project.py
+9 -6
View File
@@ -108,7 +108,7 @@ class project(osv.osv):
'category_id': fields.many2one('account.analytic.account','Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."),
'priority': fields.integer('Sequence'),
'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team."),
'resource_ids': fields.many2many('resource.resource', 'project_resource_rel', 'project_id', 'resource_id', 'Project Members', help="Project's member. Not used in any computation, just for information purpose."),
'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose."),
'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project."),
'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project."),
@@ -521,18 +521,21 @@ class message(osv.osv):
_name = "project.message"
_description = "Message"
_columns = {
'subject': fields.char('Subject', size=128),
'description': fields.char('Description', size =128),
'subject': fields.char('Subject', size=128, required="True"),
'description': fields.text('Description'),
'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
'date': fields.date('Date'),
'user_id': fields.many2one('res.users', 'User'),
'user_id': fields.many2one('res.users', 'User', required="True"),
}
def _default_project(self, cr, uid, context={}):
if 'project_id' in context and context['project_id']:
return int(context['project_id'])
return False
return False
_defaults = {
'project_id':_default_project}
'user_id' : lambda self,cr,uid,ctx : uid,
'project_id':_default_project}
message()
def _project_get(self, cr, uid, context={}):
addons/project/project_view.xml
+17 -30
View File
@@ -1,25 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem icon="terp-project" id="menu_main" name="Project Management"/>
<menuitem id="menu_project_management" name="Project Management" parent="menu_main" sequence="1"/>
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
<menuitem id="menu_project_management" name="Project Management" parent="base.menu_main_pm" sequence="1"/>
<menuitem id="menu_pm_invoicing" name="Invoicing" parent="menu_main" sequence="7"/>
<menuitem id="menu_pm_budget" name="Budgets" parent="menu_pm_invoicing"/>
<menuitem action="account_budget.open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
<menuitem parent="menu_pm_budget"
id="menu_act_pm_crossovered_budget_view"
action="account_budget.act_crossovered_budget_view" />
<menuitem id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="60"/>
<!--Time Tracking menu-->
<menuitem
id="menu_project_management_time_tracking"
name="Time Tracking"
parent="menu_main" sequence="3"/>
<menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="menu_project_management_time_tracking"
groups="hr.group_hr_manager"/>
<menuitem action="report_timesheet.action_random_timesheet_lines_board" id="menu_project_management_timesheet_lines_board" parent="menu_project_management_time_tracking"/>
<menuitem action="hr_attendance.si_so" id="menu_project_management_si_so" parent="menu_project_management_time_tracking" type="wizard"/>
<menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
<!-- Project -->
<record id="edit_project" model="ir.ui.view">
@@ -43,12 +28,13 @@
<field name="priority"/>
<field name="resource_calendar_id"/>
<field name="active" select="2"/>
<newline/>
<field name="planned_hours" widget="float_time"/>
<field name="effective_hours" widget="float_time"/>
<newline/>
<separator colspan="4" string="Project's members"/>
<field colspan="4" name="resource_ids" nolabel="1"/>
<field colspan="4" name="members" nolabel="1"/>
<group col="9" colspan="8">
<field name="state" select="1"/>
<button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
@@ -146,7 +132,7 @@
</tree>
</field>
</record>
<!--<menuitem id="menu_all_project" parent="project.menu_main" name="Projects"/> -->
<!--<menuitem id="menu_all_project" parent="base.menu_main_pm" name="Projects"/> -->
<record id="open_view_project_all" model="ir.actions.act_window">
<field name="name">Projects</field>
@@ -462,7 +448,7 @@
<filter domain="[('manager_id','=',False)]" help="Unassigned Project" icon="terp-project"/>
</field>
<field name="user_id" select="1" widget="selection">
<filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute"/>
<filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" default="1"/>
<filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
</field>
</group>
@@ -627,14 +613,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Messages">
<group colspan="6">
<field name="subject" select="1"/>
<field name="description"/>
<field name="project_id" />
<field name="date" select="2"/>
<field name="user_id" select="1"/>
</group>
</form>
<group colspan="6">
<field name="subject" select="1" string="Title"/>
<field name="project_id"/>
<field name="user_id" select="1"/>
<field name="date" select="2"/>
</group>
<separator string="Description" colspan="4"/>
<field name="description" nolabel="1" colspan="4"/>
</form>
</field>
</record>
@@ -661,7 +648,7 @@
<field name="view_id" ref="view_project_message_tree"/>
</record>
<!--<menuitem id="menu_message_main" name="Message" parent="menu_main"/>-->
<!--<menuitem id="menu_message_main" name="Message" parent="base.menu_main_pm"/>-->
<menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_project_management" sequence="11"/>
<act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
addons/project/project_wizard.xml
+2 -2
View File
@@ -5,11 +5,11 @@
<wizard id="wizard_delegate_task" menu="False" model="project.task" name="project.task.delegate" string="Delegate Task"/>
<wizard id="wizard_compute_task" model="project.task" name="wizard.compute.tasks" string="Compute Task Scheduling"/>
<menuitem icon="terp-project" id="menu_main" name="Project Management"/>
<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>
<menuitem
action="wizard_compute_task"
id="menu_wizard_compute_task"
parent="menu_main"
parent="base.menu_pm_planning"
type="wizard"
sequence="1"/>
addons/project/security/ir.model.access.csv
+2
View File
@@ -1,6 +1,8 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1
"access_account_analytic_account_manager","account.analytic.account","account.model_account_analytic_account","project.group_project_user",1,1,1,1
"access_project_project","project.project","model_project_project","project.group_project_user",1,0,0,0
"access_account_analytic_account","account.analytic.account","account.model_account_analytic_account","project.group_project_user",1,0,0,0
"access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,0,0,1
"access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
"access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_project_project_manager project.project manager model_project_project project.group_project_manager 1 1 1 1
3 access_account_analytic_account_manager account.analytic.account account.model_account_analytic_account project.group_project_user 1 1 1 1
4 access_project_project project.project model_project_project project.group_project_user 1 0 0 0
5 access_account_analytic_account account.analytic.account account.model_account_analytic_account project.group_project_user 1 0 0 0
6 access_project_task_type_user project.task.type user model_project_task_type project.group_project_user 1 0 0 1
7 access_project_task_type project.task.type model_project_task_type project.group_project_manager 1 1 1 1
8 access_project_task_manager project.task manager model_project_task project.group_project_manager 1 1 1 1
addons/report_analytic_planning/report_analytic_planning_view.xml
+1 -1
View File
@@ -217,7 +217,7 @@
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="account_analytic_planning_view_search"/>
</record>
<menuitem id="base.menu_pm_planning" name="Planning" parent="project.menu_main" sequence="5"/>
<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>
<menuitem id="planning_main" name="Long Term Planning"
parent="base.menu_pm_planning" />
addons/report_project/i18n/nl.po
+1 -1
View File
@@ -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-02-02 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_project
addons/report_sale/report_sale_view.xml
+12
View File
@@ -64,6 +64,12 @@
<field name="month" select="1"/>
<field name="product_id" select="1"/>
<field name="state" select="1"/>
<group expand="1" string="Group By..." colspan="4" col="20">
<filter string="By Year" icon="terp-sale" domain="[]" context="{'group_by'name'}"/>
<filter string="By Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
<filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
<filter string="By Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
</group>
</group>
</search>
</field>
@@ -145,6 +151,12 @@
<field name="month" select="1"/>
<field name="category_id" select="1"/>
<field name="state" select="1"/>
<group expand="1" string="Group By..." colspan="4" col="20">
<filter string="By Year" icon="terp-sale" domain="[]" context="{'group_by'name'}"/>
<filter string="By Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
<filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
<filter string="By Category" icon="terp-sale" domain="[]" context="{'group_by':'category_id'}"/>
</group>
</group>
</search>
</field>
addons/report_task/report_task_view.xml
+3 -2
View File
@@ -8,6 +8,7 @@
sequence="40" />
<!-- Tasks by projects and users -->
<record id="view_task_project_form" model="ir.ui.view">
<field name="name">report.project.task.form</field>
@@ -81,8 +82,8 @@
<field name="domain">[]</field>
<field name="search_view_id" ref="view_report_task_user_pipeline_open_search"/>
</record>
<menuitem id="next_id_57" name="Reporting" parent="project.menu_main" sequence="50"/>
<menuitem action="action_project_task" id="menu_project_task_user_tree" parent="next_id_57"/>
<menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
<menuitem action="action_project_task" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
<!-- Closed Task in Random Acitivities dashboard -->
addons/report_timesheet/report_timesheet_view.xml
+7
View File
@@ -369,6 +369,13 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_random_timesheet_lines_tree"/>
</record>
<!--Time Tracking menu in project Management-->
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
<menuitem
id="base.menu_project_management_time_tracking"
name="Time Tracking"
parent="base.menu_main_pm" sequence="3"/>
<menuitem action="action_random_timesheet_lines_board" id="menu_project_management_timesheet_lines_board" parent="base.menu_project_management_time_tracking" sequence="7"/>
<!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>-->
<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board" name="Timesheets Lines"
addons/sale/sale_view.xml
+5
View File
@@ -242,6 +242,11 @@
<filter icon="terp-sale" domain="[('user_id','child_of',[uid])]" help="My Departments Sale Orders"/>
</field>
<field name="date_order" select="1"/>
<group expand="1" string="Group By..." colspan="4" col="20">
<filter string="By User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="By Parnter" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="By Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
</group>
</group>
</search>
</field>
addons/sale_crm/sale_crm_view.xml
+3 -7
View File
@@ -8,13 +8,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
<field name="arch" type="xml">
<field name="user_id" position="replace">
<label string="Responsible: " align="1.0"/>
<group colspan="1" col="2">
<field name="user_id" select="2" nolabel="1" string="Responsible"/>
<button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
</group>
</field>
<xpath expr="/form[@string='Opportunities']/group/group/button[@string='Schedule Call']" position="after">
<button string="Quotation" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
</xpath>
</field>
</record>
addons/scrum/scrum_view.xml
+1 -1
View File
@@ -47,7 +47,7 @@
<field name="view_id" ref="view_scrum_project_tree"/>
<field name="domain">[('parent_id','=',False),('scrum','=',1)]</field>
</record>
<menuitem id="next_id_67" name="Scrum" parent="project.menu_main"/><menuitem action="action_scrum_project_tree" id="menu_action_scrum_project_tree" parent="next_id_67"/>
<menuitem id="next_id_67" name="Scrum" parent="base.menu_main_pm"/><menuitem action="action_scrum_project_tree" id="menu_action_scrum_project_tree" parent="next_id_67"/>
<record id="action_scrum_project_form" model="ir.actions.act_window">
<field name="name">Edit Projects</field>
addons/stock/stock.py
+32 -12
View File
@@ -1656,12 +1656,21 @@ class report_products_to_received_planned(osv.osv):
tools.drop_view_if_exists(cr, 'report_products_to_received_planned')
cr.execute("""
create or replace view report_products_to_received_planned as (
select
distinct current_date as date,
min(id) as id,
(select sum(product_qty) from stock_move where to_char(date,'YYYY-MM-DD')::date = current_date ) as qty,
(select sum(product_qty) from stock_move where to_char(date_planned,'YYYY-MM-DD')::date = current_date) as planned_qty
from stock_move
select stock.date, min(stock.id), sum(stock.product_qty) as qty, 0 as planned_qty
from stock_picking picking
inner join stock_move stock
on picking.id = stock.picking_id and picking.type = 'in'
where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
group by stock.date
union
select stock.date_planned, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
from stock_picking picking
inner join stock_move stock
on picking.id = stock.picking_id and picking.type = 'in'
where stock.date_planned between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
group by stock.date_planned
)
""")
report_products_to_received_planned()
@@ -1681,12 +1690,23 @@ class report_delivery_products_planned(osv.osv):
tools.drop_view_if_exists(cr, 'report_delivery_products_planned')
cr.execute("""
create or replace view report_delivery_products_planned as (
select
distinct current_date as date,
min(sm.id) as id,
(select sum(product_qty) from stock_move join stock_picking sp on (sm.picking_id = sp.id ) where to_char(sm.date,'YYYY-MM-DD')::date = current_date ) as qty,
(select sum(product_qty) from stock_move join stock_picking sp on (sm.picking_id = sp.id ) where to_char(sm.date_planned,'YYYY-MM-DD')::date = current_date) as planned_qty
from stock_move sm join stock_picking sp on (sm.picking_id = sp.id ) where sp.type = 'out' group by sm.picking_id, sm.date, sm.date_planned
select stock.date, min(stock.id), sum(stock.product_qty) as qty, 0 as planned_qty
from stock_picking picking
inner join stock_move stock
on picking.id = stock.picking_id and picking.type = 'out'
where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
group by stock.date
union
select stock.date_planned, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
from stock_picking picking
inner join stock_move stock
on picking.id = stock.picking_id and picking.type = 'out'
where stock.date_planned between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
group by stock.date_planned
)
""")
report_delivery_products_planned()
addons/stock/stock_view.xml
+1 -1
View File
@@ -1515,7 +1515,7 @@
</record>
<record id="action_move_graph_reception_picking" model="ir.actions.act_window">
<field name="name">Reception Picking Stock Move</field>
<field name="name">Number of Products to receive Vs planned</field>
<field name="res_model">report.products.to.received.planned</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
addons/thunderbird/i18n/it.po
+1 -1
View File
@@ -14,7 +14,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-02-03 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: thunderbird