odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE]:merged from trunk 

bzr revid: apa@tinyerp.com-20120615063749-jlux8i64e6lgu8j5
This commit is contained in:
Amit Patel (OpenERP) 2012-06-15 12:07:49 +05:30
parent 5dce978a13 83b2938234
commit 3fbff8ae21
33 changed files with 1032 additions and 777 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_move_line.py
View File

@ -1020,7 +1020,7 @@ class account_move_line(osv.osv):
} }
document = etree.Element('tree', string=title, editable="top", document = etree.Element('tree', string=title, editable="top",
refresh="5", on_write="on_create_write", on_write="on_create_write",
colors="red:state=='draft';black:state=='valid'") colors="red:state=='draft';black:state=='valid'")
fields_get = self.fields_get(cr, uid, flds, context) fields_get = self.fields_get(cr, uid, flds, context)
for field, _seq in fld: for field, _seq in fld:

23
addons/account/product_view.xml
View File

@ -9,19 +9,16 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<notebook position="inside"> <notebook position="inside">
<page string="Accounting"> <page string="Accounting">
<group name="properties"> <group name="properties">
<separator string="Sales Properties" colspan="2"/> <group>
<separator string="Purchase Properties" colspan="2"/> <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/> <field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
<field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/> </group>
</group> <group>
<newline/> <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
<group colspan="2"> <field name="supplier_taxes_id" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}" widget="many2many_tags"/>
<separator string="Sale Taxes" colspan="2"/> </group>
<separator string="Purchase Taxes" colspan="2"/> </group>
<field name="taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="supplier_taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
</group>
</page> </page>
</notebook> </notebook>
</field> </field>

3
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -6,7 +6,6 @@
Analytic Account form Analytic Account form
--> -->
<act_window <act_window
id="action_sales_order_line" id="action_sales_order_line"
name="Sales Order Lines" name="Sales Order Lines"
@ -14,7 +13,7 @@
src_model="account.analytic.account" src_model="account.analytic.account"
/> />
<record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view"> <record id="account_analytic_account_form_form" model="ir.ui.view">
<field name="name">account.analytic.account.invoice.form.inherit</field> <field name="name">account.analytic.account.invoice.form.inherit</field>
<field name="model">account.analytic.account</field> <field name="model">account.analytic.account</field>
<field name="type">form</field> <field name="type">form</field>

2
addons/account_anglo_saxon/product_view.xml
View File

@ -7,7 +7,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="account.product_normal_form_view"/> <field name="inherit_id" ref="account.product_normal_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="/form/notebook/page/group/field[@name='property_account_expense']" position="after"> <xpath expr="//field[@name='property_account_expense']" position="after">
<label string="" colspan="2"/> <label string="" colspan="2"/>
<field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" /> <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
<newline/> <newline/>

8
addons/account_budget/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-06-08 01:54+0000\n" "PO-Revision-Date: 2012-06-13 17:16+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n" "X-Launchpad-Export-Date: 2012-06-14 04:34+0000\n"
"X-Generator: Launchpad (build 15376)\n" "X-Generator: Launchpad (build 15405)\n"
#. module: account_budget #. module: account_budget
#: field:crossovered.budget,creating_user_id:0 #: field:crossovered.budget,creating_user_id:0
@ -169,7 +169,7 @@ msgstr "会社"
#. module: account_budget #. module: account_budget
#: view:crossovered.budget:0 #: view:crossovered.budget:0
msgid "To Approve" msgid "To Approve"
msgstr "承認のため" msgstr "承認"
#. module: account_budget #. module: account_budget
#: view:crossovered.budget:0 #: view:crossovered.budget:0

66
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -90,15 +90,32 @@
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header> </header>
<sheet string="Sales Receipt" layout="auto"> <sheet string="Sales Receipt" layout="auto">
<group col="6"> <div class="oe_form_title">
<field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/> <label for="number" class="oe_form_readonly_hidden"/>
<field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/> <h1><field name="number" readonly="0" /></h1>
<field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/> </div>
<field name="number"/>
<field name="name" colspan="2"/> <group>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <group>
<field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
<field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
<field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
<field name="name" colspan="2"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<group>
<field name="currency_id"/>
<field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
<field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
<field name="account_id"
attrs="{'invisible':[('pay_now','!=','pay_now')]}"
domain="[('type','=','liquidity')]"/>
<field name="reference"
attrs="{'invisible':[('pay_now','!=','pay_now')]}"
/>
<field name="paid" invisible="1"/>
</group>
<field name="type" invisible="True"/> <field name="type" invisible="True"/>
<field name="currency_id"/>
</group> </group>
<notebook> <notebook>
<page string="Sales Information"> <page string="Sales Information">
@ -111,26 +128,21 @@
</tree> </tree>
</field> </field>
<group col="3"> <group col="3">
<group string="Internal Notes" col="1"> <group colspan="1">
<field name="narration"/> <field name="narration" placeholder="Internal Notes" nolabel="1" />
</group> </group>
<group col="2"> <group>
<separator string="Payment Options" colspan="2"/> <group class="oe_form_subtotal_footer" string="Total">
<field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/> <field name="tax_id"
<field name="account_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
attrs="{'invisible':[('pay_now','!=','pay_now')]}" widget="selection"
domain="[('type','=','liquidity')]"/> domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
<!-- should select income accounts only. Or use the journal for this ? --> <field name="tax_amount" nolabel="1"/>
<field name="reference" <field name="amount" class="oe_form_subtotal_footer_separator" />
attrs="{'invisible':[('pay_now','!=','pay_now')]}" <button type="object"
/> icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
<field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/> attrs="{'invisible': [('state','!=','draft')]}"/>
<field name="paid" invisible="1"/> </group>
</group>
<group col="4">
<separator string="Total" colspan="4"/>
<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"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
<label string="" colspan="1"/><field name="amount" string="Total"/>
</group> </group>
</group> </group>
</page> </page>

63
addons/base_calendar/base_calendar_view.xml
View File

