[IMP] website_sale: create new shipping address; company_name field; fix acquierer image
bzr revid: chm@openerp.com-20140425132049-kg4w68qn07eof47q
This commit is contained in:
parent
13469c23d8
commit
cee3cabaa8
|
@ -388,21 +388,13 @@ class website_sale(http.Controller):
|
||||||
else:
|
else:
|
||||||
partner_id = orm_partner.create(cr, SUPERUSER_ID, billing_info, context=context)
|
partner_id = orm_partner.create(cr, SUPERUSER_ID, billing_info, context=context)
|
||||||
|
|
||||||
# set shipping_id
|
# create a new shipping partner
|
||||||
shipping_id = None
|
shipping_id = None
|
||||||
if checkout.get('shipping_different'):
|
if checkout.get('shipping_different'):
|
||||||
shipping_info = self.checkout_parse('shipping', checkout, True)
|
shipping_info = self.checkout_parse('shipping', checkout, True)
|
||||||
shipping_info['type'] = 'delivery'
|
shipping_info['type'] = 'delivery'
|
||||||
shipping_info['parent_id'] = partner_id
|
shipping_info['parent_id'] = partner_id
|
||||||
|
shipping_id = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context)
|
||||||
domain = [(key, '_id' in key and '=' or 'ilike', value) for key, value in shipping_info.items()]
|
|
||||||
shipping_ids = orm_partner.search(cr, SUPERUSER_ID, domain, context=context)
|
|
||||||
|
|
||||||
# save shipping informations
|
|
||||||
if shipping_ids:
|
|
||||||
shipping_id = shipping_ids[0]
|
|
||||||
else:
|
|
||||||
shipping_id = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context)
|
|
||||||
|
|
||||||
order_info = {
|
order_info = {
|
||||||
'partner_id': partner_id,
|
'partner_id': partner_id,
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
import product
|
import product
|
||||||
import res_config
|
import res_config
|
||||||
import sale_order
|
import sale_order
|
||||||
|
import res_partner
|
||||||
|
|
|
@ -73,7 +73,6 @@ class product_template(osv.Model):
|
||||||
return res
|
return res
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'company_name': fields.char('Company Name'),
|
|
||||||
'attribute_lines': fields.one2many('product.attribute.line', 'product_tmpl_id', 'Product attributes'),
|
'attribute_lines': fields.one2many('product.attribute.line', 'product_tmpl_id', 'Product attributes'),
|
||||||
# TODO FIXME tde: when website_mail/mail_thread.py inheritance work -> this field won't be necessary
|
# TODO FIXME tde: when website_mail/mail_thread.py inheritance work -> this field won't be necessary
|
||||||
'website_message_ids': fields.one2many(
|
'website_message_ids': fields.one2many(
|
||||||
|
|
|
@ -918,7 +918,7 @@
|
||||||
<input t-att-value="acquirer.id" type="radio" name="acquirer" t-att-checked="acquirers[0] == acquirer"/>
|
<input t-att-value="acquirer.id" type="radio" name="acquirer" t-att-checked="acquirers[0] == acquirer"/>
|
||||||
<img class="media-object" style="width: 60px; display: inline-block;"
|
<img class="media-object" style="width: 60px; display: inline-block;"
|
||||||
t-att-title="acquirer.name"
|
t-att-title="acquirer.name"
|
||||||
t-att-src="'/payment_%s/static/src/img/%s_icon.png' % (acquirer.name, acquirer.name)"/>
|
t-att-src="'/payment_%s/static/src/img/%s_icon.png' % (acquirer.provider, acquirer.provider)"/>
|
||||||
<span t-field="acquirer.name"/>
|
<span t-field="acquirer.name"/>
|
||||||
</label>
|
</label>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
@ -38,6 +38,17 @@
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
<record id="res_partner_form_view" model="ir.ui.view">
|
||||||
|
<field name="name">res.partner.form.inherit</field>
|
||||||
|
<field name="model">res.partner</field>
|
||||||
|
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<field name="parent_id" position="after">
|
||||||
|
<field name="company_name" placeholder="Company Name" attrs="{'invisible': [('company_name','=', '')]}"/>
|
||||||
|
</field>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="product_pricelist_view">
|
<record model="ir.ui.view" id="product_pricelist_view">
|
||||||
<field name="name">product.pricelist.website.form</field>
|
<field name="name">product.pricelist.website.form</field>
|
||||||
<field name="model">product.pricelist</field>
|
<field name="model">product.pricelist</field>
|
||||||
|
|
Loading…
Reference in New Issue