Devishree Brahmbhatt (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-all-home-page-dbr into
lp:openobject-server.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-all-home-page-dbr/+merge/104693
Hello,
I have done changes for home page improvements.
kindly,review this.
Thanks,
DBR
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-all-home-page-dbr/+merge/104693
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-server/trunk-all-home-page-dbr into
lp:openobject-server.
=== modified file 'openerp/addons/base/__openerp__.py'
--- openerp/addons/base/__openerp__.py 2012-04-05 16:52:00 +0000
+++ openerp/addons/base/__openerp__.py 2012-05-04 07:18:20 +0000
@@ -99,6 +99,6 @@
'installable': True,
'auto_install': True,
'certificate': '0076807797149',
- "css": [ 'static/src/css/modules.css' ],
+ "css": [ 'static/src/css/modules.css','static/src/css/partner.css' ],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'openerp/addons/base/ir/ir_ui_menu.py'
--- openerp/addons/base/ir/ir_ui_menu.py 2012-04-18 11:50:50 +0000
+++ openerp/addons/base/ir/ir_ui_menu.py 2012-05-04 07:18:20 +0000
@@ -261,7 +261,7 @@
res = {}
for menu in self.browse(cr, uid, ids, context=context):
res[menu.id] = {}
- if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
+ if menu.parent_id and menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
menu_needaction_res = self.pool.get(menu.action.res_model)._get_needaction_info(cr, uid, uid, domain=menu.action.domain, context=context)
else:
menu_needaction_res = [False, 0]
=== modified file 'openerp/addons/base/module/module_view.xml'
--- openerp/addons/base/module/module_view.xml 2012-03-22 16:01:23 +0000
+++ openerp/addons/base/module/module_view.xml 2012-05-04 07:18:20 +0000
@@ -209,6 +209,8 @@
<field name="help">You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Install" from the form view and then click on "Start Upgrade".</field>
</record>
<menuitem action="open_module_tree" id="menu_module_tree" parent="base.menu_management" sequence="1"/>
+
+ <menuitem icon="terp-administration" id="menu_administration" name="Settings" sequence="50" action="open_module_tree"/>
</data>
</openerp>
=== modified file 'openerp/addons/base/res/res_partner_view.xml'
--- openerp/addons/base/res/res_partner_view.xml 2012-04-25 08:12:50 +0000
+++ openerp/addons/base/res/res_partner_view.xml 2012-05-04 07:18:20 +0000
@@ -185,7 +185,7 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.partner.address</field>
<field name="view_type">form</field>
- <field name="view_mode">tree,form,kanban</field>
+ <field name="view_mode">kanban,tree,form</field>
<field name="context">{"search_default_customer":1}</field>
<field name="search_view_id" ref="view_res_partner_address_filter"/>
<field name="help">Customers (also called Partners in other areas of the system) helps you manage your address book of companies whether they are prospects, customers and/or suppliers. The partner form allows you to track and record all the necessary information to interact with your partners from the company address to their contacts as well as pricelists, and much more. If you installed the CRM, with the history tab, you can track all the interactions with a partner such as opportunities, emails, or sales orders issued.</field>
@@ -202,7 +202,6 @@
<field name="view_id" ref="view_partner_address_form1"/>
<field name="act_window_id" ref="action_partner_address_form"/>
</record>
-
<!--
=========================================
the short form used in the partner form
@@ -503,49 +502,30 @@
<field name="state_id"/>
<templates>
<t t-name="kanban-box">
- <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
- <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
- <div class="oe_module_vignette">
- <a type="edit">
- <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" width="64" height="64" class="oe_module_icon"/>
- </a>
- <div class="oe_module_desc">
- <div class="oe_kanban_box_content oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
- <table class="oe_kanban_table">
- <tr>
- <td class="oe_kanban_title1" align="left" valign="middle">
- <h4><a type="edit"><field name="name"/></a>
- <div t-if="record.parent_id.raw_value"><field name="parent_id"/></div>
- </h4>
- <i><div t-if="record.contact_address.raw_value"><field name="contact_address"/><br/></div>
- <div t-if="record.email.raw_value">
- <field name="email"/><br/></div>
- <div t-if="record.mobile.raw_value">
- <field name="mobile"/><br/>
- </div>
- <div t-if="!record.mobile.raw_value and record.phone.raw_value">
- <field name="phone"/><br/>
- </div></i>
- </td>
- <td t-if="record.is_company.raw_value" valign="top" align="right">
- <!--img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_kanban_gravatar"/-->
- </td>
- </tr>
- </table>
- </div>
- <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
- <div class="oe_kanban_left">
- <a string="Edit" icon="gtk-edit" type="edit"/>
- <a string="Change Color" icon="color-picker" type="color" name="color"/>
- <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
- <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
- </a>
- </div>
- <br class="oe_kanban_clear"/>
- </div>
- </div>
+ <div class="oe_partner_vignette">
+ <div class="oe_partner_img">
+ <a type="edit">
+ <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_partner_img"/>
+ </a>
+ </div>
+ <div class="oe_partner_desc">
+ <h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a>
+ <t t-if="record.function.raw_value">
+ <field name="function"/>
+ </t>
+ </h4>
+ <ul>
+ <li t-if="record.parent_id.raw_value">Address: <field name="parent_id"/></li>
+ <li t-if="record.email.raw_value">Email: <field name="email"/></li>
+ <li t-if="record.phone.raw_value">Phone: <field name="phone"/></li>
+ </ul>
</div>
</div>
+ <script>
+ $('.oe_partner_photo').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_partner_photo_wide') } });
+ </script>
+ <div>
+ </div>
</t>
</templates>
</kanban>
@@ -557,12 +537,12 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.partner</field>
<field name="view_type">form</field>
- <field name="view_mode">tree,form,kanban</field>
+ <field name="view_mode">,kanban, tree,form</field>
<field name="context">{"search_default_customer":1}</field>
<field name="search_view_id" ref="view_res_partner_filter"/>
<field name="help">A customer is an entity you do business with, like a company or an organization. A customer can have several contacts or addresses which are the people working for this company. You can use the history tab, to follow all transactions related to a customer: sales order, emails, opportunities, claims, etc. If you use the email gateway, the Outlook or the Thunderbird plugin, don't forget to register emails to each contact so that the gateway will automatically attach incoming emails to the right partner.</field>
</record>
- <record id="action_partner_form_view1" model="ir.actions.act_window.view">
+ <record id="action_partner_form_view0" model="ir.actions.act_window.view">
<field eval="0" name="sequence"/>
<field name="view_mode">kanban</field>
<field name="view_id" ref="res_partner_kanban_view"/>
@@ -580,8 +560,10 @@
<field name="view_id" ref="view_partner_tree"/>
<field name="act_window_id" ref="action_partner_form"/>
</record>
+
+ <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" action="base.action_partner_form"/>
+
<menuitem id="menu_partner_form" parent="base.menu_sales" action="action_partner_form" sequence="1"/>
-
<record id="action_partner_customer_form" model="ir.actions.act_window">
<field name="name">Customers</field>
<field name="type">ir.actions.act_window</field>
=== added file 'openerp/addons/base/static/src/css/partner.css'
--- openerp/addons/base/static/src/css/partner.css 1970-01-01 00:00:00 +0000
+++ openerp/addons/base/static/src/css/partner.css 2012-05-04 07:18:20 +0000
@@ -0,0 +1,68 @@
+.oe_partner_vignette {
+ padding: 10px 0;
+ min-height: 100px;
+}
+
+.oe_partner_img, .oe_partner_desc {
+ display: inline-block;
+ vertical-align: top;
+}
+
+.oe_partner_img {
+ width: 100px;
+ height: 100px;
+ text-align: center;
+ overflow: hidden;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ -o-border-radius: 3px;
+ -ms-border-radius: 3px;
+ border-radius: 3px;
+ -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+ -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+ -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+ -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+}
+
+.oe_partner_photo {
+ width: 100px;
+ height: auto;
+ clip: rect(5px, 100px, 105px, 0px);
+}
+
+.oe_partner_photo_wide {
+ height: 100px;
+ width: auto;
+ clip: rect(0px, 110px, 100px, 10px);
+}
+
+.oe_partner_desc {
+ width: 220px;
+ font-size: 13px;
+ padding: 2px 5px;
+ color: #4c4c4c;
+ min-height: 120px;
+}
+
+.oe_partner_desc h4 {
+ margin: 0;
+ font-size: 13px;
+}
+
+.oe_partner_desc h4 a {
+ color: #4c4c4c;
+}
+
+.oe_partner_desc h4 a:hover {
+ text-decoration: underline;
+}
+
+.oe_partner_desc ul {
+ margin: 3px 0 5px;
+ padding: 0;
+ list-style: none;
+}
+
+.oe_partner_desc li {
+ margin: 2px 0;
+}
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