@ -28,37 +28,40 @@
statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/> statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
</header> </header>
<sheet> <sheet>
<group col="4">
<field name="email" string="Invitation To"/> <div class="oe_form_title">
<field name="cutype" string="Invitation Type" /> <label for="email" string="Invitation To" class="oe_form_readonly_hidden" />
<field name="rsvp" /> <h1>
<field name="role" string="Role" /> <field name="email" class="oe_form_inline" />
<field name="sent_by_uid" string="Invitation From" /> (<field name="language" class="oe_form_inline" />)
</h1>
<h2>
From <field name="event_date" class="oe_form_inline" />
to <field name="event_end_date" class="oe_form_inline"/>
</h2>
</div>
<group>
<group>
<field name="sent_by_uid" string="Invitation From" />
<field name="user_id" string="Invited User"/>
<field name="partner_id" string="Contact" />
</group>
<group>
<field name="cutype" string="Invitation Type" />
<field name="role" string="Role" />
<field name="rsvp" />
<field name="ref" readonly="1"/>
</group>
</group>
<group>
<group string="Delegrated From">
<field name="parent_ids" readonly="1" nolabel="1" />
</group>
<group string="Delegrated To" >
<field name="child_ids" readonly="1" nolabel="1" />
</group>
</group> </group>
<notebook>
<page string="Invitation">
<group>
<group string="Invitation Detail">
<field name="user_id" string="Invited User"/>
<field name="partner_id" string="Contact" />
</group>
<group string="Event Detail">
<field name="event_date" />
<field name="event_end_date" />
<field name="language"/>
<field name="ref" readonly="1"/>
</group>
</group>
</page>
<page string="Delegation Info">
<separator string="Delegated From" colspan="4" />
<field name="parent_ids"
readonly="1" />
<separator string="Delegated To" colspan="4" />
<field name="child_ids"
readonly="1" />
</page>
</notebook>
</sheet> </sheet>
</form> </form>
</field> </field>

21
addons/crm/crm_lead_menu.xml
View File

@ -40,27 +40,6 @@
<field name="act_window_id" ref="crm_case_category_act_leads_all"/> <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
</record> </record>
<act_window
id="act_crm_opportunity_crm_phonecall_new"
name="Phone calls"
groups="base.group_sale_salesman"
res_model="crm.phonecall"
src_model="crm.lead"
view_mode="tree,calendar,form"
context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
domain="[('opportunity_id', '=', active_id)]"
view_type="form"/>
<act_window
id="act_crm_opportunity_crm_meeting_new"
name="Meetings"
res_model="crm.meeting"
src_model="crm.lead"
view_mode="tree,form,calendar"
context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
domain="[('opportunity_id', '=', active_id)]"
view_type="form"/>
<record model="ir.actions.act_window" id="crm_case_category_act_oppor11"> <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
<field name="name">Opportunities</field> <field name="name">Opportunities</field>
<field name="res_model">crm.lead</field> <field name="res_model">crm.lead</field>

40
addons/crm/crm_lead_view.xml
View File

@ -53,6 +53,25 @@
<!-- <!--
LEADS LEADS
--> -->
<act_window
id="act_crm_opportunity_crm_phonecall_new"
name="Phone calls"
groups="base.group_sale_salesman"
res_model="crm.phonecall"
view_mode="tree,calendar,form"
context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
domain="[('opportunity_id', '=', active_id)]"
view_type="form"/>
<act_window
id="act_crm_opportunity_crm_meeting_new"
name="Meetings"
res_model="crm.meeting"
view_mode="tree,form,calendar"
context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
domain="[('opportunity_id', '=', active_id)]"
view_type="form"/>
<!-- CRM Lead Form View --> <!-- CRM Lead Form View -->
<record model="ir.ui.view" id="crm_case_form_view_leads"> <record model="ir.ui.view" id="crm_case_form_view_leads">
@ -74,6 +93,16 @@
on_change="onchange_stage_id(stage_id)"/> on_change="onchange_stage_id(stage_id)"/>
</header> </header>
<sheet> <sheet>
<div class="oe_right oe_form_button_box" name="buttons">
<button type="action"
name="%(act_crm_opportunity_crm_meeting_new)d"
string="Meetings" />
<button type="action"
name="%(act_crm_opportunity_crm_phonecall_new)d"
string="Phone Calls" />
</div>
<label for="name" class="oe_form_readonly_hidden" string="Lead Description"/> <label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
<h1><field name="name" placeholder="Describe the lead..."/></h1> <h1><field name="name" placeholder="Describe the lead..."/></h1>
<group> <group>
@ -220,10 +249,9 @@
<ul class="oe_kanban_menu"> <ul class="oe_kanban_menu">
<li><a type="edit" >Edit...</a></li> <li><a type="edit" >Edit...</a></li>
<li><a type="delete">Delete</a></li> <li><a type="delete">Delete</a></li>
<li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send New Email</a></li> <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
<li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li> <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
<li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li> <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
<li><a name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" type="action">Add Internal Note</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li> <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul> </ul>
<div class="oe_kanban_content"> <div class="oe_kanban_content">
@ -363,6 +391,10 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Opportunities" version="7.0"> <form string="Opportunities" version="7.0">
<header> <header>
<button name="stage_previous" string="Previous" type="object"
states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
<button name="stage_next" string="Next" type="object"
states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
<button name="case_mark_won" string="Mark Won" type="object" <button name="case_mark_won" string="Mark Won" type="object"
states="draft,open,pending"/> states="draft,open,pending"/>
<button name="case_open" string="Open" type="object" <button name="case_open" string="Open" type="object"
@ -375,10 +407,6 @@
states="done,cancel"/> states="done,cancel"/>
<button name="case_cancel" string="Cancel" type="object" <button name="case_cancel" string="Cancel" type="object"
states="draft"/> states="draft"/>
<button name="stage_previous" string="Previous" type="object"
states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
<button name="stage_next" string="Next" type="object"
states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
<field name="stage_id" widget="statusbar" <field name="stage_id" widget="statusbar"
on_change="onchange_stage_id(stage_id)"/> on_change="onchange_stage_id(stage_id)"/>
</header> </header>

2
addons/crm/crm_meeting_menu.xml
View File

@ -1,12 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
<act_window <act_window
id="crm_case_categ_meet_create_partner" id="crm_case_categ_meet_create_partner"
name="Schedule a Meeting" name="Schedule a Meeting"
res_model="crm.meeting" res_model="crm.meeting"
src_model="res.partner"
view_mode="calendar,tree,form,gantt" view_mode="calendar,tree,form,gantt"
context="{'search_default_partner_id': active_id, 'default_duration': 4.0}" context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"
domain="[('partner_id', '=', active_id)]" domain="[('partner_id', '=', active_id)]"

107
addons/crm/crm_meeting_view.xml
View File

