[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120713142622-f8t176k1yx6n2fnx
This commit is contained in:
commit
909794d3fc
|
@ -1002,7 +1002,7 @@ class account_invoice(osv.osv):
|
|||
'quantity': x.get('quantity',1.00),
|
||||
'product_id': x.get('product_id', False),
|
||||
'product_uom_id': x.get('uos_id', False),
|
||||
'analytic_account_id': x.get('analytic_account_id', False),
|
||||
'analytic_account_id': x.get('account_analytic_id', False),
|
||||
}
|
||||
|
||||
def action_number(self, cr, uid, ids, context=None):
|
||||
|
@ -1691,7 +1691,7 @@ class account_invoice_tax(osv.osv):
|
|||
'account_id': t['account_id'],
|
||||
'tax_code_id': t['tax_code_id'],
|
||||
'tax_amount': t['tax_amount'],
|
||||
'analytic_account_id': t['account_analytic_id'],
|
||||
'account_analytic_id': t['account_analytic_id'],
|
||||
})
|
||||
return res
|
||||
|
||||
|
|
|
@ -271,9 +271,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -406,9 +406,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -111,9 +111,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -257,9 +257,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -430,9 +430,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -167,9 +167,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -320,9 +320,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -43,9 +43,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -245,9 +245,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -212,9 +212,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -520,7 +520,7 @@
|
|||
<div>
|
||||
<field name="street" placeholder="Street..."/>
|
||||
<field name="street2"/>
|
||||
<div>
|
||||
<div class="address_format">
|
||||
<field name="city" placeholder="City" style="width: 40%%"/>
|
||||
<field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
|
||||
<field name="zip" placeholder="ZIP" style="width: 34%%"/>
|
||||
|
@ -564,9 +564,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -145,9 +145,9 @@
|
|||
|
||||
<field name="description" placeholder="Description..." />
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -168,9 +168,9 @@
|
|||
</notebook>
|
||||
</group>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -128,9 +128,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -99,9 +99,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -189,9 +189,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -484,9 +484,9 @@
|
|||
</group>
|
||||
</group>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -122,9 +122,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -146,9 +146,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -193,9 +193,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -191,9 +191,9 @@
|
|||
<separator string="Application Summary"/>
|
||||
<field name="description" placeholder="Feedback of interviews..."/>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -80,9 +80,9 @@
|
|||
<label for="description"/><newline/>
|
||||
<field name="description"/>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -92,10 +92,10 @@
|
|||
</group>
|
||||
</div>
|
||||
</sheet>
|
||||
<footer class="openerp_mail_group_footer">
|
||||
<div class="oe_chatter oe_mail_group_footer">
|
||||
<field name="message_ids" widget="mail_thread"
|
||||
options='{"thread_level": 1}'/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -9,10 +9,10 @@
|
|||
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//sheet" position="after">
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"
|
||||
options='{"thread_level": 1}'/>
|
||||
</footer>
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
}
|
||||
|
||||
/* Resize footer width */
|
||||
.openerp .oe_form footer.openerp_mail_group_footer {
|
||||
.openerp .oe_form div.oe_mail_group_footer {
|
||||
max-width: 80%;
|
||||
}
|
||||
|
||||
|
|
|
@ -52,38 +52,41 @@
|
|||
<field name="model">product.product</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Membership products">
|
||||
<group col="6">
|
||||
<field name="name"/>
|
||||
<field name="default_code"/>
|
||||
<field name="active"/>
|
||||
<field name="membership" invisible="1"/>
|
||||
<field name="membership_date_from" required="1"/>
|
||||
<field name="membership_date_to" required="1"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="General">
|
||||
<separator string="Accounting Info" colspan="2"/>
|
||||
<separator string="Categorization" colspan="2"/>
|
||||
<field name="list_price" string="Membership Fee"/>
|
||||
<field name="type" />
|
||||
<field name="property_account_income" domain="[('type', '!=', 'view')]"/>
|
||||
<field name="categ_id"/>
|
||||
<separator string="Sale Taxes" colspan="2"/>
|
||||
<newline/>
|
||||
<field name="taxes_id" nolabel="1" colspan="4"/>
|
||||
</page>
|
||||
<page string="Description">
|
||||
<separator string="Description"/>
|
||||
<field colspan="4" name="description" nolabel="1"/>
|
||||
<separator string="Sale Description"/>
|
||||
<field colspan="4" name="description_sale" nolabel="1"/>
|
||||
<separator string="Purchase Description"/>
|
||||
<field colspan="4" name="description_purchase" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
<form string="Membership products" version="7.0">
|
||||
<sheet>
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<h1>
|
||||
<field name="name"/>
|
||||
</h1>
|
||||
<group>
|
||||
<group>
|
||||
<field name="default_code"/>
|
||||
<field name="categ_id"/>
|
||||
<field name="membership" invisible="1"/>
|
||||
<field name="company_id"
|
||||
groups="base.group_multi_company"
|
||||
widget="selection"/>
|
||||
<field name="active"/>
|
||||
</group>
|
||||
<group>
|
||||
<label for="membership_date_from" string="Membership Duration"/>
|
||||
<div>
|
||||
<field name="membership_date_from" required="1" class="oe_inline"/> -
|
||||
<field name="membership_date_to" required="1" class="oe_inline"/>
|
||||
</div>
|
||||
<field name="list_price" string="Membership Fee"/>
|
||||
<field
|
||||
name="property_account_income"
|
||||
domain="[('type', '!=', 'view')]"/>
|
||||
<field name="taxes_id" widget="many2many_tags" string="Taxes"/>
|
||||
</group>
|
||||
</group>
|
||||
<label for="description"/>
|
||||
<field colspan="4" name="description" placeholder="Add a description..."/>
|
||||
<label for="description_sale"/>
|
||||
<field colspan="4" name="description_sale" placeholder="This note will be displayed on quotations..."/>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
|
@ -795,9 +795,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -111,9 +111,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -93,9 +93,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -183,9 +183,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -143,9 +143,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -486,9 +486,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -169,9 +169,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -256,9 +256,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -104,9 +104,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -318,9 +318,9 @@
|
|||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</footer>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -977,9 +977,9 @@
|
|||
<field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4" string="Customer"/>
|
||||
</xpath>
|
||||
<xpath expr="/form/sheet" position="after">
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
|
||||
</footer>
|
||||
</div>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
|
@ -1090,9 +1090,9 @@
|
|||
<field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4" string="Supplier"/>
|
||||
</xpath>
|
||||
<xpath expr="/form/sheet" position="after">
|
||||
<footer>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
|
||||
</footer>
|
||||
</div>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
|
|
Loading…
Reference in New Issue