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

[Merge] Merge with trunk server

Browse Source 
bzr revid: vir@tinyerp.com-20100602061840-mkp0qlzzgv5lsyss
This commit is contained in:
Vir (Open ERP)
2010-06-02 11:48:40 +05:30
parent 10fba60b6a 602cefb0c3
commit 8acf7fe516
10 changed files with 25 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/i18n/hr.po
+2 -2
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-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-05-31 04:12+0000\n"
"PO-Revision-Date: 2010-06-01 05:21+0000\n"
"Last-Translator: goranc <goranc@gmail.com>\n"
"Language-Team: openerp-translators\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-01 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-06-02 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
bin/addons/base/i18n/ja.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-05-31 04:11+0000\n"
"PO-Revision-Date: 2010-06-01 05:19+0000\n"
"Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-01 03:41+0000\n"
"X-Launchpad-Export-Date: 2010-06-02 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/pl.po
+3 -3
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-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-05-31 12:39+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
"PO-Revision-Date: 2010-06-01 04:46+0000\n"
"Last-Translator: OpenERP Administrators <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: 2010-06-01 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-06-02 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/sv.po
+2 -2
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-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-05-31 04:13+0000\n"
"PO-Revision-Date: 2010-06-01 05:22+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-06-01 03:43+0000\n"
"X-Launchpad-Export-Date: 2010-06-02 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/uk.po
+2 -2
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-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-05-31 04:12+0000\n"
"PO-Revision-Date: 2010-06-01 05:22+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-06-01 03:43+0000\n"
"X-Launchpad-Export-Date: 2010-06-02 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/zh_CN.po
+2 -2
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-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-05-31 04:12+0000\n"
"PO-Revision-Date: 2010-06-01 05:19+0000\n"
"Last-Translator: OpenERP Administrators <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: 2010-06-01 03:44+0000\n"
"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/res/partner/crm.py
+2 -28
View File
@@ -59,43 +59,17 @@ class res_partner_event(osv.osv):
_name = "res.partner.event"
_columns = {
'name': fields.char('Events',size=64, required=True),
'som': fields.many2one('res.partner.som', 'State of Mind'),
'description': fields.text('Description'),
'planned_cost': fields.float('Planned Cost'),
'planned_revenue': fields.float('Planned Revenue'),
'probability': fields.float('Probability (0.50)'),
'document': fields.reference('Document', selection=_links_get, size=128),
'partner_id': fields.many2one('res.partner', 'Partner', select=True),
'date': fields.datetime('Date', size=16),
'user_id': fields.many2one('res.users', 'User'),
'canal_id': fields.many2one('res.partner.canal', 'Channel'),
'partner_type': fields.selection([('customer','Customer'),('retailer','Retailer'),('prospect','Commercial Prospect')], 'Partner Relation'),
'type': fields.selection([('sale','Sale Opportunity'),('purchase','Purchase Offer'),('prospect','Prospect Contact')], 'Type of Event'),
'event_ical_id': fields.char('iCal id', size=64),
}
_order = 'date desc'
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
'user_id': lambda self, cr, uid, context: uid,
}
res_partner_event()
class res_partner_event_type(osv.osv):
_name = "res.partner.event.type"
_description = "Partner Events"
_columns = {
'name': fields.char('Event Type',size=64, required=True),
'key': fields.char('Key', size=64, required=True),
'active': fields.boolean('Active'),
}
_defaults = {
'active': lambda *a: 1
}
def check(self, cr, uid, key, context={}):
return self.search(cr, uid, [('key','=',key)])
res_partner_event_type()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
bin/addons/base/res/partner/crm_view.xml
+9 -57
View File
@@ -30,44 +30,8 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem id="menu_partner_events" name="Events" parent="menu_config_address_book"/>
<menuitem action="res_partner_canal-act" id="menu_res_partner_canal-act" parent="menu_partner_events"/>
<record id="res_partner_event_type-view" model="ir.ui.view">
<field name="name">res.partner.event.type.form</field>
<field name="model">res.partner.event.type</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Event Type">
<field name="name" select="1"/>
<field name="active" select="1"/>
<field name="key" select="1"/>
</form>
</field>
</record>
<record id="res_partner_event_type_view_tree" model="ir.ui.view">
<field name="name">res.partner.event.type.tree</field>
<field name="model">res.partner.event.type</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Event Type">
<field name="name"/>
<field name="active"/>
</tree>
</field>
</record>
<record id="res_partner_event_type-act" model="ir.actions.act_window">
<field name="name">Active Partner Events</field>
<field name="res_model">res.partner.event.type</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="context">{'active_test': False}</field>
</record>
<menuitem action="res_partner_event_type-act" id="menu_res_partner_event_type-act" parent="menu_partner_events"/>
<menuitem id="next_id_14" name="Partner Events" parent="base.menu_base_config_partner"/>
<menuitem action="res_partner_canal-act" id="menu_res_partner_canal-act" parent="next_id_14"/>
<record id="res_partner_som_tree-view" model="ir.ui.view">
<field name="name">res.partner.som.tree</field>
@@ -98,30 +62,20 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem action="res_partner_som-act" id="menu_res_partner_som-act" parent="menu_partner_events"/>
<menuitem action="res_partner_som-act" id="menu_res_partner_som-act" parent="base.next_id_14"/>
<record id="res_partner_event-wopartner-view_form" model="ir.ui.view">
<field name="name">res.partner.event.form</field>
<field name="model">res.partner.event</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Partner Events">
<form string="Event Logs">
<separator colspan="4" string="General Description"/>
<field name="name" select="1"/>
<field name="partner_type" select="1"/>
<field name="som" select="1"/>
<field name="name" select="1" string="Name"/>
<field name="date" select="1"/>
<field name="canal_id" select="1"/>
<field name="type" select="1"/>
<field name="user_id" select="1"/>
<field name="probability"/>
<field name="planned_revenue"/>
<field name="planned_cost"/>
<separator colspan="4" string="Description"/>
<field colspan="4" name="description"/>
<separator colspan="4" string="Document Link"/>
<field colspan="4" name="document"/>
<field colspan="4" name="description" nolabel="1"/>
</form>
</field>
</record>
@@ -131,14 +85,12 @@
<field name="model">res.partner.event</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Partner Events">
<tree string="Event Logs">
<field name="date"/>
<field name="name"/>
<field name="som"/>
<field name="partner_type"/>
<field name="name" string="Event"/>
<field name="user_id"/>
</tree>
</field>
</record>
</data>
</openerp>
</openerp>
bin/addons/base/res/partner/partner_view.xml
+1 -1
View File
@@ -318,7 +318,7 @@
<field colspan="4" name="comment" nolabel="1"/>
</page>
<page string="History">
<field colspan="4" name="events" nolabel="1" widget="one2many_list"/>
<field colspan="4" name="events" nolabel="1" widget="one2many_list" string="Event Logs"/>
</page>
</notebook>
bin/addons/base/security/ir.model.access.csv
-2
View File
@@ -71,8 +71,6 @@
"access_res_partner_category_group_partner_manager","res_partner_category group_partner_manager","model_res_partner_category","group_partner_manager",1,1,1,1
"access_res_partner_event_group_user","res_partner_event group_user","model_res_partner_event","group_user",1,1,1,1
"access_res_partner_event_group_partner_manager","res_partner_event group_partner_manager","model_res_partner_event","group_partner_manager",1,1,1,1
"access_res_partner_event_type_group_partner_manager","res_partner_event_type group_partner_manager","model_res_partner_event_type","group_partner_manager",1,1,1,1
"access_res_partner_event_type_group_user","res_partner_event_type group_user","model_res_partner_event_type","group_user",1,0,0,0
"access_res_partner_som_group_user","res_partner_som group_user","model_res_partner_som","group_partner_manager",1,1,1,1
"access_res_partner_som_group_partner_manager","res_partner_som group_partner_manager","model_res_partner_som","group_user",1,0,0,0
"access_res_partner_title_group_user","res_partner_title group_user","model_res_partner_title","group_partner_manager",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
71 access_res_partner_category_group_partner_manager res_partner_category group_partner_manager model_res_partner_category group_partner_manager 1 1 1 1
72 access_res_partner_event_group_user res_partner_event group_user model_res_partner_event group_user 1 1 1 1
73 access_res_partner_event_group_partner_manager res_partner_event group_partner_manager model_res_partner_event group_partner_manager 1 1 1 1
access_res_partner_event_type_group_partner_manager res_partner_event_type group_partner_manager model_res_partner_event_type group_partner_manager 1 1 1 1
access_res_partner_event_type_group_user res_partner_event_type group_user model_res_partner_event_type group_user 1 0 0 0
74 access_res_partner_som_group_user res_partner_som group_user model_res_partner_som group_partner_manager 1 1 1 1
75 access_res_partner_som_group_partner_manager res_partner_som group_partner_manager model_res_partner_som group_user 1 0 0 0
76 access_res_partner_title_group_user res_partner_title group_user model_res_partner_title group_partner_manager 1 1 1 1