@ -38,52 +38,62 @@
<field name="state" widget="statusbar" statusbar_visible="draft,open,done"/> <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
</header> </header>
<sheet> <sheet>
<group col="6" colspan="4"> <div class="oe_form_title">
<field name="name" string="Title" <div class="oe_form_readonly_hidden">
required="1" /> <label for="name" string="Title"/>
<field name="categ_id" widget="selection" (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_form_inline"/>
string="Meeting Type" <label for="allday" string="All Day?"/>)
domain="[('object_id.model', '=', 'crm.meeting')]" /> </div>
<field name="allday" on_change="onchange_dates(date,False,False,allday)" /> <h1>
<newline/> <field name="name"/>
<field name="date" string="Start Date" required="1" </h1>
on_change="onchange_dates(date,duration,False,allday)" /> <h2>
<field name="duration" widget="float_time" At <field name="location" class="oe_form_inline" />
on_change="onchange_dates(date,duration,False,allday)" /> </h2>
<field name="date_deadline" string="End Date" required="1" </div>
on_change="onchange_dates(date,False,date_deadline)" /> <h2>
<field name="location" /> <label for="duration" string="Duration" />
<field name="alarm_id" string="Reminder" <field name="duration" widget="float_time"
widget="selection" /> on_change="onchange_dates(date,duration,False,allday)"
<group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"> class="oe_form_inline"/> from
<field name="recurrency" string="Recurrence"/> <field name="date"
string="Start Date"
required="1"
class="oe_form_readonly_hidden oe_form_inline"/> to
<field name="date_deadline"
string="End Date" required="1"
on_change="onchange_dates(date,False,date_deadline)"
class="oe_form_inline"/>
</h2>
<group colspan="4" col="4">
<group colspan="2">
<field name="user_id" />
<field name="organizer"/>
<field name="section_id" widget="selection"/>
</group>
<group colspan="2">
<field name="alarm_id" string="Reminder" widget="selection" />
<field name="class" string="Privacy"/>
<field name="show_as" string="Show Time as"/>
<field name="recurrency" string="Recurrence" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
</group>
<group colspan="2">
<field name="partner_id" string="Partner"
on_change="onchange_partner_id(partner_id)" />
<field name="email_from"/>
</group>
<group colspan="2">
<field name="categ_id" widget="selection"
string="Meeting Type"
domain="[('object_id.model', '=', 'crm.meeting')]" />
<field name="rrule" invisible="1" readonly="1"/>
<field name="recurrent_id" invisible="1"/>
<field name="recurrent_uid" invisible="1"/>
</group> </group>
</group> </group>
<separator string="Description" colspan="4" />
<field name="description" nolabel="1" colspan="4" />
<notebook> <notebook>
<page string="Meeting">
<group col="6" colspan="4">
<group col="2" colspan="2">
<separator colspan="2" string="Assignment"/>
<field name="user_id" />
<field name="organizer"/>
<field name="section_id" widget="selection"/>
</group><group col="2" colspan="2">
<separator colspan="2" string="Contacts"/>
<field name="partner_id" string="Partner"
on_change="onchange_partner_id(partner_id)" />
<field name="email_from"/>
</group><group col="2" colspan="2">
<separator colspan="2" string="Visibility"/>
<field name="class" string="Privacy"/>
<field name="show_as" string="Show Time as"/>
<field name="rrule" invisible="1" readonly="1"/>
<field name="recurrent_id" invisible="1"/>
<field name="recurrent_uid" invisible="1"/>
</group>
</group>
<separator string="Description" colspan="4" />
<field name="description" nolabel="1" colspan="4" />
</page>
<page string="Invitation Detail"> <page string="Invitation Detail">
<button string="Invite People" <button string="Invite People"
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
@ -157,12 +167,11 @@
</form> </form>
</field> </field>
</page> </page>
<page string="Recurrence Options" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"> <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
<group col="4" colspan="4" name="rrule"> <group col="4" colspan="4" name="rrule">
<group col="4" colspan="4"> <group col="4" colspan="4">
<field name="rrule_type" string=" Recurrence Pattern" /> <field name="rrule_type" string=" Recurrence Pattern" />
<field name="interval" /> <field name="interval" />
<separator string="End of Recurrence" colspan="4"/>
<field name="end_type" /> <field name="end_type" />
<label string=" " colspan="2" /> <label string=" " colspan="2" />
<newline /> <newline />
@ -209,9 +218,9 @@
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
<div class="oe_form_bottom"> <footer>
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/> <field name="message_ids" widget="ThreadView"/>
</div> </footer>
</form> </form>
</field> </field>
</record> </record>
@ -296,7 +305,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/> <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="language" position="after"> <field name="ref" position="after">
<field name="categ_id" string="Event Type"/> <field name="categ_id" string="Event Type"/>
</field> </field>
</field> </field>

1
addons/crm/crm_phonecall_menu.xml
View File

@ -6,7 +6,6 @@
id="crm_case_categ_phone_create_partner" id="crm_case_categ_phone_create_partner"
name="Schedule a Call" name="Schedule a Call"
res_model="crm.phonecall" res_model="crm.phonecall"
src_model="res.partner"
view_mode="calendar,tree,form" view_mode="calendar,tree,form"
context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}"
groups="base.group_sale_salesman" groups="base.group_sale_salesman"

54
addons/crm/crm_phonecall_view.xml
View File

@ -65,50 +65,48 @@
<form version="7.0"> <form version="7.0">
<header> <header>
<button name="case_open" string="Confirm" type="object" <button name="case_open" string="Confirm" type="object"
states="draft,pending" icon="gtk-go-forward"/> states="draft,pending"/>
<button name="case_close" string="Held" type="object" <button name="case_close" string="Held" type="object"
states="open,pending" icon="gtk-jump-to"/> states="open,pending"/>
<button name="case_reset" string="Reset to Todo" type="object" <button name="case_reset" string="Reset to Todo" type="object"
states="cancel" icon="gtk-convert"/> states="cancel"/>
<button name="case_cancel" string="Cancel" type="object" <button name="case_cancel" string="Cancel" type="object"
states="draft,open,pending" icon="gtk-cancel"/> states="draft,open,pending"/>
<button string="Convert to Opportunity" <button string="Convert to Opportunity"
name="%(phonecall2opportunity_act)d" name="%(phonecall2opportunity_act)d"
icon="gtk-index" type="action" type="action"
attrs="{'invisible':[('opportunity_id','!=',False)]}" /> attrs="{'invisible':[('opportunity_id','!=',False)]}" />
<button string="Schedule Other Call" <button string="Schedule Other Call"
icon="terp-call-start"
name="%(phonecall_to_phonecall_act)d" name="%(phonecall_to_phonecall_act)d"
type="action" /> type="action" />
<button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/> <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/> <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
</header> </header>
<sheet string="Phone Call"> <sheet string="Phone Call">
<div class="oe_form_title">
<div class="oe_form_readonly_hidden">
<label for="name" string="Title"/>
</div>
<h1><field name="name" required="1"/></h1>
<div class="oe_form_readonly_hidden">
<label for="partner_phone" string="Phone" />
</div>
<h2><field name="partner_phone"/></h2>
</div>
<group col="4"> <group col="4">
<field name="name" required="1"/> <field name="date" />
<field name="partner_phone"/> <field name="user_id" />
<field name="duration" widget="float_time"/> <field name="duration" widget="float_time" />
<field name="date"/>
<field name="user_id"/>
<field name="section_id" colspan="1" widget="selection" /> <field name="section_id" colspan="1" widget="selection" />
<field name="partner_id" on_change="onchange_partner_id(partner_id)" />
<field name="categ_id" widget="selection"
domain="[('object_id.model', '=', 'crm.phonecall')]"/>
<field name="partner_mobile" />
<field name="priority"/>
<field name="opportunity_id"/>
</group> </group>
<group> <field name="description" placeholder="Description..." />
<group string="Contacts">
<field name="partner_id"
on_change="onchange_partner_id(partner_id)" />
<field name="partner_mobile"/>
</group>
<group string="Categorization">
<field name="categ_id" widget="selection"
domain="[('object_id.model', '=', 'crm.phonecall')]"/>
<field name="priority"/>
<field name="opportunity_id"/>
</group>
</group>
<separator string="Description"/>
<field name="description"/>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="ThreadView"/>

