Raphael Collet (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-first_10_clicks_sale-rco into
lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-first_10_clicks_sale-rco/+merge/116669
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-first_10_clicks_sale-rco/+merge/116669
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-first_10_clicks_sale-rco.
=== modified file 'openerp/addons/base/__openerp__.py'
--- openerp/addons/base/__openerp__.py 2012-06-04 18:30:55 +0000
+++ openerp/addons/base/__openerp__.py 2012-07-25 14:57:36 +0000
@@ -96,6 +96,6 @@
'installable': True,
'auto_install': True,
'certificate': '0076807797149',
- "css": [ 'static/src/css/modules.css' ],
+ 'css': ['static/src/css/modules.css'],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py 2012-07-20 15:25:54 +0000
+++ openerp/addons/base/res/res_partner.py 2012-07-25 14:57:36 +0000
@@ -104,12 +104,15 @@
class res_partner_title(osv.osv):
_name = 'res.partner.title'
+ _order = 'name'
_columns = {
'name': fields.char('Title', required=True, size=46, translate=True),
- 'shortcut': fields.char('Abbreviation', required=True, size=16, translate=True),
+ 'shortcut': fields.char('Abbreviation', size=16, translate=True),
'domain': fields.selection([('partner','Partner'),('contact','Contact')], 'Domain', required=True, size=24)
}
- _order = 'name'
+ _defaults = {
+ 'domain': 'contact',
+ }
def _lang_get(self, cr, uid, context=None):
lang_pool = self.pool.get('res.lang')
=== modified file 'openerp/addons/base/res/res_partner_view.xml'
--- openerp/addons/base/res/res_partner_view.xml 2012-07-25 12:47:57 +0000
+++ openerp/addons/base/res/res_partner_view.xml 2012-07-25 14:57:36 +0000
@@ -33,7 +33,6 @@
<group col="4">
<field name="name"/>
<field name="shortcut"/>
- <field name="domain"/>
</group>
</form>
</field>
@@ -154,7 +153,7 @@
</group>
<notebook colspan="4">
- <page string="Contacts">
+ <page string="Contacts" attrs="{'invisible': [('is_company','=',False)]}">
<field name="child_ids" context="{'default_parent_id': active_id}" mode="kanban">
<kanban>
<field name="color"/>
@@ -293,6 +292,7 @@
<field name="country_id"/>
<field name="mobile"/>
<field name="state_id"/>
+ <field name="category_id"/>
<templates>
<t t-name="kanban-box">
<div class="oe_kanban_vignette">
@@ -300,20 +300,21 @@
<img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_kanban_image"/>
</a>
<div class="oe_kanban_details">
- <h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a>
- </h4>
- <ul>
- <li t-if="record.parent_id.raw_value and !record.function.raw_value"><field name="parent_id"/></li>
- <li t-if="!record.parent_id.raw_value and record.function.raw_value"><field name="function"/></li>
- <li t-if="record.parent_id.raw_value and record.function.raw_value"><field name="function"/> at <field name="parent_id"/></li>
- <li t-if="record.city.raw_value and !record.country.raw_value"><field name="city"/></li>
- <li t-if="!record.city.raw_value and record.country.raw_value"><field name="country"/></li>
- <li t-if="record.city.raw_value and record.country.raw_value"><field name="city"/>, <field name="country"/></li>
- <li t-if="record.mobile.raw_value"><field name="mobile"/></li>
- <li t-if="record.phone.raw_value">Tel: <field name="phone"/></li>
- <li t-if="record.mobile.raw_value">Mobile: <field name="mobile"/></li>
- <li t-if="record.email.raw_value"><a t-attf-href="mailto:#{record.email.raw_value}"><field name="email"/></a></li>
- </ul>
+ <h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a></h4>
+ <div class="oe_kanban_partner_categories"/>
+ <div class="oe_kanban_partner_links"/>
+ <ul>
+ <li t-if="record.parent_id.raw_value and !record.function.raw_value"><field name="parent_id"/></li>
+ <li t-if="!record.parent_id.raw_value and record.function.raw_value"><field name="function"/></li>
+ <li t-if="record.parent_id.raw_value and record.function.raw_value"><field name="function"/> at <field name="parent_id"/></li>
+ <li t-if="record.city.raw_value and !record.country.raw_value"><field name="city"/></li>
+ <li t-if="!record.city.raw_value and record.country.raw_value"><field name="country"/></li>
+ <li t-if="record.city.raw_value and record.country.raw_value"><field name="city"/>, <field name="country"/></li>
+ <li t-if="record.mobile.raw_value"><field name="mobile"/></li>
+ <li t-if="record.phone.raw_value">Tel: <field name="phone"/></li>
+ <li t-if="record.mobile.raw_value">Mobile: <field name="mobile"/></li>
+ <li t-if="record.email.raw_value"><a t-attf-href="mailto:#{record.email.raw_value}"><field name="email"/></a></li>
+ </ul>
</div>
</div>
=== modified file 'openerp/import_xml.rng'
--- openerp/import_xml.rng 2012-01-19 15:27:32 +0000
+++ openerp/import_xml.rng 2012-07-25 14:57:36 +0000
@@ -19,10 +19,8 @@
<rng:element name="value">
<rng:optional><rng:attribute name="model" /></rng:optional>
<rng:optional><rng:attribute name="search" /></rng:optional>
- <rng:optional>
- <rng:attribute name="eval"/>
- </rng:optional>
- <rng:empty />
+ <rng:optional><rng:attribute name="eval" /></rng:optional>
+ <rng:optional><rng:text/></rng:optional>
</rng:element>
</rng:define>
_______________________________________________
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
