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

[MERGE] trunk

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20120713153607-muuauno83ku2vsom
This commit is contained in:
Quentin (OpenERP)
2012-07-13 17:36:07 +02:00
parent 413d44c915 490cafa48c
commit b3d9d17b3a
35 changed files with 1171 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_invoice.py
+2 -2
View File
@@ -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
addons/account/account_invoice_view.xml
+4 -4
View File
@@ -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>
addons/account_voucher/account_voucher_view.xml
+3 -3
View File
@@ -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>
addons/account_voucher/voucher_payment_receipt_view.xml
+4 -4
View File
@@ -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>
addons/account_voucher/voucher_sales_purchase_view.xml
+6 -6
View File
@@ -130,13 +130,13 @@
<field name="narration" placeholder="Internal Notes" nolabel="1" />
</group>
<group>
<group class="oe_subtotal_footer" string="Total">
<group class="oe_subtotal_<div class="oe_chatter">
<field name="tax_id"
on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
widget="selection"
domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
<field name="tax_amount" nolabel="1"/>
<field name="amount" class="oe_subtotal_footer_separator" />
<field name="amount" class="oe_subtotal_div" />
<button type="object"
icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
attrs="{'invisible': [('state','!=','draft')]}"/>
@@ -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>
addons/analytic/analytic_view.xml
+2 -2
View File
@@ -43,9 +43,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/anonymous/static/src/js/anonymous.js
+1 -1
View File
@@ -40,7 +40,7 @@ openerp.anonymous = function(instance) {
var am = p.action_manager;
p.$element.find('.oe_leftbar').hide();
am.do_action({type:'ir.actions.client', tag:'login'});
am.client_widget.on('login', p, p.restart);
am.inner_widget.on('login', p, p.restart);
});
}
});
addons/base_calendar/crm_meeting_view.xml
+2 -2
View File
@@ -245,9 +245,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/base_setup/i18n/ja.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-12 04:40+0000\n"
"X-Generator: Launchpad (build 15593)\n"
"X-Launchpad-Export-Date: 2012-07-13 04:46+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: base_setup
#: field:user.preferences.config,menu_tips:0
addons/crm/crm_lead_view.xml
+10 -10
View File
@@ -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,11 +520,11 @@
<div>
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
<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%%"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
</div>
</group>
@@ -532,8 +532,8 @@
<group>
<label for="contact_name" />
<div>
<field name="contact_name" class="oe_inline"/>,
<field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
<field name="contact_name" class="oe_inline"/>
<field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline oe_no_button"/>
</div>
<field name="function" />
<field name="mobile"/>
@@ -564,9 +564,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/crm/crm_phonecall_view.xml
+2 -2
View File
@@ -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>
addons/crm_claim/crm_claim_view.xml
+2 -2
View File
@@ -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>
addons/crm_fundraising/crm_fundraising_view.xml
+2 -2
View File
@@ -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>
addons/crm_helpdesk/crm_helpdesk_view.xml
+2 -2
View File
@@ -99,9 +99,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/event/event_view.xml
+4 -4
View File
@@ -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>
addons/hr_expense/hr_expense_view.xml
+2 -2
View File
@@ -122,9 +122,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/hr_holidays/hr_holidays_view.xml
+4 -4
View File
@@ -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>
addons/hr_recruitment/hr_recruitment_view.xml
+2 -2
View File
@@ -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>
addons/hr_timesheet_sheet/i18n/es_EC.po
+1045
View File
File diff suppressed because it is too large Load Diff
addons/idea/idea_view.xml
+2 -2
View File
@@ -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>
addons/mail/mail_group_view.xml
+2 -2
View File
@@ -72,10 +72,10 @@
</group>
</group>
</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>
addons/mail/res_partner_view.xml
+2 -2
View File
@@ -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>
addons/mail/static/src/css/mail_group.css
+1 -1
View File
@@ -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%;
}
addons/membership/membership_view.xml
+35 -32
View File
@@ -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>
addons/mrp/mrp_view.xml
+2 -2
View File
@@ -795,9 +795,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/mrp_operations/mrp_operations_view.xml
+2 -2
View File
@@ -111,9 +111,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/point_of_sale/i18n/nl.po
+4 -4
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-07-02 15:03+0000\n"
"PO-Revision-Date: 2012-07-12 08:29+0000\n"
"Last-Translator: Erwin <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: 2012-07-03 05:35+0000\n"
"X-Generator: Launchpad (build 15531)\n"
"X-Launchpad-Export-Date: 2012-07-13 04:46+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: point_of_sale
#: field:report.transaction.pos,product_nb:0
@@ -1393,7 +1393,7 @@ msgstr "Kassabon afdrukken"
#. module: point_of_sale
#: field:pos.make.payment,journal:0
msgid "Payment Mode"
msgstr "Betalingsvorm"
msgstr "Betaalwijze"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lays_paprika_45g_product_template
addons/procurement/procurement_view.xml
+2 -2
View File
@@ -93,9 +93,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/product/product_view.xml
+2 -2
View File
@@ -183,9 +183,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/project/project_view.xml
+4 -4
View File
@@ -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>
addons/project_issue/project_issue_view.xml
+2 -2
View File
@@ -169,9 +169,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/purchase/purchase_view.xml
+2 -2
View File
@@ -256,9 +256,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/purchase_requisition/purchase_requisition_view.xml
+2 -2
View File
@@ -104,9 +104,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/sale/sale_view.xml
+2 -2
View File
@@ -318,9 +318,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
addons/stock/stock_view.xml
+4 -4
View File
@@ -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>