10
addons/crm/crm_view.xml
View File

@ -158,13 +158,13 @@
<form string="Stage" version="7.0"> <form string="Stage" version="7.0">
<group col="4"> <group col="4">
<field name="name"/> <field name="name"/>
<field name="state" string="Related State" />
<field name="probability"/> <field name="probability"/>
<field name="on_change"/>
<field name="case_default"/>
<field name="sequence"/>
<field name="state"/>
<field name="fold"/>
<field name="type"/> <field name="type"/>
<field name="on_change"/>
<field name="sequence"/>
<field name="case_default"/>
<field name="fold"/>
</group> </group>
<separator string="Requirements"/> <separator string="Requirements"/>
<field name="requirements" nolabel="1"/> <field name="requirements" nolabel="1"/>

21
addons/crm/res_partner_view.xml
View File

@ -82,6 +82,27 @@
</field> </field>
</record> </record>
<record model="ir.ui.view" id="res_partner_view_buttons">
<field name="name">res.partner.view.buttons</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form" />
<field name="arch" type="xml">
<xpath expr="//div[@name='buttons']" position="inside">
<button type="action"
string="Schedule a Meeting"
name="%(crm.crm_case_categ_meet_create_partner)d"
context="{'search_default_partner_id': [active_id], 'default_duration': 4.0}"/>
<button type="action" string="Schedule a Call"
name="%(crm.crm_case_categ_phone_create_partner)d"
context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
<button type="action" string="Create an Opportunity"
name="%(crm.action_view_crm_partner2opportunity)d" />
</xpath>
</field>
</record>
</data> </data>
</openerp> </openerp>

42
addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
View File

@ -10,29 +10,29 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Schedule/Log a Call" layout="manual" version="7.0"> <form string="Schedule/Log a Call" layout="manual" version="7.0">
<header> <header>
<button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" /> <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
<button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" /> <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
<button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" /> <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
</header> </header>
<group>
<group> <group>
<field name="action"/> <group>
<field name="name"/> <field name="action"/>
<field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/> <field name="name"/>
<field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
</group>
<group>
<field name="partner_id" readonly="True"/>
<field name="categ_id" string="Type"
widget="selection"
domain="[('object_id.model', '=', 'crm.phonecall')]"
groups="base.group_no_one"/>
<field name="phone"/>
<field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
<field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
</group>
</group> </group>
<group> <field name="note" placeholder="Call Description" />
<field name="partner_id" readonly="True"/>
<field name="categ_id" string="Type"
widget="selection"
domain="[('object_id.model', '=', 'crm.phonecall')]"
groups="base.group_no_one"/>
<field name="phone"/>
<field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
<field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
</group>
</group>
<field name="note"/>
</form> </form>
</field> </field>
</record> </record>

1
addons/crm/wizard/crm_partner_to_opportunity_view.xml
View File

@ -42,5 +42,4 @@
view_mode="form" target="new" view_type="form" view_mode="form" target="new" view_type="form"
groups="base.group_sale_salesman"/> groups="base.group_sale_salesman"/>
</data> </data>
</openerp> </openerp>

20
addons/delivery/delivery_view.xml
View File

@ -230,12 +230,10 @@
<field name="model">stock.move</field> <field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_form"/> <field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<group name="picking" position="after"> <field name="picking_id" position="after">
<group string="Weights"> <field name="weight"/>
<field name="weight"/> <field name="weight_net"/>
<field name="weight_net"/> </field>
</group>
</group>
</field> </field>
</record> </record>
@ -245,12 +243,10 @@
<field name="model">stock.move</field> <field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_form_reception_picking"/> <field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<group name="picking" position="after"> <field name="picking_id">
<group string="Weights"> <field name="weight"/>
<field name="weight"/> <field name="weight_net"/>
<field name="weight_net"/> </field>
</group>
</group>
</field> </field>
</record> </record>

119
addons/google_base_account/i18n/sl.po Normal file
View File

@ -0,0 +1,119 @@
# Slovenian translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-06-13 22:19+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Slovenian <sl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-14 04:34+0000\n"
"X-Generator: Launchpad (build 15405)\n"
#. module: google_base_account
#: field:res.users,gmail_user:0
msgid "Username"
msgstr ""
#. module: google_base_account
#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
msgid "Google Login"
msgstr ""
#. module: google_base_account
#: code:addons/google_base_account/wizard/google_login.py:29
#, python-format
msgid "Google Contacts Import Error!"
msgstr ""
#. module: google_base_account
#: view:res.users:0
msgid " Synchronization "
msgstr ""
#. module: google_base_account
#: sql_constraint:res.users:0
msgid "You can not have two users with the same login !"
msgstr ""
#. module: google_base_account
#: code:addons/google_base_account/wizard/google_login.py:75
#, python-format
msgid "Error"
msgstr ""
#. module: google_base_account
#: view:google.login:0
msgid "Google login"
msgstr ""
#. module: google_base_account
#: model:ir.model,name:google_base_account.model_res_users
msgid "res.users"
msgstr ""
#. module: google_base_account
#: field:google.login,password:0
msgid "Google Password"
msgstr ""
#. module: google_base_account
#: view:google.login:0
msgid "_Cancel"
msgstr ""
#. module: google_base_account
#: view:res.users:0
msgid "Google Account"
msgstr ""
#. module: google_base_account
#: field:google.login,user:0
msgid "Google Username"
msgstr ""
#. module: google_base_account
#: code:addons/google_base_account/wizard/google_login.py:29
#, python-format
msgid ""
"Please install gdata-python-client from http://code.google.com/p/gdata-"
"python-client/downloads/list"
msgstr ""
#. module: google_base_account
#: model:ir.model,name:google_base_account.model_google_login
msgid "Google Contact"
msgstr ""
#. module: google_base_account
#: view:google.login:0
msgid "_Login"
msgstr ""
#. module: google_base_account
#: constraint:res.users:0
msgid "The chosen company is not in the allowed companies for this user"
msgstr ""
#. module: google_base_account
#: field:res.users,gmail_password:0
msgid "Password"
msgstr ""
#. module: google_base_account
#: code:addons/google_base_account/wizard/google_login.py:75
#, python-format
msgid "Authentication fail check the user and password !"
msgstr ""
#. module: google_base_account
#: view:google.login:0
msgid "ex: user@gmail.com"
msgstr ""

4
addons/mail/res_partner_view.xml
View File

@ -9,8 +9,10 @@
<field name="inherit_id" ref="base.view_partner_form"/> <field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//sheet" position="after"> <xpath expr="//sheet" position="after">
<field name="message_ids" widget="ThreadView" nolabel="1" <footer>
<field name="message_ids" widget="ThreadView"
options='{"thread_level": 1}'/> options='{"thread_level": 1}'/>
</footer>
</xpath> </xpath>
</field> </field>
</record> </record>

14
addons/mrp_subproduct/i18n/zh_CN.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n" "Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-02-14 09:46+0000\n" "PO-Revision-Date: 2012-06-14 05:53+0000\n"
"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n" "Last-Translator: ccdos <Unknown>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-15 05:27+0000\n" "X-Launchpad-Export-Date: 2012-06-15 04:42+0000\n"
"X-Generator: Launchpad (build 14781)\n" "X-Generator: Launchpad (build 15414)\n"
#. module: mrp_subproduct #. module: mrp_subproduct
#: field:mrp.subproduct,product_id:0 #: field:mrp.subproduct,product_id:0
@ -39,7 +39,7 @@ msgstr ""
#. module: mrp_subproduct #. module: mrp_subproduct
#: view:mrp.bom:0 #: view:mrp.bom:0
msgid "sub products" msgid "sub products"
msgstr "子产品" msgstr "副产品"
#. module: mrp_subproduct #. module: mrp_subproduct
#: model:ir.model,name:mrp_subproduct.model_mrp_production #: model:ir.model,name:mrp_subproduct.model_mrp_production
@ -54,7 +54,7 @@ msgstr "部件不应该是成品本身"
#. module: mrp_subproduct #. module: mrp_subproduct
#: view:mrp.bom:0 #: view:mrp.bom:0
msgid "Sub Products" msgid "Sub Products"
msgstr "子产品" msgstr "副产品"
#. module: mrp_subproduct #. module: mrp_subproduct
#: field:mrp.subproduct,subproduct_type:0 #: field:mrp.subproduct,subproduct_type:0
@ -89,7 +89,7 @@ msgstr "编号必须在公司内唯一！"
#. module: mrp_subproduct #. module: mrp_subproduct
#: field:mrp.bom,sub_products:0 #: field:mrp.bom,sub_products:0
msgid "sub_products" msgid "sub_products"
msgstr "子产品" msgstr "副产品"
#. module: mrp_subproduct #. module: mrp_subproduct
#: selection:mrp.subproduct,subproduct_type:0 #: selection:mrp.subproduct,subproduct_type:0

55
addons/procurement/procurement_view.xml
View File

@ -207,33 +207,34 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reordering Rules" version="7.0"> <form string="Reordering Rules" version="7.0">
<group col="2" colspan="2"> <sheet>
<separator string="General Information" colspan="2" /> <group>
<field name="name" /> <group>
<field name="product_id" on_change="onchange_product_id(product_id)"/> <field name="name" />
<field name="product_uom"/> <field name="product_id" on_change="onchange_product_id(product_id)"/>
</group> </group>
<group col="2" colspan="2"> <group>
<separator string="Locations" colspan="2" /> <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
<field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/> <field name="product_uom"/>
<field name="location_id" groups="stock.group_locations"/> <field name="location_id" groups="stock.group_locations"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group> </group>
<group col="2" colspan="2"> </group>
<separator string="Quantity Rules" colspan="2" /> <group>
<field name="product_min_qty"/> <group string="Rules">
<field name="product_max_qty"/> <field name="product_min_qty" />
<field name="qty_multiple"/> <field name="product_max_qty" />
</group> <field name="qty_multiple" string="Quantity Multiple"/>
<group col="2" colspan="2"> </group>
<separator string="Misc" colspan="2" /> <group string="Misc">
<field name="procurement_id" readonly="1"/> <field name="procurement_id" readonly="1"/>
<field name="active" /> <field name="active" />
</group> </group>
<group col="4" colspan="4"> </group>
<separator string="Procurement Orders to Process" colspan="4" /> <group string="Procurement Orders to Process">
<field name="procurement_draft_ids" colspan="4" nolabel="1"/> <field name="procurement_draft_ids" nolabel="1"/>
</group> </group>
</sheet>
</form> </form>
</field> </field>
</record> </record>

224
addons/product/product_view.xml
View File

@ -69,118 +69,124 @@
<field eval="7" name="priority"/> <field eval="7" name="priority"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Product" layout="auto" version="7.0"> <form string="Product" layout="auto" version="7.0">
<field name="product_image" widget='image' class="oe_form_avatar oe_right"/> <sheet>
<label for="name" class="oe_form_readonly_hidden"/> <field name="product_image" widget="image" class="oe_form_avatar oe_right" />
<h1><field name="name"/></h1>
<label for="categ_id" class="oe_form_readonly_hidden"/>
<h2><field name="categ_id"/></h2>
<notebook> <div class="oe_form_title">
<page string="Information"> <div class="oe_form_readonly_hidden">
<group> <label for="name" string="Product Name" />
</div>
<h1>
<field name="name"/>
</h1>
<label for="categ_id" class="oe_form_readonly_hidden" />
<h2><field name="categ_id" /></h2>
</div>
<notebook>
<page string="Information">
<group> <group>
<field name="default_code"/> <group>
<field name="ean13" placeholder="5901234123457" /> <field name="default_code"/>
<field groups="product.group_product_variant" name="variants" /> <field name="ean13" placeholder="5901234123457" />
</group> <field groups="product.group_product_variant" name="variants" />
<group>
<field name="sale_ok"/>
<field name="purchase_ok"/>
</group>
<group string="Procurement">
<field name="type"/>
<field name="procure_method"/>
<field name="supply_method"/>
</group>
<group string="Base Prices">
<field name="list_price"/>
<field name="cost_method"/>
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
<field name="price_margin" groups="product.group_product_variant"/>
<field name="price_extra" groups="product.group_product_variant"/>
</group>
<group groups="product.group_stock_packaging" string="Weights">
<field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
<field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
<field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
</group>
<group name="status" string="Status">
<field name="state"/>
<field name="product_manager"/>
</group>
<group name="uom" groups="product.group_uom" string="Unit of Measure">
<field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
<field name="uom_po_id"/>
</group>
<group name="uos" groups="product.group_uos" string="Second Unit of Measure">
<field name="uos_id"/>
<field name="uos_coeff"/>
<field name="mes_type"/>
</group>
</group>
</page>
<page string="Procurement &amp; Locations">
<group>
<group name="delay" string="Delays">
<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
<field name="warranty"/>
</group>
<group name="store" string="Storage Localisation">
<field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
<field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
<field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
</group>
<group name="misc" string="Miscellaneous">
<field name="active"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
</group>
</page>
<page string="Suppliers">
<field name="seller_ids" context="{'uom_id': uom_id}"/>
</page>
<page string="Descriptions">
<separator string="Description"/>
<field name="description"/>
<separator string="Sale Description"/>
<field name="description_sale" placeholder="This note will be displayed on quotations..."/>
<separator string="Purchase Description"/>
<field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
</page>
<page groups="product.group_stock_packaging" string="Packaging">
<field name="packaging">
<form string="Packaging" version="7.0">
<group col="4">
<field name="ean"/>
<field name="sequence" invisible="1"/>
<newline/>
<field name="qty"/>
<field name="ul"/>
<field name="weight_ul"/>
<separator colspan="4" string="Palletization"/>
<field name="ul_qty"/>
<field name="rows"/>
<field name="weight"/>
<separator colspan="4" string="Pallet Dimension"/>
<field name="height"/>
<field name="width"/>
<field name="length"/>
</group> </group>
<separator colspan="4" string="Description"/> <group>
<field name="name"/> <field name="sale_ok"/>
</form> <field name="purchase_ok"/>
</field> </group>
</page> <group string="Procurement">
</notebook> <field name="type"/>
<footer> <field name="procure_method"/>
<field name="message_ids" widget="ThreadView"/> <field name="supply_method"/>
</footer> </group>
<group string="Prices">
<field name="list_price"/>
<field name="cost_method"/>
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
<field name="price_margin" groups="product.group_product_variant"/>
<field name="price_extra" groups="product.group_product_variant"/>
</group>
<group groups="product.group_stock_packaging" string="Weights">
<field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
<field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
<field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
</group>
<group name="uom" groups="product.group_uom" string="Unit of Measure">
<field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
<field name="uom_po_id"/>
<field name="uos_id"/>
<field name="uos_coeff"/>
<field name="mes_type"/>
</group>
<group name="status" string="Status">
<field name="state"/>
<field name="product_manager"/>
</group>
</group>
</page>
<page string="Procurement &amp; Locations">
<group>
<group name="delay" string="Delays">
<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
<field name="warranty"/>
</group>
<group name="store" string="Storage Localisation">
<field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
<field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
<field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
</group>
<group name="misc" string="Miscellaneous">
<field name="active"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
</group>
</page>
<page string="Suppliers">
<field name="seller_ids" context="{'uom_id': uom_id}"/>
</page>
<page string="Descriptions">
<separator string="Description"/>
<field name="description"/>
<separator string="Sale Description"/>
<field name="description_sale" placeholder="This note will be displayed on quotations..."/>
<separator string="Purchase Description"/>
<field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
</page>
<page groups="product.group_stock_packaging" string="Packaging">
<field name="packaging">
<form string="Packaging" version="7.0">
<group col="4">
<field name="ean"/>
<field name="sequence" invisible="1"/>
<newline/>
<field name="qty"/>
<field name="ul"/>
<field name="weight_ul"/>
<separator colspan="4" string="Palletization"/>
<field name="ul_qty"/>
<field name="rows"/>
<field name="weight"/>
<separator colspan="4" string="Pallet Dimension"/>
<field name="height"/>
<field name="width"/>
<field name="length"/>
</group>
<separator colspan="4" string="Description"/>
<field name="name"/>
</form>
</field>
</page>
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
</footer>
</form> </form>
</field> </field>
</record> </record>

20
addons/project/project_view.xml
View File

@ -363,18 +363,18 @@
</h2> </h2>
<group> <group>
<group> <group>
<field name="effective_hours"
widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
<field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/> <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
<field name="partner_id" /> <field name="partner_id" />
<field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group> </group>
<group> <group>
<field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
<field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
groups="project.group_time_work_estimation_tasks" groups="project.group_time_work_estimation_tasks"
on_change="onchange_planned(planned_hours, effective_hours)"/> on_change="onchange_planned(planned_hours, effective_hours)"/>
<field name="effective_hours"
widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
<label for="remaining_hours" string="+ Remaining"/> <label for="remaining_hours" string="+ Remaining"/>
<div> <div>
<field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/> <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
@ -387,8 +387,9 @@
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="Information"> <page string="Description">
<field name="description" attrs="{'readonly':[('state','=','done')]}"/> <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..." />
<separator string="Task Works" />
<field name="work_ids" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks"> <field name="work_ids" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
<tree string="Task Work" editable="top"> <tree string="Task Work" editable="top">
<field name="name" /> <field name="name" />
@ -421,8 +422,6 @@
<field name="sequence"/> <field name="sequence"/>
<field name="state" groups="base.group_no_one"/> <field name="state" groups="base.group_no_one"/>
</group> </group>
<separator string="Notes"/>
<field name="notes"/>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
@ -721,16 +720,15 @@
<group> <group>
<group> <group>
<field name="name"/> <field name="name"/>
<field name="state"/> <field name="case_default"/>
</group> </group>
<group> <group>
<field name="case_default"/> <field name="state" string="Related State"/>
<field name="sequence"/> <field name="sequence"/>
<field name="fold"/> <field name="fold"/>
</group> </group>
</group> </group>
<separator string="Description"/> <field name="description" placeholder="Add a description..."/>
<field name="description"/>
</form> </form>
</field> </field>
</record> </record>

10
addons/project_issue/project_issue_view.xml
View File

@ -84,13 +84,8 @@
<field name="user_id"/> <field name="user_id"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/> <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
<field name="email_from"/> <field name="email_from"/>
<label for="task_id"/>
<div>
<field name="task_id" on_change="onchange_task_id(task_id)" class="oe_form_inline"/>
<button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
attrs="{'invisible':[('task_id','!=',False)]}" />
</div>
</group><group> </group><group>
<field name="task_id" on_change="onchange_task_id(task_id)" />
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/> <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
<field name="version_id" widget="selection"/> <field name="version_id" widget="selection"/>
<field name="priority"/> <field name="priority"/>
@ -98,7 +93,7 @@
<field name="state" groups="base.group_no_one"/> <field name="state" groups="base.group_no_one"/>
</group> </group>
</group> </group>
<field name="description"/> <field name="description" placeholder="Add a description..." />
<notebook groups="base.group_no_one"> <notebook groups="base.group_no_one">
<page string="Extra Info"> <page string="Extra Info">
@ -258,7 +253,6 @@
<a string="Edit" icon="gtk-edit" type="edit"/> <a string="Edit" icon="gtk-edit" type="edit"/>
<a string="Change Color" icon="color-picker" type="color" name="color"/> <a string="Change Color" icon="color-picker" type="color" name="color"/>
<a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/> <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
<a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/>
<a string="Escalate" name="case_escalate" icon="gtk-go-up" type="object"/> <a string="Escalate" name="case_escalate" icon="gtk-go-up" type="object"/>
<a string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"/> <a string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"/>
</div> </div>

6
addons/project_mrp/project_mrp_view.xml
View File

@ -29,9 +29,9 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="project.view_task_form2"/> <field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//notebook/page[@string='Extra Info']/separator[@string='Notes']" position="before"> <field name="state" position="after">
<field name="sale_line_id"/> <field name="sale_line_id" string="Order Line"/>
</xpath> </field>
</field> </field>
</record> </record>
</data> </data>

645
addons/purchase/i18n/ja.po
View File

File diff suppressed because it is too large Load Diff

2
addons/sale/sale.py
View File

@ -212,7 +212,7 @@ class sale_order(osv.osv):
('shipping_except', 'Shipping Exception'), ('shipping_except', 'Shipping Exception'),
('invoice_except', 'Invoice Exception'), ('invoice_except', 'Invoice Exception'),
('done', 'Done'), ('done', 'Done'),
], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True), ], 'Status', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}), 'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."), 'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."), 'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),

24
addons/sale/sale_view.xml
View File

@ -90,7 +90,6 @@
<field name="user_id"/> <field name="user_id"/>
<field name="picked_rate" widget="progressbar"/> <field name="picked_rate" widget="progressbar"/>
<field name="invoiced_rate" widget="progressbar"/> <field name="invoiced_rate" widget="progressbar"/>
<field name="amount_untaxed" sum="Total Tax Excluded"/>
<field name="amount_total" sum="Total Tax Included"/> <field name="amount_total" sum="Total Tax Included"/>
<field name="state"/> <field name="state"/>
</tree> </tree>
@ -149,11 +148,16 @@
<page string="Order Lines"> <page string="Order Lines">
<field name="order_line"> <field name="order_line">
<form string="Sales Order Lines" version="7.0"> <form string="Sales Order Lines" version="7.0">
<field name="product_id" <header>
context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/> </header>
<field name="name" placeholder="Porduct/Service characteristics"/> <group col="4" colspan="4">
<group> <group>
<field name="product_id"
context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
<field name="name" placeholder="Product/Service characteristics"/>
</group>
<group> <group>
<label for="product_uom_qty"/> <label for="product_uom_qty"/>
<div> <div>
@ -172,14 +176,16 @@
</div> </div>
<field name="price_unit"/> <field name="price_unit"/>
<field name="discount" groups="sale.group_discount_per_so_line"/> <field name="discount" groups="sale.group_discount_per_so_line"/>
</group><group> </group>
</group>
<group>
<group>
<field name="product_packaging" <field name="product_packaging"
context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"
colspan="3"/> colspan="3"/>
<field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/> <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
<field name="invoiced"/> <field name="invoiced"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
<button name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/> <button name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
</group> </group>
<group col="4"> <group col="4">
@ -189,7 +195,7 @@
<field name="address_allotment_id"/> <field name="address_allotment_id"/>
</group> </group>
<separator string="Properties" colspan="2"/> <separator string="Properties" colspan="2"/>
<field name="property_ids"/> <field name="property_ids" colspan="4" nolabel="1" />
<separator string="Notes" groups="base.group_sale_notes_subtotal"/> <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
<field name="notes" groups="base.group_sale_notes_subtotal"/> <field name="notes" groups="base.group_sale_notes_subtotal"/>
<div groups="base.group_no_one"> <div groups="base.group_no_one">

4
addons/sale_crm/sale_crm_view.xml
View File

@ -9,9 +9,9 @@
<field name="inherit_id" ref="crm.crm_case_form_view_oppor"/> <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<field name="state" position="before"> <xpath expr="/form/header/button[@name='stage_previous']" position="before">
<button string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/> <button string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/>
</field> </xpath>
</data> </data>
</field> </field>
</record> </record>

8
addons/sale_crm/wizard/crm_make_sale.py
View File

@ -120,6 +120,7 @@ class crm_make_sale(osv.osv_memory):
'res_model': 'sale.order', 'res_model': 'sale.order',
'view_id': False, 'view_id': False,
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'name' : _('Quotation'),
'res_id': new_ids and new_ids[0] 'res_id': new_ids and new_ids[0]
} }
else: else:
@ -130,6 +131,7 @@ class crm_make_sale(osv.osv_memory):
'res_model': 'sale.order', 'res_model': 'sale.order',
'view_id': False, 'view_id': False,
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'name' : _('Quotation'),
'res_id': new_ids 'res_id': new_ids
} }
return value return value
@ -145,9 +147,9 @@ class crm_make_sale(osv.osv_memory):
'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'), 'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'),
} }
_defaults = { _defaults = {
'shop_id': _get_shop_id, 'shop_id': _get_shop_id,
'close': False, 'close': False,
'partner_id': _selectPartner, 'partner_id': _selectPartner,
} }
crm_make_sale() crm_make_sale()

30
addons/stock/product_view.xml
View File

@ -60,13 +60,13 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="product.product_normal_form_view"/> <field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="standard_price" position="replace"> <field name="standard_price" position="replace" version="7.0">
<label string="Cost Price" for="standard_price" align="1.0"/> <label string="Cost Price" for="standard_price" align="1.0"/>
<group col="2" colspan="1"> <div>
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/> <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
<button name="%(action_view_change_standard_price)d" string="Update" <button name="%(action_view_change_standard_price)d" string="Update"
type="action" icon="gtk-execute" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"/> type="action" icon="gtk-execute" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"/>
</group> </div>
</field> </field>
</field> </field>
</record> </record>
@ -78,7 +78,7 @@
<field name="inherit_id" ref="product.product_normal_form_view"/> <field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="priority">26</field> <field name="priority">26</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="/form/notebook/page/group[@name='properties']" position="before"> <xpath expr="//group[@name='properties']" position="before">
<group groups="stock.group_inventory_valuation"> <group groups="stock.group_inventory_valuation">
<separator string="Inventory Valuation" colspan="4"/> <separator string="Inventory Valuation" colspan="4"/>
<group colspan="2" col="2"> <group colspan="2" col="2">
@ -102,22 +102,20 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="product.product_normal_form_view"/> <field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<group name="status" position="after"> <group name="status" position="before" version="7.0">
<group colspan="2" col="3"> <group string="Stock and Expected Variations">
<separator string="Stocks" colspan="4"/>
<field name="qty_available"/> <field name="qty_available"/>
<button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user"/>
<newline/>
<field name="virtual_available"/>
</group>
<group colspan="2" col="2" name="stock_variations">
<separator string="Expected Stock Variations" colspan="2"/>
<field name="incoming_qty"/> <field name="incoming_qty"/>
<label for="virtual_available" />
<div>
<field name="virtual_available" class="oe_form_inline" />
<button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user" class="oe_form_inline" />
</div>
<field name="outgoing_qty"/> <field name="outgoing_qty"/>
</group> </group>
<group colspan="2" col="2" name="lot" groups="stock.group_tracking_lot,stock.group_production_lot"> <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
<separator string="Lots" colspan="4"/>
<field name="track_production" groups="stock.group_production_lot"/> <field name="track_production" groups="stock.group_production_lot"/>
<field name="track_incoming" groups="stock.group_tracking_lot"/> <field name="track_incoming" groups="stock.group_tracking_lot"/>
<field name="track_outgoing" groups="stock.group_tracking_lot"/> <field name="track_outgoing" groups="stock.group_tracking_lot"/>

158
addons/stock/stock_view.xml
View File

@ -119,15 +119,20 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header> </header>
<sheet> <sheet>
<div class="oe_form_title">
<div class="oe_form_readonly_hidden">
<label for="name" />
</div>
<h1>
<field name="name" placeholder="Annual inventory"/>
</h1>
</div>
<group> <group>
<label for="name" clas="oe_form_readonly_hidden"/> <group>
<h1>
<field name="name" placeholder="Annual invetory 2013"/>
</h1>
<group col="4">
<field name="date"/> <field name="date"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group> </group>
</group>
<notebook> <notebook>
<page string="General Informations"> <page string="General Informations">
<field name="inventory_line_id"> <field name="inventory_line_id">
@ -182,7 +187,6 @@
</field> </field>
</page> </page>
</notebook> </notebook>
</group>
</sheet> </sheet>
</form> </form>
</field> </field>
@ -783,62 +787,62 @@
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/> <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/> <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/> <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
<field name="state" widget="statusbar"/> <field name="state" widget="statusbar" status_visible="draft,assigned,done" />
</header> </header>
<group> <group>
<group string="Move Information"> <group string="Move Information">
<field name="name" invisible="1"/> <field name="name" invisible="1"/>
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/> <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
<label for="product_qty"/> <label for="product_qty"/>
<div> <div>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/> <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
<field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/> <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
<button name="%(stock.move_scrap)d" <button name="%(stock.move_scrap)d"
string="Scrap" type="action" string="Scrap" type="action"
icon="gtk-convert" context="{'scrap': True}" icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/> states="draft,waiting,confirmed,assigned" colspan="1"/>
</div> </div>
<label for="product_uos_qty" groups="product.group_uos"/> <label for="product_uos_qty" groups="product.group_uos"/>
<div> <div>
<field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/> <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
<field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/> <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
</div> </div>
<field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/> <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
</group> </group>
<group string="Locations" groups="stock.group_locations"> <group string="Dates">
<field name="location_id" domain="[('usage','&lt;&gt;','view')]"/> <field name="create_date" invisible="1"/>
<field name="location_dest_id" domain="[('usage','=','internal')]"/> <field name="date"/>
</group> <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group>
<group string="Dates"> <group string="Locations" groups="stock.group_locations">
<field name="create_date" invisible="1"/> <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
<field name="date"/> <field name="location_dest_id" domain="[('usage','=','internal')]"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/> </group>
</group>
<group groups="stock.group_tracking_lot" string="Traceability"> <group groups="stock.group_tracking_lot" string="Traceability">
<label for="tracking_id"/> <label for="tracking_id"/>
<div> <div>
<field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/> <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
<button name="%(split_into)d" string="New Pack" type="action" <button name="%(split_into)d" string="New Pack" type="action"
groups="product.group_stock_packaging" groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize" icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed"/> states="draft,assigned,confirmed"/>
</div> </div>
<label for="prodlot_id"/> <label for="prodlot_id"/>
<div> <div>
<field name="prodlot_id" groups="stock.group_production_lot" <field name="prodlot_id" groups="stock.group_production_lot"
context="{'location_id':location_id, 'product_id':product_id}" context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]" domain="[('product_id','=?',product_id)]"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/> on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
<button name="%(track_line)d" <button name="%(track_line)d"
groups="stock.group_tracking_lot" groups="stock.group_tracking_lot"
states="draft,waiting,confirmed,assigned" states="draft,waiting,confirmed,assigned"
string="Split" type="action" icon="terp-stock_effects-object-colorize"/> string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
</div> </div>
</group> </group>
</group> </group>
</form> </form>
</field> </field>
@ -1219,32 +1223,37 @@
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/> <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
<label for="product_qty"/> <label for="product_qty"/>
<div> <div>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/> <field name="product_qty"
on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
class="oe_form_inline"/>
<field name="product_uom" groups="product.group_uom" class="oe_form_inline"/> <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
<button name="%(stock.move_scrap)d" <button name="%(stock.move_scrap)d"
string="Scrap" type="action" string="Scrap" type="action"
icon="gtk-convert" context="{'scrap': True}" icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/> states="draft,waiting,confirmed,assigned" colspan="1"/>
</div> </div>
<label for="product_uso_qty" />
<div>
<field name="product_uos_qty"
groups="product.group_uos"
on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"
class="oe_form_inline"/>
<field name="product_uos" groups="product.group_uos" colspan="4" class="oe_form_inline"/>
</div>
<field name="name" string="Reason"/>
</group>
<group>
<field name="picking_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="location_id" groups="stock.group_locations"/> <field name="location_id" groups="stock.group_locations"/>
<field name="location_dest_id" groups="stock.group_locations"/> <field name="location_dest_id" groups="stock.group_locations"/>
<field name="partner_id" context="{'contact_display':'partner'}"/> <field name="partner_id" context="{'contact_display':'partner'}"/>
</group>
<group string="Move Information">
<field name="name" string="Reason"/>
<field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
<field name="product_uos" groups="product.group_uos" colspan="4"/>
</group>
<group string="Picking" name="picking">
<field name="picking_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group string="Dates">
<field name="create_date" groups="base.group_no_one" /> <field name="create_date" groups="base.group_no_one" />
<field name="date" groups="base.group_no_one" /> <field name="date" groups="base.group_no_one" />
<field name="date_expected" on_change="onchange_date(date,date_expected)"/> <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group> </group>
<group string="Traceability"> <group>
<label for="tracking_id"/> <label for="tracking_id"/>
<div> <div>
<field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/> <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
@ -1418,16 +1427,13 @@
<field name="product_uos" groups="product.group_uos"/> <field name="product_uos" groups="product.group_uos"/>
</div> </div>
<field name="name" string="Reason"/> <field name="name" string="Reason"/>
</group><group> </group>
<group>
<field name="picking_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="location_id" groups="stock.group_locations"/> <field name="location_id" groups="stock.group_locations"/>
<field name="location_dest_id" groups="stock.group_locations"/> <field name="location_dest_id" groups="stock.group_locations"/>
<field name="partner_id"/> <field name="partner_id"/>
</group>
<group name="picking">
<field name="picking_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group>
<field name="create_date" groups="base.group_no_one" /> <field name="create_date" groups="base.group_no_one" />
<field name="date" groups="base.group_no_one" /> <field name="date" groups="base.group_no_one" />
<field name="date_expected" on_change="onchange_date(date,date_expected)"/> <field name="date_expected" on_change="onchange_date(date,date_expected)"/>