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

[IMP] simplified views 

bzr revid: fp@tinyerp.com-20100418153244-e8o5p2gxubw4m6t4
This commit is contained in:
Fabien Pinckaers 2010-04-18 17:32:44 +02:00
parent e07150a936
commit f8d3d3b84f
55 changed files with 551 additions and 483 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
addons/account/account_view.xml
View File

@ -122,16 +122,16 @@
<field name="name" select="1" colspan="4"/> <field name="name" select="1" colspan="4"/>
<field name="code" select="1"/> <field name="code" select="1"/>
<field name="parent_id"/> <field name="parent_id"/>
<field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="user_type" select="1"/> <field name="user_type" select="1"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="General Information"> <page string="General Information">
<newline/> <newline/>
<field name="currency_id" select="2"/> <field name="currency_id"/>
<field name="currency_mode" select="2"/> <field name="currency_mode"/>
<field name="reconcile"/> <field name="reconcile"/>
<field name="active" select="2"/> <field name="active"/>
<field name="check_history"/> <field name="check_history"/>
<field name="type" select="1"/> <field name="type" select="1"/>
<newline/> <newline/>
@ -338,7 +338,7 @@
<field name="date" select="1"/> <field name="date" select="1"/>
<field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/> <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
<field name="currency"/> <field name="currency"/>
<field name="period_id" select="2"/> <field name="period_id"/>
<group colspan="2" col="3"> <group colspan="2" col="3">
<!-- <button name="%(action_view_account_statement_from_invoice)d"--> <!-- <button name="%(action_view_account_statement_from_invoice)d"-->
<!-- string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>--> <!-- string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
@ -382,7 +382,7 @@
</page> </page>
</notebook> </notebook>
<group col="7" colspan="4"> <group col="7" colspan="4">
<field name="state" select="2"/> <field name="state"/>
<field name="balance_end"/> <field name="balance_end"/>
<button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/> <button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/>
<button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/> <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
@ -599,14 +599,14 @@
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="description" select="1"/> <field name="description" select="1"/>
<field name="active" select="2"/> <field name="active"/>
<field name="tax_group" select="1"/> <field name="tax_group" select="1"/>
<field name="type"/> <field name="type"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Tax Definition"> <page string="Tax Definition">
<field name="applicable_type"/> <field name="applicable_type"/>
<field name="amount" select="2" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/> <field name="amount" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
<field groups="base.group_extended" name="include_base_amount"/> <field groups="base.group_extended" name="include_base_amount"/>
<field groups="base.group_extended" name="domain"/> <field groups="base.group_extended" name="domain"/>
<newline/> <newline/>
@ -701,23 +701,23 @@
<separator colspan="4" string="General Information"/> <separator colspan="4" string="General Information"/>
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="date" select="1"/> <field name="date" select="1"/>
<field name="ref" select="2"/> <field name="ref"/>
<field name="invoice" select="2"/> <field name="invoice"/>
<field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/> <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/> <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
<field name="debit" select="2"/> <field name="debit"/>
<field name="credit" select="2"/> <field name="credit"/>
<field name="company_id" required="1" groups="base.group_multi_company"/> <field name="company_id" required="1" groups="base.group_multi_company"/>
<separator colspan="4" string="Optional Information"/> <separator colspan="4" string="Optional Information"/>
<field name="currency_id"/> <field name="currency_id"/>
<field name="amount_currency"/> <field name="amount_currency"/>
<field name="quantity" select="2"/> <field name="quantity"/>
<field name="move_id" required="False"/> <field name="move_id" required="False"/>
<newline/> <newline/>
<field name="statement_id" select="2"/> <field name="statement_id"/>
<field name="blocked" select="2"/> <field name="blocked"/>
<field name="date_maturity"/> <field name="date_maturity"/>
<field name="date_created"/> <field name="date_created"/>
<newline/> <newline/>
@ -728,11 +728,11 @@
<field name="analytic_account_id"/> <field name="analytic_account_id"/>
<separator colspan="4" string="State"/> <separator colspan="4" string="State"/>
<field name="journal_id" select="2"/> <field name="journal_id"/>
<field name="period_id"/> <field name="period_id"/>
<field name="reconcile_id"/> <field name="reconcile_id"/>
<field name="reconcile_partial_id"/> <field name="reconcile_partial_id"/>
<field name="state" select="2"/> <field name="state"/>
</page> </page>
<page string="Analytic Lines"> <page string="Analytic Lines">
<field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/> <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
@ -754,14 +754,14 @@
<page string="Information"> <page string="Information">
<separator colspan="4" string="General Information"/> <separator colspan="4" string="General Information"/>
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="date" select="2"/> <field name="date"/>
<field name="journal_id" readonly="False" select="1"/> <field name="journal_id" readonly="False" select="1"/>
<field name="period_id" readonly="False" select="2"/> <field name="period_id" readonly="False"/>
<field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/> <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="partner_id" select="2" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/> <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
<newline/> <newline/>
<field name="debit" select="2"/> <field name="debit"/>
<field name="credit" select="2"/> <field name="credit"/>
<separator colspan="4" string="Optional Information"/> <separator colspan="4" string="Optional Information"/>
<field name="currency_id"/> <field name="currency_id"/>
@ -780,7 +780,7 @@
<newline/> <newline/>
<field name="reconcile_id"/> <field name="reconcile_id"/>
<field name="reconcile_partial_id"/> <field name="reconcile_partial_id"/>
<field name="state" select="2"/> <field name="state"/>
</page> </page>
<page string="Analytic Lines"> <page string="Analytic Lines">
<field colspan="4" name="analytic_lines" nolabel="1"/> <field colspan="4" name="analytic_lines" nolabel="1"/>
@ -861,13 +861,13 @@
<form string="Account Entry"> <form string="Account Entry">
<group colspan="4" col="6"> <group colspan="4" col="6">
<field name="name" select="1" readonly="True"/> <field name="name" select="1" readonly="True"/>
<field name="period_id" select="2"/> <field name="period_id"/>
<field name="journal_id" select="1"/> <field name="journal_id" select="1"/>
<field name="company_id" required="1" groups="base.group_multi_company"/> <field name="company_id" required="1" groups="base.group_multi_company"/>
<field name="date" select="1"/> <field name="date" select="1"/>
<field name="ref" select="1"/> <field name="ref" select="1"/>
<field name="to_check" select="2"/> <field name="to_check"/>
<field name="type" select="2" groups="base.group_extended"/> <field name="type" groups="base.group_extended"/>
</group> </group>
<field name="partner_id" invisible="1" select="1"/> <field name="partner_id" invisible="1" select="1"/>
<field name="amount" invisible="1" select="1"/> <field name="amount" invisible="1" select="1"/>
@ -917,7 +917,7 @@
</tree> </tree>
</field> </field>
<separator colspan="4" string="Narration"/> <separator colspan="4" string="Narration"/>
<field name="narration" select="2" colspan="4" nolabel="1"/> <field name="narration" colspan="4" nolabel="1"/>
<separator colspan="4" string="State"/> <separator colspan="4" string="State"/>
<field name="state" select="1"/> <field name="state" select="1"/>
<group col="2" colspan="2"> <group col="2" colspan="2">
@ -1041,7 +1041,7 @@
</page> </page>
</notebook> </notebook>
<group col="7" colspan="4"> <group col="7" colspan="4">
<field name="state" select="2"/> <field name="state"/>
<field name="balance_end"/> <field name="balance_end"/>
<button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/> <button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/>
<button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/> <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
@ -1315,7 +1315,7 @@
<separator colspan="4" string="Subscription Periods"/> <separator colspan="4" string="Subscription Periods"/>
<field name="date_start" select="1"/> <field name="date_start" select="1"/>
<field name="period_total" select="2"/> <field name="period_total"/>
<field name="period_nbr"/> <field name="period_nbr"/>
<field name="period_type"/> <field name="period_type"/>
@ -1328,7 +1328,7 @@
<field colspan="4" name="lines_id" widget="one2many_list" nolabel="1"/> <field colspan="4" name="lines_id" widget="one2many_list" nolabel="1"/>
<separator colspan="4" string="State"/> <separator colspan="4" string="State"/>
<field name="state" select="2"/> <field name="state"/>
<group col="1" colspan="2"> <group col="1" colspan="2">
<button name="state_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" /> <button name="state_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" />
</group> </group>
@ -1534,7 +1534,7 @@
<field name="type" select="1"/> <field name="type" select="1"/>
<field name="user_type" select="1"/> <field name="user_type" select="1"/>
<field name="currency_id" select="2"/> <field name="currency_id"/>
<field name="reconcile"/> <field name="reconcile"/>
<field name="tax_ids" colspan="4"/> <field name="tax_ids" colspan="4"/>
</page> </page>
@ -1627,13 +1627,13 @@
<newline/> <newline/>
<field name="chart_template_id" select="1"/> <field name="chart_template_id" select="1"/>
<field name="tax_group" select="1"/> <field name="tax_group" select="1"/>
<field name="type" select="2"/> <field name="type"/>
<field name="type_tax_use" select="2"/> <field name="type_tax_use"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Tax Definition"> <page string="Tax Definition">
<field name="applicable_type"/> <field name="applicable_type"/>
<field name="amount" select="2" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/> <field name="amount" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
<field groups="base.group_extended" name="include_base_amount"/> <field groups="base.group_extended" name="include_base_amount"/>
<field groups="base.group_extended" name="domain"/> <field groups="base.group_extended" name="domain"/>
<newline/> <newline/>

12
addons/account/partner_view.xml
View File

@ -84,23 +84,23 @@
</group> </group>
<group col="2" colspan="2"> <group col="2" colspan="2">
<separator string="Customer Credit" colspan="2"/> <separator string="Customer Credit" colspan="2"/>
<field name="credit" select="2"/> <field name="credit"/>
<field name="credit_limit" select="2" groups="base.group_extended"/> <field name="credit_limit" groups="base.group_extended"/>
</group> </group>
<group col="2" colspan="2"> <group col="2" colspan="2">
<separator string="Supplier Debit" colspan="2"/> <separator string="Supplier Debit" colspan="2"/>
<field name="debit" select="2"/> <field name="debit"/>
</group> </group>
<field colspan="4" context="{'address': address}" name="bank_ids" nolabel="1" select="2"> <field colspan="4" context="{'address': address}" name="bank_ids" nolabel="1">
<form string="Bank account"> <form string="Bank account">
<field name="state" select="2"/> <field name="state"/>
<newline/> <newline/>
<field name="acc_number" select="1"/> <field name="acc_number" select="1"/>
<newline/> <newline/>
<field name="bank"/> <field name="bank"/>
<newline/> <newline/>
<field name="sequence"/> <field name="sequence"/>
<field colspan="4" name="name" select="2"/> <field colspan="4" name="name"/>
<separator colspan="4" string="Bank account owner"/> <separator colspan="4" string="Bank account owner"/>
<field colspan="4" name="owner_name"/> <field colspan="4" name="owner_name"/>
<field colspan="4" name="street"/> <field colspan="4" name="street"/>

2
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
View File

@ -2,7 +2,7 @@
<data> <data>
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/> <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
<menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/> <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>
<menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/> <menuitem id="menu_invoicing" name="Billing" parent="next_id_71" sequence="20"/>
<record id="action_hr_tree_invoiced_all" model="ir.actions.act_window"> <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
<field name="name">All Uninvoiced Entries</field> <field name="name">All Uninvoiced Entries</field>

4
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -39,11 +39,11 @@
<field name="last_invoice_date"/> <field name="last_invoice_date"/>
<field name="last_worked_invoiced_date" select="2"/> <field name="last_worked_invoiced_date"/>
<field name="last_worked_date"/> <field name="last_worked_date"/>
<separator colspan="4" string="To be invoiced"/> <separator colspan="4" string="To be invoiced"/>
<field name="hours_qtt_non_invoiced"/> <field name="hours_qtt_non_invoiced"/>
<field name="ca_to_invoice" select="2"/> <field name="ca_to_invoice"/>
</page> </page>
<page string="Stats by month"> <page string="Stats by month">

2
addons/account_budget/crossovered_budget_view.xml
View File

@ -296,7 +296,7 @@
<!--Menu for project management--> <!--Menu for project management-->
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/> <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
<menuitem id="base.menu_pm_invoicing" name="Invoicing" parent="base.menu_main_pm" sequence="7"/> <menuitem id="base.menu_pm_invoicing" name="Billing" parent="base.menu_main_pm" sequence="7"/>
<menuitem id="menu_pm_budget" name="Budgets" parent="base.menu_pm_invoicing"/> <menuitem id="menu_pm_budget" name="Budgets" parent="base.menu_pm_invoicing"/>
<menuitem action="open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/> <menuitem action="open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
<menuitem parent="menu_pm_budget" <menuitem parent="menu_pm_budget"

4
addons/base_report_creator/base_report_creator_view.xml
View File

@ -37,8 +37,8 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Report Creator"> <form string="Report Creator">
<field name="name" select="1" colspan="4"/> <field name="name" select="1" colspan="4"/>
<field name="type" select="2"/> <field name="type"/>
<field name="active" select="2"/> <field name="active"/>
<notebook colspan="4"> <notebook colspan="4">
<page string="General Configuration"> <page string="General Configuration">
<field name="model_ids" colspan="4" <field name="model_ids" colspan="4"

2
addons/base_vat/base_vat_data.xml
View File

@ -9,7 +9,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="property_account_payable" position="after"> <field name="property_account_payable" position="after">
<group colspan="2" col="6"> <group colspan="2" col="6">
<field name="vat" on_change="vat_change(vat)" select="2" colspan="4" /> <field name="vat" on_change="vat_change(vat)" colspan="4" />
<field name="vat_subjected" colspan="1"/> <field name="vat_subjected" colspan="1"/>
</group> </group>
</field> </field>

12
addons/crm/crm.py
View File

@ -46,7 +46,7 @@ AVAILABLE_PRIORITIES = [
] ]
class crm_case_section(osv.osv): class crm_case_section(osv.osv):
""" Cases Section""" """Sales Team"""
_name = "crm.case.section" _name = "crm.case.section"
_description = "Sales Teams" _description = "Sales Teams"
@ -61,8 +61,8 @@ class crm_case_section(osv.osv):
'user_id': fields.many2one('res.users', 'Responsible User'), 'user_id': fields.many2one('res.users', 'Responsible User'),
'reply_to': fields.char('Reply-To', size=64, help="The email address put \ 'reply_to': fields.char('Reply-To', size=64, help="The email address put \
in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"), in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"),
'parent_id': fields.many2one('crm.case.section', 'Parent Section'), 'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'), 'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"), 'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
} }
@ -72,7 +72,7 @@ class crm_case_section(osv.osv):
} }
_sql_constraints = [ _sql_constraints = [
('code_uniq', 'unique (code)', 'The code of the section must be unique !') ('code_uniq', 'unique (code)', 'The code of the sales team must be unique !')
] ]
def _check_recursion(self, cr, uid, ids): def _check_recursion(self, cr, uid, ids):
@ -708,7 +708,7 @@ class crm_case(osv.osv):
data['user_id'] = case.section_id.parent_id.user_id.id data['user_id'] = case.section_id.parent_id.user_id.id
else: else:
raise osv.except_osv(_('Error !'), _('You can not escalate this case.\nYou are already at the top level.')) raise osv.except_osv(_('Error !'), _('You can not escalate this case.\nYou are already at the top level.'))
self.write(cr, uid, ids, data) self.write(cr, uid, [case.id], data)
cases = self.browse(cr, uid, ids) cases = self.browse(cr, uid, ids)
self.__history(cr, uid, cases, _('Escalate')) self.__history(cr, uid, cases, _('Escalate'))
self._action(cr, uid, cases, 'escalate') self._action(cr, uid, cases, 'escalate')
@ -797,7 +797,7 @@ class crm_case_log(osv.osv):
_columns = { _columns = {
'name': fields.char('Status', size=64), 'name': fields.char('Status', size=64),
'date': fields.datetime('Date'), 'date': fields.datetime('Date'),
'section_id': fields.many2one('crm.case.section', 'Section'), 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
'model_id': fields.many2one('ir.model', "Model"), 'model_id': fields.many2one('ir.model', "Model"),
'res_id': fields.integer('Resource ID'), 'res_id': fields.integer('Resource ID'),

6
addons/crm/crm_action_rule.py
View File

@ -70,7 +70,7 @@ class case(osv.osv):
""" """
for case in self.browse(cr, uid, ids): for case in self.browse(cr, uid, ids):
if not case.section_id.reply_to: if not case.section_id.reply_to:
raise osv.except_osv(_('Error!'), ("Reply To is not specified in Section")) raise osv.except_osv(_('Error!'), ("Reply To is not specified in the sales team"))
if not case.email_from: if not case.email_from:
raise osv.except_osv(_('Error!'), ("Partner Email is not specified in Case")) raise osv.except_osv(_('Error!'), ("Partner Email is not specified in Case"))
if case.section_id.reply_to and case.email_from: if case.section_id.reply_to and case.email_from:
@ -259,11 +259,11 @@ class base_action_rule_line(osv.osv):
return res + crm.AVAILABLE_PRIORITIES return res + crm.AVAILABLE_PRIORITIES
_columns = { _columns = {
'trg_section_id': fields.many2one('crm.case.section', 'Section'), 'trg_section_id': fields.many2one('crm.case.section', 'Sales Team'),
'trg_max_history': fields.integer('Maximum Communication History'), 'trg_max_history': fields.integer('Maximum Communication History'),
'trg_categ_id': fields.many2one('crm.case.categ', 'Category'), 'trg_categ_id': fields.many2one('crm.case.categ', 'Category'),
'regex_history' : fields.char('Regular Expression on Case History', size=128), 'regex_history' : fields.char('Regular Expression on Case History', size=128),
'act_section_id': fields.many2one('crm.case.section', 'Set section to'), 'act_section_id': fields.many2one('crm.case.section', 'Set Team to'),
'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'), 'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'),
'act_mail_to_partner': fields.boolean('Mail to partner',help="Check this \ 'act_mail_to_partner': fields.boolean('Mail to partner',help="Check this \
if you want the rule to send an email to the partner."), if you want the rule to send an email to the partner."),

2
addons/crm/crm_claims_view.xml
View File

@ -108,7 +108,7 @@
</group> </group>
<separator colspan="4" string="Status and Categorization"/> <separator colspan="4" string="Status and Categorization"/>
<group colspan="4" col="6"> <group colspan="4" col="6">
<field name="user_id" string="Responsible" select="2"/> <field name="user_id" string="Responsible"/>
<field name="section_id" widget="selection"/> <field name="section_id" widget="selection"/>
<label string="Stage: " align="1.0"/> <label string="Stage: " align="1.0"/>
<group colspan="1" col="2"> <group colspan="1" col="2">

3
addons/crm/crm_fund_menu.xml
View File

@ -5,7 +5,8 @@
<!-- MENU --> <!-- MENU -->
<menuitem id="base.menu_fundrising" name="Fund Raising" <menuitem id="base.menu_fundrising" name="Fund Raising"
parent="base.menu_base_partner" sequence="7" /> groups="base.group_extended"
parent="base.menu_base_partner" sequence="7" />
<record model="ir.actions.act_window" id="crm_case_category_act_fund_all1"> <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
<field name="name">Funds</field> <field name="name">Funds</field>

9
addons/crm/crm_fund_view.xml
View File

@ -15,6 +15,7 @@
<menuitem action="crm_fund_categ_action" <menuitem action="crm_fund_categ_action"
id="menu_crm_case_fundraising-act" id="menu_crm_case_fundraising-act"
groups="base.group_extended"
parent="crm.menu_crm_case_categ" /> parent="crm.menu_crm_case_categ" />
<!-- Fund Stage Form View --> <!-- Fund Stage Form View -->
@ -29,6 +30,7 @@
</record> </record>
<menuitem action="crm_fundraising_stage_act" <menuitem action="crm_fundraising_stage_act"
groups="base.group_extended"
id="menu_crm_fundraising_stage_act" id="menu_crm_fundraising_stage_act"
parent="crm.menu_crm_case_stage" /> parent="crm.menu_crm_case_stage" />
@ -44,6 +46,7 @@
</record> </record>
<menuitem action="crm_fundraising_resource_act" <menuitem action="crm_fundraising_resource_act"
groups="base.group_extended"
id="menu_crm_fundraising_resource_act" id="menu_crm_fundraising_resource_act"
parent="crm.menu_crm_case_resource_type" /> parent="crm.menu_crm_case_resource_type" />
@ -117,7 +120,7 @@
<field name="probability"/> <field name="probability"/>
<separator colspan="4" string="Categorization"/> <separator colspan="4" string="Categorization"/>
<group colspan="4" col="6"> <group colspan="4" col="6">
<field name="user_id" select="2" string="Responsible"/> <field name="user_id" string="Responsible"/>
<field name="section_id" colspan="1" widget="selection"/> <field name="section_id" colspan="1" widget="selection"/>
<field name="categ_id" select="1" <field name="categ_id" select="1"
widget="selection" widget="selection"
@ -129,7 +132,7 @@
<field name="description" nolabel="1" colspan="4"/> <field name="description" nolabel="1" colspan="4"/>
<separator colspan="4"/> <separator colspan="4"/>
<group col="8" colspan="4"> <group col="8" colspan="4">
<field name="state" select="2"/> <field name="state"/>
<button name="case_close" string="Done" <button name="case_close" string="Done"
states="open,draft,pending" type="object" states="open,draft,pending" type="object"
icon="gtk-close" /> icon="gtk-close" />
@ -277,7 +280,7 @@
domain="[('user_id','=', False)]" domain="[('user_id','=', False)]"
help="Unassigned" /> help="Unassigned" />
</field> </field>
<field name="section_id" select="1" widget="selection" string="Section"> <field name="section_id" select="1" widget="selection" string="Sales Team">
<filter icon="terp-crm" <filter icon="terp-crm"
domain="[('section_id','=',context.get('section_id',False))]" domain="[('section_id','=',context.get('section_id',False))]"
help="My section" /> help="My section" />

18
addons/crm/crm_helpdesk_view.xml
View File

@ -27,7 +27,7 @@
<group colspan="4" col="4"> <group colspan="4" col="4">
<field colspan="4" name="name" select="1"/> <field colspan="4" name="name" select="1"/>
<field name="date" select="1"/> <field name="date" select="1"/>
<field name="date_deadline" select="2"/> <field name="date_deadline"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="General"> <page string="General">
@ -38,9 +38,9 @@
select="1" /> select="1" />
<field name="partner_address_id" <field name="partner_address_id"
on_change="onchange_partner_address_id(partner_address_id, email_from)" on_change="onchange_partner_address_id(partner_address_id, email_from)"
select="2" /> />
<field name="email_from" select="2" /> <field name="email_from" />
<button name="remind_partner" <button name="remind_partner"
states="open,pending" states="open,pending"
string="Send Reminder" type="object" string="Send Reminder" type="object"
@ -88,9 +88,9 @@
</page> </page>
<page string="History" groups="base.group_extended"> <page string="History" groups="base.group_extended">
<field name="id" select="1"/> <field name="id" select="1"/>
<field name="active" select="2"/> <field name="active"/>
<field name="categ_id" select="2"/> <field name="categ_id"/>
<field name="som" select="2"/> <field name="som"/>
<separator colspan="4" string="Dates"/> <separator colspan="4" string="Dates"/>
<field name="create_date"/> <field name="create_date"/>
<field name="date_closed"/> <field name="date_closed"/>
@ -103,8 +103,8 @@
<form string="Actions"> <form string="Actions">
<separator colspan="4" string="Action Information"/> <separator colspan="4" string="Action Information"/>
<field colspan="4" name="name"/> <field colspan="4" name="name"/>
<field name="date" select="2"/> <field name="date"/>
<field name="user_id" select="2"/> <field name="user_id"/>
</form> </form>
</field> </field>
</page> </page>
@ -226,7 +226,7 @@
<filter icon="terp-partner" name="my_hd_request" <filter icon="terp-partner" name="my_hd_request"
domain="[('user_id','=',uid)]" help="My Helpdesk Requests"/> domain="[('user_id','=',uid)]" help="My Helpdesk Requests"/>
</field> </field>
<field name="section_id" select="1" widget="selection" string="Section"> <field name="section_id" select="1" widget="selection" string="Sales Team">
<filter icon="terp-crm" <filter icon="terp-crm"
domain="[('section_id','=',context.get('section_id',False))]" domain="[('section_id','=',context.get('section_id',False))]"
help="My section" /> help="My section" />

2
addons/crm/crm_lead.py
View File

@ -122,7 +122,7 @@ class crm_lead(osv.osv):
'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'), 'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'),
'user_id': fields.many2one('res.users', 'Salesman'), 'user_id': fields.many2one('res.users', 'Salesman'),
'referred': fields.char('Referred By', size=32), 'referred': fields.char('Referred By', size=64),
'date_open': fields.datetime('Opened', readonly=True), 'date_open': fields.datetime('Opened', readonly=True),
'day_open': fields.function(_compute_day, string='Days to Open', \ 'day_open': fields.function(_compute_day, string='Days to Open', \
method=True, multi='day_open', type="integer", store=True), method=True, multi='day_open', type="integer", store=True),

7
addons/crm/crm_lead_menu.xml
View File

@ -25,10 +25,11 @@
</record> </record>
<menuitem id="base.menu_sales" name="Sales" <menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner" sequence="1" /> parent="base.menu_base_partner" sequence="1" />
<menuitem parent="base.menu_sales" name="Leads" <menuitem parent="base.menu_sales" name="Leads"
id="menu_crm_case_categ0_act_leads" groups="base.group_extended"
action="crm_case_category_act_leads_all" sequence="1" /> id="menu_crm_case_categ0_act_leads"
action="crm_case_category_act_leads_all" sequence="1" />
</data> </data>
</openerp> </openerp>

21
addons/crm/crm_lead_view.xml
View File

@ -13,6 +13,7 @@
<field name="context">{'object_id':'crm.lead'}</field> <field name="context">{'object_id':'crm.lead'}</field>
</record> </record>
<menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act"
groups="base.group_extended"
parent="crm.menu_crm_case_stage" /> parent="crm.menu_crm_case_stage" />
<!-- Resource Type Form View --> <!-- Resource Type Form View -->
@ -27,6 +28,7 @@
</record> </record>
<menuitem action="crm_lead_resource_act" <menuitem action="crm_lead_resource_act"
id="menu_crm_lead_resource_act" id="menu_crm_lead_resource_act"
groups="base.group_extended"
parent="crm.menu_crm_case_resource_type" /> parent="crm.menu_crm_case_resource_type" />
<!-- CRM Lead Form View --> <!-- CRM Lead Form View -->
@ -42,18 +44,17 @@
<field name="priority"/> <field name="priority"/>
<field name="date_deadline"/> <field name="date_deadline"/>
<button <button
name="convert_opportunity" name="convert_opportunity"
string="Convert" string="Convert"
help="Convert into Opportunity" help="Convert to Opportunity"
icon="gtk-index" icon="gtk-index"
type="object" type="object"
attrs="{'invisible':[('opportunity_id','!=',False)]}"/> attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
<newline /> <newline />
<field name="section_id" colspan="1" <field name="section_id" colspan="1"
widget="selection" /> widget="selection" />
<field name="user_id" /> <field name="user_id" />
<field name="stage_id" widget="selection" <field name="stage_id" widget="selection"
readonly="1"
domain="[('object_id.model', '=', 'crm.lead')]" /> domain="[('object_id.model', '=', 'crm.lead')]" />
<group col="2" colspan="1"> <group col="2" colspan="1">
<button name="stage_previous" string="Previous" <button name="stage_previous" string="Previous"
@ -102,7 +103,7 @@
<field name="description" nolabel="1" colspan="4"/> <field name="description" nolabel="1" colspan="4"/>
<separator colspan="4"/> <separator colspan="4"/>
<group col="8" colspan="4"> <group col="8" colspan="4">
<field name="state" select="2"/> <field name="state"/>
<button name="case_close" string="Close" <button name="case_close" string="Close"
states="open,draft,pending" type="object" states="open,draft,pending" type="object"
icon="gtk-close" /> icon="gtk-close" />
@ -223,9 +224,9 @@
states="open,draft,pending" type="object" states="open,draft,pending" type="object"
icon="gtk-close" /> icon="gtk-close" />
<button string="Convert to Opportunity" <button string="Convert to Opportunity"
name="%(action_crm_lead2opportunity)d" name="convert_opportunity"
states="draft,open,pending" icon="gtk-index" states="draft,open,pending" icon="gtk-index"
type="action" /> type="object" />
<button name="case_escalate" string="Escalate" <button name="case_escalate" string="Escalate"
states="open,draft,pending" type="object" states="open,draft,pending" type="object"
icon="gtk-go-up" /> icon="gtk-go-up" />

4
addons/crm/crm_meeting_view.xml
View File

@ -122,7 +122,7 @@
<field name="description" nolabel="1" colspan="4" /> <field name="description" nolabel="1" colspan="4" />
<separator colspan="4"/> <separator colspan="4"/>
<group col="8" colspan="4"> <group col="8" colspan="4">
<field name="state" select="2" /> <field name="state" />
<button name="case_close" string="Done" <button name="case_close" string="Done"
states="open" type="object" states="open" type="object"
icon="gtk-jump-to" /> icon="gtk-jump-to" />
@ -155,7 +155,7 @@
<field name="role" select="1" /> <field name="role" select="1" />
<separator colspan="4" string="" /> <separator colspan="4" string="" />
<group col="6" colspan="4"> <group col="6" colspan="4">
<field name="state" select="2" /> <field name="state" />
<button name="do_tentative" <button name="do_tentative"
states="needs-action,declined,accepted" states="needs-action,declined,accepted"
string="Uncertain" string="Uncertain"

6
addons/crm/crm_opportunity.py
View File

@ -39,7 +39,7 @@ class crm_opportunity(osv.osv):
_name = "crm.opportunity" _name = "crm.opportunity"
_description = "Opportunity Cases" _description = "Opportunity Cases"
_order = "priority,id desc" _order = "priority,date_action,id desc"
_inherit = 'crm.case' _inherit = 'crm.case'
def case_open(self, cr, uid, ids, *args): def case_open(self, cr, uid, ids, *args):
@ -118,9 +118,8 @@ class crm_opportunity(osv.osv):
'categ_id': fields.many2one('crm.case.categ', 'Category', \ 'categ_id': fields.many2one('crm.case.categ', 'Category', \
domain="[('section_id','=',section_id), \ domain="[('section_id','=',section_id), \
('object_id.model', '=', 'crm.opportunity')]"), ('object_id.model', '=', 'crm.opportunity')]"),
'type_id': fields.many2one('crm.case.resource.type', 'Resource Type',\
domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
'referred': fields.char('Referred By', size=64),
'probability': fields.float('Probability (%)'), 'probability': fields.float('Probability (%)'),
'planned_revenue': fields.float('Expected Revenue'), 'planned_revenue': fields.float('Expected Revenue'),
'ref': fields.reference('Reference', selection=crm._links_get, size=128), 'ref': fields.reference('Reference', selection=crm._links_get, size=128),
@ -129,6 +128,7 @@ class crm_opportunity(osv.osv):
'user_id': fields.many2one('res.users', 'Salesman'), 'user_id': fields.many2one('res.users', 'Salesman'),
'phone': fields.char("Phone", size=64), 'phone': fields.char("Phone", size=64),
'date_deadline': fields.date('Expected Closing'), 'date_deadline': fields.date('Expected Closing'),
'date_action': fields.date('Next Action'),
'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
help='The state is set to \'Draft\', when a case is created.\ help='The state is set to \'Draft\', when a case is created.\
\nIf the case is in progress the state is set to \'Open\'.\ \nIf the case is in progress the state is set to \'Open\'.\

14
addons/crm/crm_opportunity_view.xml
View File

@ -79,6 +79,10 @@
<field name="date_deadline" string="Expected Closing"/> <field name="date_deadline" string="Expected Closing"/>
<button string="Schedule Call" <button string="Schedule Call"
name="%(opportunity2phonecall_act)d" icon="gtk-redo" type="action" /> name="%(opportunity2phonecall_act)d" icon="gtk-redo" type="action" />
<newline/>
<field name="date_action"/>
<field name="priority" string="Priority"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Opportunity"> <page string="Opportunity">
@ -94,9 +98,7 @@
</group> </group>
<group col="2" colspan="2"> <group col="2" colspan="2">
<separator colspan="2" string="Categorization"/> <separator colspan="2" string="Categorization"/>
<field name="type_id" select="1" string="Campaign" groups="base.group_extended"/>
<field name="section_id" colspan="1" widget="selection"/> <field name="section_id" colspan="1" widget="selection"/>
<field name="priority" string="Priority"/>
<field name="categ_id" select="1" <field name="categ_id" select="1"
string="Category" widget="selection" string="Category" widget="selection"
domain="[('object_id.model', '=', 'crm.opportunity')]" /> domain="[('object_id.model', '=', 'crm.opportunity')]" />
@ -107,7 +109,7 @@
<separator colspan="4"/> <separator colspan="4"/>
<group col="8" colspan="4"> <group col="8" colspan="4">
<field name="state" select="2"/> <field name="state"/>
<button name="case_open" string="Open" <button name="case_open" string="Open"
states="draft,pending" type="object" states="draft,pending" type="object"
icon="gtk-go-forward" /> icon="gtk-go-forward" />
@ -142,6 +144,7 @@
<field name="active"/> <field name="active"/>
<field name="day_open"/> <field name="day_open"/>
<field name="day_close"/> <field name="day_close"/>
<field name="referred"/>
</group> </group>
<separator colspan="4" string="References"/> <separator colspan="4" string="References"/>
<field name="ref"/> <field name="ref"/>
@ -207,7 +210,6 @@
<field name="partner_id"/> <field name="partner_id"/>
<field name="stage_id"/> <field name="stage_id"/>
<field name="categ_id" invisible="1"/> <field name="categ_id" invisible="1"/>
<field name="type_id" invisible="1"/>
<button name="stage_previous" string="Previous" <button name="stage_previous" string="Previous"
states="open,pending" type="object" icon="gtk-go-back" /> states="open,pending" type="object" icon="gtk-go-back" />
<button name="stage_next" string="Next" <button name="stage_next" string="Next"
@ -215,7 +217,7 @@
icon="gtk-go-forward" /> icon="gtk-go-forward" />
<field name="planned_revenue" sum="Expected Revenue"/> <field name="planned_revenue" sum="Expected Revenue"/>
<field name="probability" widget="progressbar" avg="Avg. of Probability"/> <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
<field name="date_deadline" string="Expected Closing"/> <field name="date_action"/>
<field name="section_id"/> <field name="section_id"/>
<field name="user_id"/> <field name="user_id"/>
<field name="priority"/> <field name="priority"/>
@ -304,8 +306,6 @@
<filter string="Category" icon="terp-crm" <filter string="Category" icon="terp-crm"
domain="[]" context="{'group_by':'categ_id'}" /> domain="[]" context="{'group_by':'categ_id'}" />
<filter string="Campaign" icon="terp-crm"
domain="[]" context="{'group_by':'type_id'}" />
<separator orientation="vertical" /> <separator orientation="vertical" />
<filter string="Partner" icon="terp-crm" domain="[]" <filter string="Partner" icon="terp-crm" domain="[]"
context="{'group_by':'partner_id'}" /> context="{'group_by':'partner_id'}" />

11
addons/crm/crm_phonecall_menu.xml
View File

@ -46,7 +46,8 @@
</record> </record>
<menuitem name="Phone Calls" id="menu_crm_case_phone" <menuitem name="Phone Calls" id="menu_crm_case_phone"
parent="base.menu_base_partner" sequence="5" /> groups="base.group_extended"
parent="base.menu_base_partner" sequence="5" />
<record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0"> <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
<field name="name">Inbound</field> <field name="name">Inbound</field>
@ -81,8 +82,8 @@
</record> </record>
<menuitem name="Inbound" id="menu_crm_case_phone_inbound" <menuitem name="Inbound" id="menu_crm_case_phone_inbound"
parent="crm.menu_crm_case_phone" parent="crm.menu_crm_case_phone"
action="crm_case_categ_phone_incoming0" /> action="crm_case_categ_phone_incoming0" />
<record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0"> <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
<field name="name">Outbound</field> <field name="name">Outbound</field>
@ -117,8 +118,8 @@
</record> </record>
<menuitem name="Outbound" id="menu_crm_case_phone_outbound" <menuitem name="Outbound" id="menu_crm_case_phone_outbound"
parent="crm.menu_crm_case_phone" parent="crm.menu_crm_case_phone"
action="crm_case_categ_phone_outgoing0" /> action="crm_case_categ_phone_outgoing0" />
</data> </data>
</openerp> </openerp>

2
addons/crm/crm_phonecall_view.xml
View File

@ -184,7 +184,7 @@
help="Unassigned Phonecalls" /> help="Unassigned Phonecalls" />
</field> </field>
<field name="section_id" <field name="section_id"
select="1" widget="selection" string="Section"> select="1" widget="selection" string="Sales Team">
<filter icon="terp-crm" <filter icon="terp-crm"
domain="[('section_id','=',context.get('section_id',False))]" domain="[('section_id','=',context.get('section_id',False))]"
help="My section" /> help="My section" />

4
addons/crm/crm_report_view.xml
View File

@ -5,7 +5,7 @@
<!-- Cases by section and category2 of case Tree View --> <!-- Cases by section and category2 of case Tree View -->
<record model="ir.ui.view" id="view_crm_case_section_categ_tree"> <record model="ir.ui.view" id="view_crm_case_section_categ_tree">
<field name="name">CRM Report - Sections and Type(Tree)</field> <field name="name">CRM Report - Teams and Type(Tree)</field>
<field name="model">report.crm.case.section.categ2</field> <field name="model">report.crm.case.section.categ2</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
@ -27,7 +27,7 @@
<!-- Cases by section and category2 of case Form View --> <!-- Cases by section and category2 of case Form View -->
<record model="ir.ui.view" id="view_crm_case_section_categ_form"> <record model="ir.ui.view" id="view_crm_case_section_categ_form">
<field name="name">CRM Report - Sections and Type(Form)</field> <field name="name">CRM Report - Teams and Type(Form)</field>
<field name="model">report.crm.case.section.categ2</field> <field name="model">report.crm.case.section.categ2</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">

48
addons/crm/crm_view.xml
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/> <menuitem id="menu_crm_configuration" name="Cases"
parent="base.menu_base_config" sequence="0"/>
<!-- Case Sections Form View --> <!-- Case Sections Form View -->
@ -15,12 +16,12 @@
<page string="Case section"> <page string="Case section">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="code" select="1"/> <field name="code" select="1"/>
<field name="user_id" select="2"/> <field name="user_id"/>
<field name="active" select="2"/> <field name="active"/>
<field name="parent_id" select="2" widget="selection"/> <field name="parent_id" widget="selection"/>
<field name="allow_unlink" select="2"/> <field name="allow_unlink"/>
<field name="reply_to" select="2"/> <field name="reply_to"/>
<field name="resource_calendar_id" select="2"/> <field name="resource_calendar_id"/>
</page> </page>
</notebook> </notebook>
</form> </form>
@ -300,7 +301,7 @@
<field colspan="4" name="name" select="1"/> <field colspan="4" name="name" select="1"/>
<field colspan="2" name="section_id" widget="selection"/> <field colspan="2" name="section_id" widget="selection"/>
<field name="create_date" select="1"/> <field name="create_date" select="1"/>
<field name="date_deadline" select="2"/> <field name="date_deadline"/>
<newline /> <newline />
<notebook colspan="4"> <notebook colspan="4">
<page string="General"> <page string="General">
@ -311,10 +312,10 @@
<field colspan="3" <field colspan="3"
name="partner_address_id" name="partner_address_id"
on_change="onchange_partner_address_id(partner_address_id, email_from)" on_change="onchange_partner_address_id(partner_address_id, email_from)"
select="2" /> />
<newline /> <newline />
<field colspan="3" name="email_from" <field colspan="3" name="email_from"
select="2" /> />
<button name="remind_partner" <button name="remind_partner"
states="open,pending" states="open,pending"
string="Send Reminder" type="object" string="Send Reminder" type="object"
@ -356,15 +357,15 @@
</page> </page>
<page string="History" groups="base.group_extended"> <page string="History" groups="base.group_extended">
<field name="id" select="1"/> <field name="id" select="1"/>
<field name="active" select="2"/> <field name="active"/>
<separator colspan="4" string="Dates"/> <separator colspan="4" string="Dates"/>
<field name="create_date"/> <field name="create_date"/>
<field colspan="4" name="log_ids" nolabel="1"> <field colspan="4" name="log_ids" nolabel="1">
<form string="Actions"> <form string="Actions">
<separator colspan="4" string="Action Information"/> <separator colspan="4" string="Action Information"/>
<field colspan="4" name="name"/> <field colspan="4" name="name"/>
<field name="date" select="2"/> <field name="date"/>
<field name="user_id" select="2"/> <field name="user_id"/>
</form> </form>
</field> </field>
</page> </page>
@ -485,11 +486,11 @@
<field colspan="4" name="name" select="1"/> <field colspan="4" name="name" select="1"/>
<field name="date" select="1"/> <field name="date" select="1"/>
<field name="user_id" select="1"/> <field name="user_id" select="1"/>
<field name="model_id" select="2"/> <field name="model_id"/>
<field name="res_id" select="2"/> <field name="res_id"/>
<field name="som" select="2"/> <field name="som"/>
<field name="canal_id" select="2"/> <field name="canal_id"/>
<field colspan="4" name="description" select="2"/> <field colspan="4" name="description"/>
</form> </form>
</field> </field>
</record> </record>
@ -554,9 +555,9 @@
<form string="Partner Segmentation Lines"> <form string="Partner Segmentation Lines">
<field colspan="4" name="name" select="1"/> <field colspan="4" name="name" select="1"/>
<group col="2" colspan="4"> <group col="2" colspan="4">
<field name="expr_name" select="2"/> <field name="expr_name"/>
<field name="expr_operator" select="2"/> <field name="expr_operator"/>
<field name="expr_value" select="2"/> <field name="expr_value"/>
</group> </group>
<newline/> <newline/>
<field name="operator"/> <field name="operator"/>
@ -574,7 +575,7 @@
<form string="Partner Segmentation"> <form string="Partner Segmentation">
<group col="6" colspan="4"> <group col="6" colspan="4">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="categ_id" select="2"/> <field name="categ_id"/>
<field name="exclusif"/> <field name="exclusif"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
@ -589,7 +590,7 @@
<field colspan="4" name="segmentation_line" widget="one2many_list" nolabel="1"/> <field colspan="4" name="segmentation_line" widget="one2many_list" nolabel="1"/>
</page> </page>
<page string="Description"> <page string="Description">
<field colspan="4" name="description" select="2" nolabel="1"/> <field colspan="4" name="description" nolabel="1"/>
</page> </page>
</notebook> </notebook>
<field name="state"/> <field name="state"/>
@ -639,6 +640,7 @@
</record> </record>
<menuitem action="crm_segmentation_tree-act" <menuitem action="crm_segmentation_tree-act"
id="menu_crm_segmentation-act" id="menu_crm_segmentation-act"
groups="base.group_extended"
parent="crm.menu_crm_configuration" /> parent="crm.menu_crm_configuration" />
<record model="ir.ui.view" id="view_users_form_simple_modif_inherited1"> <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">

57
addons/crm/report/crm_claim_report_view.xml
View File

@ -10,17 +10,17 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Claims"> <tree string="Claims">
<field name="name" /> <field name="name" />
<field name="month"/> <field name="month"/>
<field name="section_id" /> <field name="section_id" />
<field name="user_id" /> <field name="user_id" />
<field name="company_id" /> <field name="company_id" />
<field name="partner_id" /> <field name="partner_id" />
<field name="nbr" string="#Claim"/> <field name="nbr" string="#Claim"/>
<field name="delay_close"/> <field name="delay_close"/>
<field name="state" invisible="1"/> <field name="state" invisible="1"/>
<field name="stage_id" invisible="1"/> <field name="stage_id" invisible="1"/>
<field name="categ_id" invisible="1"/> <field name="categ_id" invisible="1"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -34,7 +34,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="nbr" position="after"> <field name="nbr" position="after">
<field name="delay_close"/> <field name="delay_close"/>
<field name="amount_revenue"/> <field name="amount_revenue"/>
<field name="amount_costs"/> <field name="amount_costs"/>
<field name="amount_revenue_prob"/> <field name="amount_revenue_prob"/>
@ -67,10 +67,10 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath <xpath
expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]' expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
position='after'> position='after'>
<filter string="Stage" icon="terp-sale" domain="[]" <filter string="Stage" icon="terp-sale" domain="[]"
context="{'group_by':'stage_id'}" /> context="{'group_by':'stage_id'}" />
</xpath> </xpath>
</field> </field>
</record> </record>
@ -81,29 +81,30 @@
<field name="name">Claims</field> <field name="name">Claims</field>
<field name="res_model">crm.claim.report</field> <field name="res_model">crm.claim.report</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,graph</field>
<field name="view_id" ref="view_report_crm_claim_tree"/> <field name="view_id" ref="view_report_crm_claim_tree"/>
<field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field> <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
<field name="search_view_id" ref="view_report_crm_claim_filter"/> <field name="search_view_id" ref="view_report_crm_claim_filter"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_report_crm_claim_tree"> <record model="ir.actions.act_window.view" id="action_report_crm_claim_tree">
<field name="sequence" eval="1"/> <field name="sequence" eval="1"/>
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="view_report_crm_claim_tree"/> <field name="view_id" ref="view_report_crm_claim_tree"/>
<field name="act_window_id" ref="action_report_crm_claim"/> <field name="act_window_id" ref="action_report_crm_claim"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_report_crm_claim_graph"> <record model="ir.actions.act_window.view" id="action_report_crm_claim_graph">
<field name="sequence" eval="2"/> <field name="sequence" eval="2"/>
<field name="view_mode">graph</field> <field name="view_mode">graph</field>
<field name="view_id" ref="view_report_crm_claim_graph"/> <field name="view_id" ref="view_report_crm_claim_graph"/>
<field name="act_window_id" ref="action_report_crm_claim"/> <field name="act_window_id" ref="action_report_crm_claim"/>
</record> </record>
<menuitem name="Claims" id="menu_report_crm_claim_tree" <menuitem name="Claims" id="menu_report_crm_claim_tree"
action="action_report_crm_claim" parent="base.next_id_64" /> groups="base.group_extended"
action="action_report_crm_claim" parent="base.next_id_64" />
</data> </data>

41
addons/crm/report/crm_fundraising_report_view.xml
View File

@ -9,14 +9,14 @@
<field name="model">crm.fundraising.report</field> <field name="model">crm.fundraising.report</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Fundraising"> <tree string="Fundraising">
<field name="name" /> <field name="name" />
<field name="month"/> <field name="month"/>
<field name="section_id" /> <field name="section_id" />
<field name="user_id" /> <field name="user_id" />
<field name="company_id" /> <field name="company_id" />
<field name="partner_id" /> <field name="partner_id" />
<field name="nbr" string="#Fundraising"/> <field name="nbr" string="#Fundraising"/>
<field name="amount_revenue" sum="Total Revenue"/> <field name="amount_revenue" sum="Total Revenue"/>
<field name="probability"/> <field name="probability"/>
<field name="amount_revenue_prob"/> <field name="amount_revenue_prob"/>
@ -36,7 +36,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="nbr" position="after"> <field name="nbr" position="after">
<field name="delay_close"/> <field name="delay_close"/>
<field name="amount_revenue"/> <field name="amount_revenue"/>
<field name="amount_revenue_prob"/> <field name="amount_revenue_prob"/>
<field name="probability"/> <field name="probability"/>
@ -85,23 +85,24 @@
</record> </record>
<record model="ir.actions.act_window.view" id="action_report_crm_fundrising_tree"> <record model="ir.actions.act_window.view" id="action_report_crm_fundrising_tree">
<field name="sequence" eval="1"/> <field name="sequence" eval="1"/>
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="view_report_crm_fundraising_tree"/> <field name="view_id" ref="view_report_crm_fundraising_tree"/>
<field name="act_window_id" ref="action_report_crm_fundraising"/> <field name="act_window_id" ref="action_report_crm_fundraising"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_report_crm_fundrising_graph"> <record model="ir.actions.act_window.view" id="action_report_crm_fundrising_graph">
<field name="sequence" eval="2"/> <field name="sequence" eval="2"/>
<field name="view_mode">graph</field> <field name="view_mode">graph</field>
<field name="view_id" ref="view_report_crm_fundraising_graph"/> <field name="view_id" ref="view_report_crm_fundraising_graph"/>
<field name="act_window_id" ref="action_report_crm_fundraising"/> <field name="act_window_id" ref="action_report_crm_fundraising"/>
</record> </record>
<menuitem name="Fundraising" <menuitem name="Fundraising"
action="action_report_crm_fundraising" action="action_report_crm_fundraising"
id="menu_report_crm_fundraising_tree" parent="base.next_id_64" /> groups="base.group_extended"
id="menu_report_crm_fundraising_tree" parent="base.next_id_64" />
</data> </data>
</openerp> </openerp>

139
addons/crm/report/crm_helpdesk_report_view.xml
View File

@ -10,18 +10,18 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Helpdesk"> <tree string="Helpdesk">
<field name="name" /> <field name="name" />
<field name="month"/> <field name="month"/>
<field name="section_id" /> <field name="section_id" />
<field name="user_id" /> <field name="user_id" />
<field name="company_id"/> <field name="company_id"/>
<field name="partner_id" /> <field name="partner_id" />
<field name="date_deadline" invisible="1"/> <field name="date_deadline" invisible="1"/>
<field name="priority" invisible="1"/> <field name="priority" invisible="1"/>
<field name="nbr" string="#Helpdesk" /> <field name="nbr" string="#Helpdesk" />
<field name="delay_close"/> <field name="delay_close"/>
<field name="state" invisible="1"/> <field name="state" invisible="1"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -34,7 +34,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="nbr" position="after"> <field name="nbr" position="after">
<field name="delay_close"/> <field name="delay_close"/>
<field name="amount_revenue"/> <field name="amount_revenue"/>
<field name="amount_revenue_prob"/> <field name="amount_revenue_prob"/>
<field name="probability"/> <field name="probability"/>
@ -59,46 +59,46 @@
<!-- Helpdesk report after Sales Services Search View --> <!-- Helpdesk report after Sales Services Search View -->
<record id="view_report_crm_helpdesk_filter" model="ir.ui.view"> <record id="view_report_crm_helpdesk_filter" model="ir.ui.view">
<field name="name">crm.helpdesk.report.select</field> <field name="name">crm.helpdesk.report.select</field>
<field name="model">crm.helpdesk.report</field> <field name="model">crm.helpdesk.report</field>
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search"> <search string="Search">
<group col="16" colspan="9"> <group col="16" colspan="9">
<filter string="This Year" icon="terp-hr" <filter string="This Year" icon="terp-hr"
domain="[('name','=',time.localtime()[0])]" domain="[('name','=',time.localtime()[0])]"
name="this_year" /> name="this_year" />
<filter string="This Month" icon="terp-hr" <filter string="This Month" icon="terp-hr"
domain="[('month','=',time.strftime('%%m'))]" domain="[('month','=',time.strftime('%%m'))]"
name="this_month" /> name="this_month" />
<separator orientation="vertical" /> <separator orientation="vertical" />
<filter string="Current" icon="terp-hr" <filter string="Current" icon="terp-hr"
domain="[('state','in',('open','draft'))]" /> domain="[('state','in',('open','draft'))]" />
<filter string="Won" icon="terp-hr" <filter string="Won" icon="terp-hr"
domain="[('state','=','done')]" /> domain="[('state','=','done')]" />
<filter string="Lost" icon="terp-hr" <filter string="Lost" icon="terp-hr"
domain="[('state','=','cancel')]" /> domain="[('state','=','cancel')]" />
<filter string="Deadline" icon="terp-hr" <filter string="Deadline" icon="terp-hr"
domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]" /> domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]" />
<separator orientation="vertical" /> <separator orientation="vertical" />
<field name="section_id" <field name="section_id"
widget="selection" widget="selection"
context="{'invisible_section': False}"> context="{'invisible_section': False}">
<filter icon="terp-crm" <filter icon="terp-crm"
context="{'invisible_section': False}" context="{'invisible_section': False}"
domain="[('section_id.user_id','=',uid)]" domain="[('section_id.user_id','=',uid)]"
help="My section" /> help="My section" />
</field> </field>
<field name="company_id" widget="selection"> <field name="company_id" widget="selection">
<filter icon="terp-crm" <filter icon="terp-crm"
context="{'invisible_section': False}" context="{'invisible_section': False}"
@ -111,24 +111,24 @@
<newline/> <newline/>
<group expand="1" string="Extended options..." colspan="4" col="5"> <group expand="1" string="Extended options..." colspan="4" col="5">
<filter icon="terp-sale" <filter icon="terp-sale"
string="Lowest" string="Lowest"
domain="[('priority','=','5')]"/> domain="[('priority','=','5')]"/>
<filter icon="terp-sale" <filter icon="terp-sale"
string="Low" string="Low"
domain="[('priority','=','4')]"/> domain="[('priority','=','4')]"/>
<filter icon="terp-sale" <filter icon="terp-sale"
string="Normal" string="Normal"
domain="[('priority','=','3')]"/> domain="[('priority','=','3')]"/>
<filter icon="terp-sale" <filter icon="terp-sale"
string="High" string="High"
domain="[('priority','=','2')]"/> domain="[('priority','=','2')]"/>
<filter icon="terp-sale" <filter icon="terp-sale"
string="Highest" string="Highest"
domain="[('priority','=','1')]"/> domain="[('priority','=','1')]"/>
</group> </group>
<newline/> <newline/>
@ -137,30 +137,30 @@
<group expand="1" string="Group By..." colspan="4" col="8"> <group expand="1" string="Group By..." colspan="4" col="8">
<filter string="User" icon="terp-sale" <filter string="User" icon="terp-sale"
domain="[]" context="{'group_by':'user_id'}" /> domain="[]" context="{'group_by':'user_id'}" />
<filter string="Company" icon="terp-sale" <filter string="Company" icon="terp-sale"
domain="[]" domain="[]"
context="{'group_by':'company_id'}" /> context="{'group_by':'company_id'}" />
<filter string="Section" icon="terp-sale" <filter string="Section" icon="terp-sale"
domain="[]" domain="[]"
context="{'group_by':'section_id'}" /> context="{'group_by':'section_id'}" />
<separator orientation="vertical" /> <separator orientation="vertical" />
<filter string="State" icon="terp-sale" <filter string="State" icon="terp-sale"
domain="[]" context="{'group_by':'state'}" /> domain="[]" context="{'group_by':'state'}" />
<filter string="Partner" icon="terp-sale" <filter string="Partner" icon="terp-sale"
domain="[]" domain="[]"
context="{'group_by':'partner_id'}" /> context="{'group_by':'partner_id'}" />
<separator orientation="vertical" /> <separator orientation="vertical" />
<filter string="Month" icon="terp-sale" <filter string="Month" icon="terp-sale"
domain="[]" context="{'group_by':'month'}" /> domain="[]" context="{'group_by':'month'}" />
<filter string="Year" icon="terp-sale" <filter string="Year" icon="terp-sale"
domain="[]" context="{'group_by':'name'}" /> domain="[]" context="{'group_by':'name'}" />
</group> </group>
</search> </search>
@ -179,22 +179,23 @@
<field name="search_view_id" ref="view_report_crm_helpdesk_filter"/> <field name="search_view_id" ref="view_report_crm_helpdesk_filter"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_tree"> <record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_tree">
<field name="sequence" eval="1"/> <field name="sequence" eval="1"/>
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="view_report_crm_helpdesk_tree"/> <field name="view_id" ref="view_report_crm_helpdesk_tree"/>
<field name="act_window_id" ref="action_report_crm_helpdesk"/> <field name="act_window_id" ref="action_report_crm_helpdesk"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_graph"> <record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_graph">
<field name="sequence" eval="2"/> <field name="sequence" eval="2"/>
<field name="view_mode">graph</field> <field name="view_mode">graph</field>
<field name="view_id" ref="view_report_crm_helpdesk_graph"/> <field name="view_id" ref="view_report_crm_helpdesk_graph"/>
<field name="act_window_id" ref="action_report_crm_helpdesk"/> <field name="act_window_id" ref="action_report_crm_helpdesk"/>
</record> </record>
<menuitem name="Helpdesk" action="action_report_crm_helpdesk" <menuitem name="Helpdesk" action="action_report_crm_helpdesk"
id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" /> groups="base.group_extended"
id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" />
</data> </data>
</openerp> </openerp>

2
addons/crm/wizard/crm_lead_to_opportunity.py
View File

@ -77,6 +77,7 @@ class crm_lead2opportunity(osv.osv_memory):
for this in self.browse(cr, uid, ids, context=context): for this in self.browse(cr, uid, ids, context=context):
new_opportunity_id = opp_obj.create(cr, uid, { new_opportunity_id = opp_obj.create(cr, uid, {
'name': this.name, 'name': this.name,
'referred': this.referred,
'planned_revenue': this.planned_revenue, 'planned_revenue': this.planned_revenue,
'probability': this.probability, 'probability': this.probability,
'partner_id': lead.partner_id and lead.partner_id.id or False , 'partner_id': lead.partner_id and lead.partner_id.id or False ,
@ -89,7 +90,6 @@ class crm_lead2opportunity(osv.osv_memory):
'phone': lead.phone, 'phone': lead.phone,
'email_from': lead.email_from 'email_from': lead.email_from
}) })
new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id) new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
vals = { vals = {
'partner_id': this.partner_id and this.partner_id.id or False, 'partner_id': this.partner_id and this.partner_id.id or False,

100
addons/crm/wizard/crm_lead_to_opportunity_view.xml
View File

@ -1,61 +1,63 @@
<openerp> <openerp>
<data> <data>
<!-- Lead to Opportunity view --> <!-- Lead to Opportunity view -->
<record id="view_crm_lead2opportunity_create" model="ir.ui.view"> <record id="view_crm_lead2opportunity_create" model="ir.ui.view">
<field name="name">crm.lead2opportunity.create</field> <field name="name">crm.lead2opportunity.create</field>
<field name="model">crm.lead2opportunity</field> <field name="model">crm.lead2opportunity</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Convert To Opportunity"> <form string="Convert To Opportunity">
<field name="name"/> <field name="name"/>
<field name="partner_id"/> <field name="partner_id"/>
<newline/> <newline/>
<field name="planned_revenue"/> <field name="planned_revenue"/>
<field name="probability"/> <field name="probability"/>
<group col="4" colspan="4"> <separator colspan="4"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <group col="4" colspan="4">
<button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/> <label string="" colspan="2"/>
</group> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
</form> <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/>
</field> </group>
</record> </form>
</field>
<!-- Lead to Opportunity action --> </record>
<record id="action_crm_lead2opportunity" model="ir.actions.act_window"> <!-- Lead to Opportunity action -->
<field name="name">Create Opportunity</field>
<field name="type">ir.actions.act_window</field> <record id="action_crm_lead2opportunity" model="ir.actions.act_window">
<field name="res_model">crm.lead2opportunity</field> <field name="name">Create Opportunity</field>
<field name="view_type">form</field> <field name="type">ir.actions.act_window</field>
<field name="view_mode">form</field> <field name="res_model">crm.lead2opportunity</field>
<field name="target">new</field> <field name="view_type">form</field>
</record> <field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="view_crm_lead2opportunity_partner" model="ir.ui.view"> <record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
<field name="name">crm.lead2opportunity.partner.form</field> <field name="name">crm.lead2opportunity.partner.form</field>
<field name="model">crm.lead2opportunity.partner</field> <field name="model">crm.lead2opportunity.partner</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Create a Partner"> <form string="Create a Partner">
<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/> <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
<label string="You may have to verify that this partner does not exist already." colspan="4"/> <label string="You may have to verify that this partner does not exist already." colspan="4"/>
<newline /> <newline />
<field name="action"/> <field name="action"/>
<group attrs="{'invisible':[('action','!=','exist')]}"> <group attrs="{'invisible':[('action','!=','exist')]}">
<field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/> <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
</group> </group>
<separator string="" colspan="4" /> <separator string="" colspan="4" />
<group col="4" colspan="4"> <group col="4" colspan="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button special="cancel" name="action_skip" string="_Skip" type="object" icon="gtk-goto-last"/> <button special="cancel" name="action_skip" string="_Skip" type="object" icon="gtk-goto-last"/>
<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/> <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
</data> </data>
</openerp> </openerp>

4
addons/crm_profiling/crm_profiling_view.xml
View File

@ -161,9 +161,9 @@
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="exclusif"/> <field name="exclusif"/>
<newline/> <newline/>
<field name="categ_id" select="2" colspan="2"/> <field name="categ_id" colspan="2"/>
<newline/> <newline/>
<field name="description" select="2" colspan="4"/> <field name="description" colspan="4"/>
<field name="state"/> <field name="state"/>
<group col="3" colspan="2"> <group col="3" colspan="2">
<button name="process_start" <button name="process_start"

6
addons/document/document_view.xml
View File

@ -68,7 +68,7 @@
<field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/> <field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
<field name="ressource_tree"/> <field name="ressource_tree"/>
<field name="resource_field"/> <field name="resource_field"/>
<field name="ressource_id" select="2" readonly="1"/> <field name="ressource_id" readonly="1"/>
<field name="ressource_parent_type_id"/> <field name="ressource_parent_type_id"/>
</page> </page>
<page string="Generated Files"> <page string="Generated Files">
@ -179,7 +179,7 @@
<field name="title" select="1"/> <field name="title" select="1"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="user_id"/> <field name="user_id"/>
<field name="parent_id" select="2"/> <field name="parent_id"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Attachment"> <page string="Attachment">
@ -190,7 +190,7 @@
</group> </group>
<group col="2" colspan="2"> <group col="2" colspan="2">
<separator string="Attached To" colspan="2"/> <separator string="Attached To" colspan="2"/>
<field name="res_model" select="2" readonly="1"/> <field name="res_model" readonly="1"/>
<field name="res_id" readonly="1"/> <field name="res_id" readonly="1"/>
</group> </group>
<separator string="Preview" colspan="4"/> <separator string="Preview" colspan="4"/>

5
addons/hr_expense/hr_expense.py
View File

@ -175,9 +175,8 @@ hr_expense_expense()
class product_product(osv.osv): class product_product(osv.osv):
_inherit = "product.product" _inherit = "product.product"
_columns = { _columns = {
'hr_expense_ok': fields.boolean('Can constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."), 'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
} }
product_product() product_product()
@ -234,4 +233,4 @@ class hr_expense_line(osv.osv):
hr_expense_line() hr_expense_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

6
addons/hr_holidays/hr_holidays_view.xml
View File

@ -282,10 +282,10 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Leave Type"> <form string="Leave Type">
<field colspan="4" name="name" select="1"/> <field colspan="4" name="name" select="1"/>
<field name="limit" select="2"/> <field name="limit"/>
<field name="active" select="2"/> <field name="active"/>
<field name="categ_id" select="1" widget="selection"/> <field name="categ_id" select="1" widget="selection"/>
<field name="color_name" select="2"/> <field name="color_name"/>
</form> </form>
</field> </field>
</record> </record>

6
addons/hr_timesheet/hr_timesheet_view.xml
View File

@ -27,7 +27,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Timesheet Lines"> <form string="Timesheet Lines">
<field colspan="4" name="name" select="2"/> <field colspan="4" name="name"/>
<field name="user_id" on_change="on_change_user_id(user_id)" required="1" select="1"/> <field name="user_id" on_change="on_change_user_id(user_id)" required="1" select="1"/>
<field name="date" select="1" on_change="on_change_date(date)"/> <field name="date" select="1" on_change="on_change_date(date)"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/> <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
@ -36,8 +36,8 @@
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/> <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/> <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/>
<field name="amount" select="2"/> <field name="amount"/>
<field name="general_account_id" select="2"/> <field name="general_account_id"/>
<field name="journal_id"/> <field name="journal_id"/>
</form> </form>
</field> </field>

2
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
View File

@ -193,7 +193,7 @@ class invoice_create(wizard.interface):
_create_form = """<?xml version="1.0"?> _create_form = """<?xml version="1.0"?>
<form string="Invoice on analytic entries"> <form string="Invoice on analytic entries">
<notebook> <notebook>
<page string="Invoicing Data"> <page string="Billing Data">
<separator string="Do you want to show details of work in invoice ?" colspan="4"/> <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
<field name="date"/> <field name="date"/>
<field name="time"/> <field name="time"/>

4
addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
View File

@ -144,7 +144,7 @@
<record id="process_transition_invoiceontimesheet0" model="process.transition"> <record id="process_transition_invoiceontimesheet0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Invoicing&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Billing&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;The invoice is created based on the timesheet.&quot;&quot;&quot;" name="note"/> <field eval="&quot;&quot;&quot;The invoice is created based on the timesheet.&quot;&quot;&quot;" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_invoiceonwork0"/> <field model="process.node" name="target_node_id" ref="process_node_invoiceonwork0"/>
<field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/> <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
@ -185,4 +185,4 @@
</record> </record>
</data> </data>
</openerp> </openerp>

6
addons/l10n_ch/account_invoice.xml
View File

@ -23,7 +23,7 @@
<field name="priority" eval="18"/> <field name="priority" eval="18"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="partner_bank" position="replace"> <field name="partner_bank" position="replace">
<field name="partner_bank" select="2" <field name="partner_bank"
domain="[('partner_id', '=', partner_id)]" domain="[('partner_id', '=', partner_id)]"
on_change="onchange_partner_bank(partner_bank)"/> on_change="onchange_partner_bank(partner_bank)"/>
</field> </field>
@ -36,10 +36,10 @@
<field name="inherit_id" ref="account.invoice_form"/> <field name="inherit_id" ref="account.invoice_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="partner_bank" position="replace"> <field name="partner_bank" position="replace">
<field name="partner_bank" select="2" <field name="partner_bank"
domain="[('partner_id.ref_companies', 'in', [company_id])]"/> domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
</field> </field>
</field> </field>
</record> </record>
</data> </data>
</openerp> </openerp>

24
addons/mrp/mrp_view.xml
View File

@ -323,14 +323,17 @@
id="menu_mrp_bom" id="menu_mrp_bom"
parent="menu_mrp_bom" parent="menu_mrp_bom"
sequence="50" />--> sequence="50" />-->
<menuitem action="mrp_bom_form_action" <menuitem
id="menu_mrp_bom_form_action" action="mrp_bom_form_action"
parent="menu_mrp_bom" id="menu_mrp_bom_form_action"
sequence="10"/> parent="menu_mrp_bom"
<menuitem action="mrp_bom_form_action2" sequence="10"/>
id="menu_mrp_bom_form_action2" <menuitem
parent="menu_mrp_bom" action="mrp_bom_form_action2"
sequence="20"/> id="menu_mrp_bom_form_action2"
groups="base.group_extended"
parent="menu_mrp_bom"
sequence="20"/>
<record id="action2" model="ir.actions.act_window"> <record id="action2" model="ir.actions.act_window">
<field name="name">Bill of Materials Structure</field> <field name="name">Bill of Materials Structure</field>
@ -1034,7 +1037,10 @@
<!-- Menu for Resource for MRP--> <!-- Menu for Resource for MRP-->
<menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="3"/> <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="3"/>
<menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root" sequence="2"/>
<menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root"
groups="base.group_extended"
sequence="2"/>
<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/> <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/> <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/> <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>

7
addons/mrp/report/mrp_report_view.xml
View File

@ -50,8 +50,11 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">graph,tree</field> <field name="view_mode">graph,tree</field>
</record> </record>
<menuitem id="next_id_77" name="Reporting" parent="base.menu_mrp_root" sequence="49"/> <menuitem id="next_id_77" name="Reporting"
<menuitem action="action_report_workcenter_load_tree" id="menu_report_workcenter_load" parent="next_id_77"/> parent="base.menu_mrp_root" sequence="49"/>
<menuitem action="action_report_workcenter_load_tree"
id="menu_report_workcenter_load" parent="next_id_77"
groups="base.group_extended"/>
<!-- stock.move compared to internal location src/dest --> <!-- stock.move compared to internal location src/dest -->

2
addons/mrp_operations/mrp_operations_view.xml
View File

@ -70,7 +70,7 @@
<separator string="Status" colspan="4"/> <separator string="Status" colspan="4"/>
<group colspan="8" col="8"> <group colspan="8" col="8">
<field name="state" select="2"/> <field name="state"/>
<button name="button_draft" string="Set Draft" states="cancel"/> <button name="button_draft" string="Set Draft" states="cancel"/>
<button name="button_start_working" string="Start" states="draft"/> <button name="button_start_working" string="Start" states="draft"/>
<button name="button_resume" string="Resume" states="pause"/> <button name="button_resume" string="Resume" states="pause"/>

12
addons/mrp_repair/mrp_repair_view.xml
View File

@ -13,11 +13,11 @@
<field name="product_id" select="1" on_change="onchange_product_id(product_id)"/> <field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
<field name="deliver_bool"/> <field name="deliver_bool"/>
<newline/> <newline/>
<field name="prodlot_id" select="2" on_change="onchange_lot_id(prodlot_id,product_id)"/> <field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)"/>
<field name="move_id" on_change="onchange_move_id(product_id, move_id)"/> <field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
<field name="repaired"/> <field name="repaired"/>
<newline/> <newline/>
<field name="partner_id" select="2" on_change="onchange_partner_id(partner_id,address_id)"/> <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)"/>
<field name="address_id" attrs="{'readonly':[('deliver_bool','=', False)]}"/> <field name="address_id" attrs="{'readonly':[('deliver_bool','=', False)]}"/>
<field name="invoiced"/> <field name="invoiced"/>
</group> </group>
@ -78,7 +78,7 @@
</group> </group>
<newline/> <newline/>
<group col="13" colspan="4"> <group col="13" colspan="4">
<field name="state" select="2"/> <field name="state"/>
<button name="repair_confirm" states="draft" string="Confirm Repair"/> <button name="repair_confirm" states="draft" string="Confirm Repair"/>
<button name="repair_ready" states="confirmed" string="Start Repair"/> <button name="repair_ready" states="confirmed" string="Start Repair"/>
<button name="action_repair_start" states="ready" string="Start Repair"/> <button name="action_repair_start" states="ready" string="Start Repair"/>
@ -158,11 +158,11 @@
<tree string="Repairs order"> <tree string="Repairs order">
<field name="name" select="1" /> <field name="name" select="1" />
<field name="product_id" select="1" /> <field name="product_id" select="1" />
<field name="prodlot_id" select="2"/> <field name="prodlot_id"/>
<field name="partner_id" select="2"/> <field name="partner_id"/>
<field name="address_id"/> <field name="address_id"/>
<field name="location_id"/> <field name="location_id"/>
<field name="state" select="2"/> <field name="state"/>
<field name="move_id"/> <field name="move_id"/>
<field name="location_dest_id"/> <field name="location_dest_id"/>
<field name="guarantee_limit"/> <field name="guarantee_limit"/>

94
addons/point_of_sale/pos_view.xml
View File

@ -50,7 +50,7 @@
<group colspan="4" col="9" groups="base.group_extended"> <group colspan="4" col="9" groups="base.group_extended">
<separator colspan="4" string="Validation of the Sale"/> <separator colspan="4" string="Validation of the Sale"/>
<newline/> <newline/>
<field name="state_2" select="2" /> <field name="state_2" />
<button name="button_validate" <button name="button_validate"
string="Accept" string="Accept"
type="object" type="object"
@ -257,8 +257,8 @@ invoiced
<form string="POS Order line"> <form string="POS Order line">
<field name="product_id" select="1"/> <field name="product_id" select="1"/>
<field name="qty" select="1"/> <field name="qty" select="1"/>
<field name="discount" select="2"/> <field name="discount" />
<field name="price_unit" select="2"/> <field name="price_unit" />
<field name="create_date" select="1"/> <field name="create_date" select="1"/>
</form> </form>
</field> </field>
@ -306,9 +306,9 @@ invoiced
<field name="journal_id" select="1"/> <field name="journal_id" select="1"/>
<field name="jl_id" select="1"/> <field name="jl_id" select="1"/>
<field name="date_create" select="1" widget="date"/> <field name="date_create" select="1" widget="date"/>
<field name="no_trans" select="2"/> <field name="no_trans"/>
<field name="amount" select="2"/> <field name="amount"/>
<field name="invoice_id" select="2"/> <field name="invoice_id"/>
</form> </form>
</field> </field>
</record> </record>
@ -394,9 +394,9 @@ invoiced
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="POS "> <form string="POS ">
<field name="date_order" select="1" widget="date"/> <field name="date_order" select="1" widget="date"/>
<field name="qty" select="2"/> <field name="qty"/>
<field name="amount" select="2"/> <field name="amount"/>
<field name="user_id" select="2"/> <field name="user_id"/>
</form> </form>
</field> </field>
</record> </record>
@ -409,9 +409,9 @@ invoiced
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="POS"> <tree string="POS">
<field name="date_order" select="1" widget="date"/> <field name="date_order" select="1" widget="date"/>
<field name="qty" select="2"/> <field name="qty"/>
<field name="amount" select="2"/> <field name="amount"/>
<field name="user_id" select="2"/> <field name="user_id"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -423,7 +423,7 @@ invoiced
<field eval="2" name="priority"/> <field eval="2" name="priority"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<calendar color="user_id" date_start="date_order" string="POS Report"> <calendar color="user_id" date_start="date_order" string="POS Report">
<field name="qty" select="2"/> <field name="qty"/>
<field name="amount" /> <field name="amount" />
</calendar> </calendar>
</field> </field>
@ -460,9 +460,9 @@ invoiced
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="POS "> <form string="POS ">
<field name="date_order" select="1" widget="date"/> <field name="date_order" select="1" widget="date"/>
<field name="qty" select="2"/> <field name="qty"/>
<field name="amount" select="2"/> <field name="amount"/>
<field name="user_id" select="2"/> <field name="user_id"/>
</form> </form>
</field> </field>
</record> </record>
@ -475,9 +475,9 @@ invoiced
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="POS"> <tree string="POS">
<field name="date_order" select="1" widget="date"/> <field name="date_order" select="1" widget="date"/>
<field name="qty" select="2"/> <field name="qty"/>
<field name="amount" select="2"/> <field name="amount"/>
<field name="user_id" select="2"/> <field name="user_id"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -489,7 +489,7 @@ invoiced
<field eval="2" name="priority"/> <field eval="2" name="priority"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<calendar color="user_id" date_start="date_order" string="POS Report"> <calendar color="user_id" date_start="date_order" string="POS Report">
<field name="qty" select="2"/> <field name="qty"/>
<field name="amount" /> <field name="amount" />
</calendar> </calendar>
</field> </field>
@ -525,12 +525,12 @@ invoiced
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="POS "> <form string="POS ">
<field name="user_id" select="2"/> <field name="user_id"/>
<field name="product_name" select="2"/> <field name="product_name"/>
<field name="date_order" select="1" widget="date"/> <field name="date_order" select="1" widget="date"/>
<field name="qty" select="2"/> <field name="qty"/>
<field name="net_margin_per_qty" select="2"/> <field name="net_margin_per_qty"/>
<field name="total" select="2"/> <field name="total"/>
</form> </form>
</field> </field>
</record> </record>
@ -542,12 +542,12 @@ invoiced
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="POS"> <tree string="POS">
<field name="user_id" select="2"/> <field name="user_id"/>
<field name="product_name" select="2"/> <field name="product_name"/>
<field name="date_order" select="1" widget="date"/> <field name="date_order" select="1" widget="date"/>
<field name="qty" select="2"/> <field name="qty"/>
<field name="net_margin_per_qty" select="2"/> <field name="net_margin_per_qty"/>
<field name="total" select="2"/> <field name="total"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -559,7 +559,7 @@ invoiced
<field eval="2" name="priority"/> <field eval="2" name="priority"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<calendar color="user_id" date_start="date_order" string="Sales by User Margin"> <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
<field name="product_name" select="2"/> <field name="product_name"/>
<field name="total" /> <field name="total" />
</calendar> </calendar>
</field> </field>
@ -592,12 +592,12 @@ invoiced
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="POS "> <form string="POS ">
<field name="user_id" select="2"/> <field name="user_id"/>
<field name="product_name" select="2"/> <field name="product_name"/>
<field name="date_order" select="1" widget="date"/> <field name="date_order" select="1" widget="date"/>
<field name="qty" select="2"/> <field name="qty"/>
<field name="net_margin_per_qty" select="2"/> <field name="net_margin_per_qty"/>
<field name="total" select="2"/> <field name="total"/>
</form> </form>
</field> </field>
</record> </record>
@ -609,12 +609,12 @@ invoiced
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="POS"> <tree string="POS">
<field name="user_id" select="2"/> <field name="user_id"/>
<field name="product_name" select="2"/> <field name="product_name"/>
<field name="date_order" select="1" widget="date"/> <field name="date_order" select="1" widget="date"/>
<field name="qty" select="2"/> <field name="qty"/>
<field name="net_margin_per_qty" select="2"/> <field name="net_margin_per_qty"/>
<field name="total" select="2"/> <field name="total"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -626,7 +626,7 @@ invoiced
<field eval="2" name="priority"/> <field eval="2" name="priority"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<calendar color="user_id" date_start="date_order" string="Sales by User Margin"> <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
<field name="product_name" select="2"/> <field name="product_name"/>
<field name="total" /> <field name="total" />
</calendar> </calendar>
</field> </field>
@ -677,7 +677,7 @@ invoiced
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Contact Mode"> <form string="Contact Mode">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="active" select="2"/> <field name="active"/>
</form> </form>
</field> </field>
</record> </record>
@ -741,12 +741,12 @@ invoiced
<group colspan="4" col="2"> <group colspan="4" col="2">
<separator string="Product Description" colspan="4"/> <separator string="Product Description" colspan="4"/>
<field name="name" select="1" /> <field name="name" select="1" />
<field groups="base.group_extended" name="variants" select="2" /> <field groups="base.group_extended" name="variants" />
</group> </group>
<group colspan="1" col="2"> <group colspan="1" col="2">
<separator string="Codes" colspan="2"/> <separator string="Codes" colspan="2"/>
<field name="default_code" select="1"/> <field name="default_code" select="1"/>
<field groups="base.group_extended" name="ean13" select="2"/> <field groups="base.group_extended" name="ean13"/>
</group> </group>
</group> </group>
@ -756,7 +756,7 @@ invoiced
<separator string="Product Type" colspan="2"/> <separator string="Product Type" colspan="2"/>
<field name="categ_id" select="1"/> <field name="categ_id" select="1"/>
<field name="property_account_income" select="1" string="Account" required="1"/> <field name="property_account_income" select="1" string="Account" required="1"/>
<field name="type" select="2"/> <field name="type"/>
</group> </group>
<group colspan="2" col="2" name="Miscelleanous"> <group colspan="2" col="2" name="Miscelleanous">
<separator string="Miscelleanous" colspan="2"/> <separator string="Miscelleanous" colspan="2"/>
@ -764,7 +764,7 @@ invoiced
<field name="expense_pdt"/> <field name="expense_pdt"/>
<field name="am_out"/> <field name="am_out"/>
<field name="disc_controle"/> <field name="disc_controle"/>
<field name="company_id" select="2" groups="base.group_extended"/> <field name="company_id" groups="base.group_extended"/>
</group> </group>
<group colspan="2" col="2" name="Prices"> <group colspan="2" col="2" name="Prices">
<separator string="Prices" colspan="2"/> <separator string="Prices" colspan="2"/>

6
addons/point_of_sale/statement_view.xml
View File

@ -102,7 +102,7 @@
</page> </page>
</notebook> </notebook>
<group col="7" colspan="4"> <group col="7" colspan="4">
<field name="state" select="2" colspan="4"/> <field name="state" colspan="4"/>
<field name="total_entry_encoding"/> <field name="total_entry_encoding"/>
</group> </group>
<group colspan="4"> <group colspan="4">
@ -165,7 +165,7 @@
</page> </page>
</notebook> </notebook>
<group col="7" colspan="4"> <group col="7" colspan="4">
<field name="state" select="2" colspan="4"/> <field name="state" colspan="4"/>
<field name="total_entry_encoding"/> <field name="total_entry_encoding"/>
</group> </group>
<group colspan="4"> <group colspan="4">
@ -294,7 +294,7 @@
</page> </page>
</notebook> </notebook>
<group col="7" colspan="4"> <group col="7" colspan="4">
<field name="state" select="2" colspan="4"/> <field name="state" colspan="4"/>
<field name="total_entry_encoding"/> <field name="total_entry_encoding"/>
</group> </group>
<group colspan="4"> <group colspan="4">

20
addons/process/process_view.xml
View File

@ -16,7 +16,7 @@
<form string="Process"> <form string="Process">
<group colspan="4" string="Details"> <group colspan="4" string="Details">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="active" select="2"/> <field name="active"/>
<field name="model_id" select="1"/> <field name="model_id" select="1"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
@ -35,7 +35,7 @@
<field name="process_id" readonly="1" required="0"/> <!-- used by transition_out --> <field name="process_id" readonly="1" required="0"/> <!-- used by transition_out -->
<newline/> <newline/>
<field name="model_id" select="1"/> <field name="model_id" select="1"/>
<field name="menu_id" select="2"/> <field name="menu_id"/>
<newline/> <newline/>
<field name="kind" select="1"/> <field name="kind" select="1"/>
<field name="help_url" widget="url"/> <field name="help_url" widget="url"/>
@ -68,7 +68,7 @@
<newline/> <newline/>
<field name="state"/> <field name="state"/>
<field name="action"/> <field name="action"/>
</form> </form>
</field> </field>
</page> </page>
<page string="Roles Required"> <page string="Roles Required">
@ -145,8 +145,8 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Process Nodes"> <tree string="Process Nodes">
<field name="name"/> <field name="name"/>
<field name="process_id" select="1"/> <field name="process_id" select="1"/>
<field name="model_id" select="1"/> <field name="model_id" select="1"/>
<field name="kind" select="1"/> <field name="kind" select="1"/>
<field name="flow_start"/> <field name="flow_start"/>
@ -162,11 +162,11 @@
<form string="Process Node"> <form string="Process Node">
<group colspan="4" string="Details"> <group colspan="4" string="Details">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="flow_start"/> <field name="flow_start"/>
<field name="process_id"/> <field name="process_id"/>
<newline/> <newline/>
<field name="model_id" select="1"/> <field name="model_id" select="1"/>
<field name="menu_id" select="2"/> <field name="menu_id"/>
<newline/> <newline/>
<field name="kind" select="1"/> <field name="kind" select="1"/>
<field name="help_url" widget="url"/> <field name="help_url" widget="url"/>
@ -199,7 +199,7 @@
<newline/> <newline/>
<field name="state"/> <field name="state"/>
<field name="action"/> <field name="action"/>
</form> </form>
</field> </field>
</page> </page>
<page string="Roles Required"> <page string="Roles Required">
@ -234,7 +234,7 @@
<field name="note" nolabel="1" colspan="4"/> <field name="note" nolabel="1" colspan="4"/>
</page> </page>
</notebook> </notebook>
</form> </form>
</field> </field>
</record> </record>

4
addons/product/pricelist_view.xml
View File

@ -14,7 +14,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Pricelist Version"> <form string="Pricelist Version">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="active" select="2"/> <field name="active"/>
<field colspan="4" name="pricelist_id" select="1"/> <field colspan="4" name="pricelist_id" select="1"/>
<field name="date_start" select="1"/> <field name="date_start" select="1"/>
<field name="date_end" select="1"/> <field name="date_end" select="1"/>
@ -127,7 +127,7 @@
<field colspan="4" name="version_id" nolabel="1"> <field colspan="4" name="version_id" nolabel="1">
<form string="Pricelist Version"> <form string="Pricelist Version">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="active" select="2"/> <field name="active"/>
<field name="date_start" select="1"/> <field name="date_start" select="1"/>
<field name="date_end" select="1"/> <field name="date_end" select="1"/>
<field colspan="4" name="items_id" nolabel="1" widget="one2many_list"/> <field colspan="4" name="items_id" nolabel="1" widget="one2many_list"/>

4
addons/product/product.py
View File

@ -271,7 +271,7 @@ class product_template(osv.osv):
'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True, 'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True,
help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."), help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
'warranty': fields.float('Warranty (months)'), 'warranty': fields.float('Warranty (months)'),
'sale_ok': fields.boolean('Can be sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."), 'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."), 'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."), 'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."),
'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="Default Unit of Measure used for all stock operation."), 'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="Default Unit of Measure used for all stock operation."),
@ -648,7 +648,7 @@ class product_supplierinfo(osv.osv):
'name' : fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade', help="Supplier of this product"), 'name' : fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade', help="Supplier of this product"),
'product_name': fields.char('Partner Product Name', size=128, help="This partner's product name will be used when printing a request for quotation. Keep empty to use the internal one."), 'product_name': fields.char('Partner Product Name', size=128, help="This partner's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
'product_code': fields.char('Partner Product Code', size=64, help="This partner's product code will be used when printing a request for quotation. Keep empty to use the internal one."), 'product_code': fields.char('Partner Product Code', size=64, help="This partner's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
'sequence' : fields.integer('Priority', help="Assigns the priority to the list of product supplier."), 'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
'qty' : fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the default unit of measure."), 'qty' : fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the default unit of measure."),
'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True), 'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
'delay' : fields.integer('Delivery Lead Time', required=True, help="Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."), 'delay' : fields.integer('Delivery Lead Time', required=True, help="Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."),

48
addons/product/product_view.xml
View File

@ -42,7 +42,7 @@
<tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')" string="Products"> <tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')" string="Products">
<field name="default_code"/> <field name="default_code"/>
<field name="name"/> <field name="name"/>
<field name="categ_id" /> <field name="categ_id" invisible="1"/>
<field name="variants" groups="product.group_product_variant"/> <field name="variants" groups="product.group_product_variant"/>
<field name="uom_id"/> <field name="uom_id"/>
<field name="type"/> <field name="type"/>
@ -66,18 +66,18 @@
<group colspan="4" col="2"> <group colspan="4" col="2">
<separator string="Product Description" colspan="4"/> <separator string="Product Description" colspan="4"/>
<field name="name" select="1" /> <field name="name" select="1" />
<field groups="product.group_product_variant" name="variants" select="2" /> <field groups="product.group_product_variant" name="variants" />
</group> </group>
<group colspan="1" col="2"> <group colspan="1" col="2">
<separator string="Codes" colspan="2"/> <separator string="Codes" colspan="2"/>
<field name="default_code" select="1"/> <field name="default_code" select="1"/>
<field groups="base.group_extended" name="ean13" select="2"/> <field groups="base.group_extended" name="ean13"/>
</group> </group>
<group colspan="1" col="2"> <group colspan="1" col="2">
<separator string="Product Characteristics" colspan="2"/> <separator string="Product Characteristics" colspan="2"/>
<field name="sale_ok" select="2"/> <field name="sale_ok"/>
<field name="purchase_ok" select="2"/> <field name="purchase_ok"/>
<field groups="base.group_extended" name="rental" select="2"/> <field groups="base.group_extended" name="rental"/>
</group> </group>
</group> </group>
@ -85,7 +85,7 @@
<page string="Information"> <page string="Information">
<group colspan="2" col="2"> <group colspan="2" col="2">
<separator string="Procurement" colspan="2"/> <separator string="Procurement" colspan="2"/>
<field name="type" select="2"/> <field name="type"/>
<field name="procure_method"/> <field name="procure_method"/>
<field name="supply_method"/> <field name="supply_method"/>
</group> </group>
@ -100,8 +100,8 @@
<group colspan="2" col="2" name="status"> <group colspan="2" col="2" name="status">
<separator string="Status" colspan="2"/> <separator string="Status" colspan="2"/>
<field name="categ_id" select="1"/> <field name="categ_id" select="1"/>
<field name="state" select="2"/> <field name="state"/>
<field groups="base.group_extended" name="product_manager" select="2"/> <field groups="base.group_extended" name="product_manager"/>
</group> </group>
<group colspan="2" col="2" name="uom"> <group colspan="2" col="2" name="uom">
@ -133,9 +133,9 @@
</group> </group>
<group colspan="2" col="2" name="misc"> <group colspan="2" col="2" name="misc">
<separator string="Miscellaneous" colspan="2"/> <separator string="Miscellaneous" colspan="2" groups="base.group_extended"/>
<field name="active" select="2"/> <field name="active"/>
<field name="company_id" select="2" groups="base.group_multi_company" widget="selection"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group> </group>
</page> </page>
@ -163,7 +163,7 @@
<field colspan="4" name="packaging" nolabel="1"> <field colspan="4" name="packaging" nolabel="1">
<form string="Packaging"> <form string="Packaging">
<field name="ean" select="1"/> <field name="ean" select="1"/>
<field name="sequence"/> <field name="sequence" invisible="1"/>
<newline/> <newline/>
<field name="qty" select="1"/> <field name="qty" select="1"/>
<field name="ul"/> <field name="ul"/>
@ -215,7 +215,7 @@
<form string="Product Categories"> <form string="Product Categories">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="parent_id"/> <field name="parent_id"/>
<field name="sequence"/> <field name="sequence" invisible="1"/>
<field name="type"/> <field name="type"/>
<newline/> <newline/>
</form> </form>
@ -383,7 +383,7 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Packaging"> <tree string="Packaging">
<field name="sequence"/> <field name="sequence" invisible="1"/>
<field name="ean"/> <field name="ean"/>
<field name="qty"/> <field name="qty"/>
<field name="ul"/> <field name="ul"/>
@ -400,7 +400,7 @@
<field name="product_id" select="1"/> <field name="product_id" select="1"/>
<newline/> <newline/>
<field name="ean" select="1"/> <field name="ean" select="1"/>
<field name="sequence"/> <field name="sequence" invisible="1"/>
<newline/> <newline/>
<field name="qty" select="1"/> <field name="qty" select="1"/>
<field name="ul"/> <field name="ul"/>
@ -426,7 +426,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Supplier Information"> <form string="Supplier Information">
<field name="name"/> <field name="name"/>
<field name="sequence"/> <field name="sequence" invisible="1"/>
<field name="product_name" groups="base.group_extended"/> <field name="product_name" groups="base.group_extended"/>
<field name="product_code" groups="base.group_extended"/> <field name="product_code" groups="base.group_extended"/>
<field name="delay"/> <field name="delay"/>
@ -451,7 +451,7 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Supplier Information"> <tree string="Supplier Information">
<field name="sequence" string="Seq"/> <field name="sequence" string="Seq" invisible="1"/>
<field name="name"/> <field name="name"/>
<field name="delay"/> <field name="delay"/>
<field name="qty"/> <field name="qty"/>
@ -519,15 +519,15 @@
</group> </group>
<group colspan="2" col="2"> <group colspan="2" col="2">
<separator string="Product Type" colspan="2"/> <separator string="Product Type" colspan="2"/>
<field name="sale_ok" select="2"/> <field name="sale_ok"/>
<field name="purchase_ok" select="2"/> <field name="purchase_ok"/>
<field groups="base.group_extended" name="rental" select="2"/> <field groups="base.group_extended" name="rental"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Information"> <page string="Information">
<group colspan="2" col="2"> <group colspan="2" col="2">
<separator string="Procurement" colspan="2"/> <separator string="Procurement" colspan="2"/>
<field name="type" select="2"/> <field name="type"/>
<field name="procure_method"/> <field name="procure_method"/>
<field name="supply_method"/> <field name="supply_method"/>
</group> </group>
@ -542,8 +542,8 @@
<group colspan="2" col="2" name="status"> <group colspan="2" col="2" name="status">
<separator string="Status" colspan="2"/> <separator string="Status" colspan="2"/>
<field name="categ_id" select="1"/> <field name="categ_id" select="1"/>
<field name="state" select="2"/> <field name="state"/>
<field groups="base.group_extended" name="product_manager" select="2"/> <field groups="base.group_extended" name="product_manager"/>
</group> </group>
<group colspan="2" col="2" name="uom"> <group colspan="2" col="2" name="uom">

16
addons/project/project_view.xml
View File

@ -25,7 +25,7 @@
<group col="2" colspan="2"> <group col="2" colspan="2">
<separator colspan="2" string="Scheduling"/> <separator colspan="2" string="Scheduling"/>
<field name="priority"/> <field name="priority"/>
<field name="active" select="2"/> <field name="active"/>
</group> </group>
<group col="2" colspan="2"> <group col="2" colspan="2">
<separator colspan="2" string="Performance"/> <separator colspan="2" string="Performance"/>
@ -57,7 +57,7 @@
</page> </page>
<page groups="base.group_extended" string="Partner Info"> <page groups="base.group_extended" string="Partner Info">
<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/> <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
<field domain="[('partner_id','=',partner_id)]" name="contact_id" select="2"/> <field domain="[('partner_id','=',partner_id)]" name="contact_id"/>
<field name="warn_customer"/> <field name="warn_customer"/>
<newline/> <newline/>
<separator colspan="2" string="Mail Header"/> <separator colspan="2" string="Mail Header"/>
@ -234,7 +234,7 @@
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="project_id" required="1" select="1" domain="['|',('user_id','=',uid),('members','=',uid)]"/> <field name="project_id" required="1" select="1" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
<field name="total_hours" widget="float_time"/> <field name="total_hours" widget="float_time"/>
<field name="date_deadline" select="2"/> <field name="date_deadline"/>
<field name="user_id" select="1"/> <field name="user_id" select="1"/>
<field name="progress" widget="progressbar"/> <field name="progress" widget="progressbar"/>
</group> </group>
@ -246,7 +246,7 @@
widget="float_time" widget="float_time"
attrs="{'readonly':[('state','!=','draft')]}" attrs="{'readonly':[('state','!=','draft')]}"
on_change="onchange_planned(planned_hours, effective_hours)"/> on_change="onchange_planned(planned_hours, effective_hours)"/>
<field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/> <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
<button name="%(action_config_compute_remaining)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/> <button name="%(action_config_compute_remaining)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
</group> </group>
<group col="2" colspan="2"> <group col="2" colspan="2">
@ -254,7 +254,7 @@
<field name="effective_hours" widget="float_time"/> <field name="effective_hours" widget="float_time"/>
</group> </group>
<field colspan="4" name="description" nolabel="1" select="2" attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/> <field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
<field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}"> <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}">
<tree string="Task Work" editable="top"> <tree string="Task Work" editable="top">
<field name="name" /> <field name="name" />
@ -304,14 +304,14 @@
<field name="date_end"/> <field name="date_end"/>
</group> </group>
<separator string="Miscelleanous" colspan="4"/> <separator string="Miscelleanous" colspan="4"/>
<field name="partner_id" select="2"/> <field name="partner_id"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/> <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
<group col="4" colspan="2"> <group col="4" colspan="2">
<field name="type" widget="selection" /> <field name="type" widget="selection" />
<button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/> <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
<button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/> <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
</group> </group>
<field name="active" select="2"/> <field name="active"/>
<separator colspan="4" string="Notes"/> <separator colspan="4" string="Notes"/>
<field colspan="4" name="notes" nolabel="1"/> <field colspan="4" name="notes" nolabel="1"/>
</page> </page>
@ -571,7 +571,7 @@
<field name="subject" select="1"/> <field name="subject" select="1"/>
<field name="project_id"/> <field name="project_id"/>
<field name="user_id" select="1"/> <field name="user_id" select="1"/>
<field name="date" select="2"/> <field name="date"/>
</group> </group>
<separator string="Description" colspan="4"/> <separator string="Description" colspan="4"/>
<field name="description" nolabel="1" colspan="4"/> <field name="description" nolabel="1" colspan="4"/>

2
addons/project_gtd/project_gtd_view.xml
View File

@ -90,7 +90,7 @@
<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">
<field name="progress" position="after"> <field name="progress" position="after">
<field name="context_id" select="2" widget="selection" groups="project_gtd.group_project_getting"/> <field name="context_id" widget="selection" groups="project_gtd.group_project_getting"/>
<field name="timebox_id" select="1" groups="project_gtd.group_project_getting"/> <field name="timebox_id" select="1" groups="project_gtd.group_project_getting"/>
</field> </field>
</field> </field>

11
addons/sale/sale_view.xml
View File

@ -352,8 +352,7 @@
<field name="product_id"/> <field name="product_id"/>
<field name="product_uom_qty" string="Qty"/> <field name="product_uom_qty" string="Qty"/>
<field name="product_uom" string="UoM"/> <field name="product_uom" string="UoM"/>
<field name="discount"/> <field name="salesman_id"/>
<field name="price_unit"/>
<field name="price_net"/> <field name="price_net"/>
<field name="price_subtotal"/> <field name="price_subtotal"/>
<field name="th_weight"/> <field name="th_weight"/>
@ -432,6 +431,7 @@
<group expand="context.get('report',False)" string="Group By..." colspan="9" col="8"> <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
<filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/> <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
<filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/> <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
<filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'salesman_id'}"/>
<filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/> <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
</group> </group>
</search> </search>
@ -447,6 +447,7 @@
<group> <group>
<filter icon="terp-purchase" string="Shipped" <filter icon="terp-purchase" string="Shipped"
domain="[('state','=','done')]" domain="[('state','=','done')]"
name="unshipped"
separator="1" /> separator="1" />
<filter icon="terp-purchase" string="Uninvoiced" name="uninvoiced" <filter icon="terp-purchase" string="Uninvoiced" name="uninvoiced"
domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
@ -468,12 +469,12 @@
</record> </record>
<record id="action_order_line_tree2" model="ir.actions.act_window"> <record id="action_order_line_tree2" model="ir.actions.act_window">
<field name="name">Uninvoiced Lines</field> <field name="name">Lines to Invoice</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order.line</field> <field name="res_model">sale.order.line</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="context">{"search_default_uninvoiced":1}</field> <field name="context">{"search_default_uninvoiced":1,"search_default_unshipped":1}</field>
<field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" /> <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
<field name="filter" eval="True"/> <field name="filter" eval="True"/>
</record> </record>
@ -492,7 +493,7 @@
<act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/> <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/>
<menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="6"/> <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="6"/>
<menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/> <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
<!-- configartion view --> <!-- configartion view -->

22
addons/smtpclient/smtpclient_view.xml
View File

@ -84,16 +84,16 @@
<separator string="Server Information" <separator string="Server Information"
colspan="4" /> colspan="4" />
<field name="auth_type" on_change="change_servertype(auth_type)"/> <field name="auth_type" on_change="change_servertype(auth_type)"/>
<field name="server" select="2" /> <field name="server" />
<field name="ssl" select="2" /> <field name="ssl" />
<field name="port" select="2" /> <field name="port" />
<separator string="User Information" <separator string="User Information"
colspan="4" /> colspan="4" />
<field name="email" select="1" <field name="email" select="1"
on_change="change_email(email)"/> on_change="change_email(email)"/>
<field name="from_email" select="1"/> <field name="from_email" select="1"/>
<field name="auth" select="2"/> <field name="auth"/>
<newline/> <newline/>
<field name="user" select="1" attrs="{'required': [('auth_type','in',['gmail','yahoo'])]}"/> <field name="user" select="1" attrs="{'required': [('auth_type','in',['gmail','yahoo'])]}"/>
<field name="password" password="True" attrs="{'required': [('auth_type','in',['gmail','yahoo'])]}"/> <field name="password" password="True" attrs="{'required': [('auth_type','in',['gmail','yahoo'])]}"/>
@ -102,9 +102,9 @@
<separator string="Other Information" <separator string="Other Information"
colspan="4" /> colspan="4" />
<field name="type" select="1" /> <field name="type" select="1" />
<field name="active" select="2" /> <field name="active" />
<field name="delete_queue" select="2" /> <field name="delete_queue" />
<field name="delete_queue_period" select="2" attrs="{'readonly':[('delete_queue','not in',['content','all'])]}"/> <field name="delete_queue_period" attrs="{'readonly':[('delete_queue','not in',['content','all'])]}"/>
<separator string="Server Information" colspan="4"/> <separator string="Server Information" colspan="4"/>
<group col="3" colspan="4"> <group col="3" colspan="4">
@ -131,12 +131,12 @@
</page> </page>
<page string="Messages"> <page string="Messages">
<separator string="Verification Message" colspan="4" /> <separator string="Verification Message" colspan="4" />
<field name="verify_email" select="2" colspan="4" nolabel="1" /> <field name="verify_email" colspan="4" nolabel="1" />
<label string="__code__ for Verification Code" /> <label string="__code__ for Verification Code" />
<separator string="Test Message" colspan="4" /> <separator string="Test Message" colspan="4" />
<field name="test_email" select="2" colspan="4" nolabel="1" /> <field name="test_email" colspan="4" nolabel="1" />
<separator string="Message" colspan="4" /> <separator string="Message" colspan="4" />
<field name="body" select="2" colspan="4" nolabel="1" /> <field name="body" colspan="4" nolabel="1" />
<label string="__name__ for Customer Name" /> <label string="__name__ for Customer Name" />
<label string="__number__ for Invoice / Sales Number" /> <label string="__number__ for Invoice / Sales Number" />
<label string="__user__ for User Name" /> <label string="__user__ for User Name" />
@ -270,7 +270,7 @@
</page> </page>
<page string="Error"> <page string="Error">
<separator string="Last Error occured" colspan="4"/> <separator string="Last Error occured" colspan="4"/>
<field name="error" select="2" nolabel="1"/> <field name="error" nolabel="1"/>
</page> </page>
<page string="Message"> <page string="Message">
<separator string="Message with All Headers" colspan="4"/> <separator string="Message with All Headers" colspan="4"/>

12
addons/stock/report/report_stock.py
View File

@ -142,6 +142,7 @@ class report_stock_lines_date(osv.osv):
_name = "report.stock.lines.date" _name = "report.stock.lines.date"
_description = "Dates of Inventories" _description = "Dates of Inventories"
_auto = False _auto = False
_order = "date"
_columns = { _columns = {
'id': fields.integer('Inventory Line Id', readonly=True), 'id': fields.integer('Inventory Line Id', readonly=True),
'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
@ -152,16 +153,13 @@ class report_stock_lines_date(osv.osv):
cr.execute(""" cr.execute("""
create or replace view report_stock_lines_date as ( create or replace view report_stock_lines_date as (
select select
min(l.id) as id, p.id as id,
p.id as product_id, p.id as product_id,
max(s.date) as date max(s.date) as date
from from
product_product p product_product p
left outer join left outer join stock_inventory_line l on (p.id=l.product_id)
stock_inventory_line l on (p.id=l.product_id) left join stock_inventory s on (l.inventory_id=s.id)
left join stock_inventory s
on (l.inventory_id=s.id)
where l.create_date is not null
and s.state = 'done' and s.state = 'done'
group by p.id group by p.id
)""") )""")

58
addons/stock/report/report_stock_view.xml
View File

@ -12,7 +12,6 @@
<filter icon="terp-stock" name="in_location" string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" /> <filter icon="terp-stock" name="in_location" string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
<filter icon="terp-stock" string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" /> <filter icon="terp-stock" string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
<filter icon="terp-stock" string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" /> <filter icon="terp-stock" string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="location_id" select="1"/> <field name="location_id" select="1"/>
<field name="product_id" select="1" default="1"/> <field name="product_id" select="1" default="1"/>
@ -77,8 +76,6 @@
<field name="context">{'full':'1',"search_default_in_location":1}</field> <field name="context">{'full':'1',"search_default_in_location":1}</field>
<field name="search_view_id" ref="view_stock_report_prodlots_filter" /> <field name="search_view_id" ref="view_stock_report_prodlots_filter" />
</record> </record>
<record id="stock_report_tracklots_tree" model="ir.ui.view"> <record id="stock_report_tracklots_tree" model="ir.ui.view">
<field name="name">stock.report.tracklots.view</field> <field name="name">stock.report.tracklots.view</field>
<field name="model">stock.report.tracklots</field> <field name="model">stock.report.tracklots</field>
@ -103,11 +100,6 @@
<!-- name="Traceability"--> <!-- name="Traceability"-->
<!-- parent="next_id_61"/>--> <!-- parent="next_id_61"/>-->
<menuitem
action="action_stock_report_prodlots_form"
id="menu_stock_report_prodlots"
parent="stock.menu_stock_inventory_control" sequence="10"/>
<act_window <act_window
context="{'product_id': active_id}" context="{'product_id': active_id}"
id="act_stock_product_location_open" id="act_stock_product_location_open"
@ -154,20 +146,42 @@
</field> </field>
</record> </record>
<record model="ir.ui.view" id="report_stock_lines_date_search">
<field name="name">report.stock.lines.date.search</field>
<field name="model">report.stock.lines.date</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Dates of Inventories">
<filter icon="gtk-media-rewind" string="Stockable"
default="1"
domain="[('product_id.type','=', 'product')]"/>
<filter icon="gtk-media-rewind" string="Consumable"
domain="[('product_id.type','=', 'consumable')]"/>
<separator orientation="vertical"/>
<filter icon="gtk-media-rewind" string="Non Inv"
domain="[('date','=', False)]"/>
<separator orientation="vertical"/>
<field name="product_id" select="1"/>
<field name="date" select="1" />
</search>
</field>
</record>
<record model="ir.ui.view" id="report_stock_lines_date_form"> <record model="ir.ui.view" id="report_stock_lines_date_form">
<field name="name">report.stock.lines.date.form</field> <field name="name">report.stock.lines.date.form</field>
<field name="model">report.stock.lines.date</field> <field name="model">report.stock.lines.date</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Dates of Inventories"> <form string="Dates of Inventories">
<field name="product_id" select="1"/> <field name="product_id"/>
<field name="date" select="1" /> <field name="date"/>
</form> </form>
</field> </field>
</record> </record>
<record model="ir.actions.act_window" id="action_stock_line_date"> <record model="ir.actions.act_window" id="action_stock_line_date">
<field name="name">Latest Inventories Dates by Product</field> <field name="name">Dates of Latest Inventories by Product</field>
<field name="res_model">report.stock.lines.date</field> <field name="res_model">report.stock.lines.date</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
@ -175,6 +189,19 @@
<menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date" sequence="2"/> <menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date" sequence="2"/>
<record id="view_location_graph" model="ir.ui.view">
<field name="name">stock.location.graph</field>
<field name="model">stock.location</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Stock Location">
<field name="complete_name"/>
<field name="stock_real_value" operator="+"/>
<field name="stock_virtual_value" operator="+"/>
</graph>
</field>
</record>
<record id="view_location_tree_3" model="ir.ui.view"> <record id="view_location_tree_3" model="ir.ui.view">
<field name="name">stock.location.tree</field> <field name="name">stock.location.tree</field>
<field name="model">stock.location</field> <field name="model">stock.location</field>
@ -193,12 +220,17 @@
<field name="name">Inventory Valuation</field> <field name="name">Inventory Valuation</field>
<field name="res_model">stock.location</field> <field name="res_model">stock.location</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree</field> <field name="view_mode">tree,graph</field>
<field name="view_id" ref="view_location_tree_3"/> <field name="view_id" ref="view_location_tree_3"/>
</record> </record>
<menuitem action="action_location_tree_3" id="menu_action_location_tree_3" parent="next_id_61" sequence="1"/> <menuitem action="action_location_tree_3" id="menu_action_location_tree_3" parent="next_id_61" sequence="1"/>
<!-- end... --> <menuitem
action="action_stock_report_prodlots_form"
id="menu_stock_report_prodlots"
parent="next_id_61" sequence="10"/>
</data> </data>
</openerp> </openerp>

31
addons/stock/stock_view.xml
View File

@ -176,7 +176,9 @@
<field name="view_id" ref="view_tracking_tree"/> <field name="view_id" ref="view_tracking_tree"/>
</record> </record>
<menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="4"/> <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="4"/>
<menuitem action="action_tracking_form" id="menu_action_tracking_form" parent="menu_traceability"/> <menuitem action="action_tracking_form" id="menu_action_tracking_form"
groups="base.group_extended"
parent="menu_traceability"/>
<record id="lot_line_tree" model="ir.ui.view"> <record id="lot_line_tree" model="ir.ui.view">
<field name="name">stock.tracking.tree</field> <field name="name">stock.tracking.tree</field>
@ -338,12 +340,6 @@
</field> </field>
</record> </record>
<!--wizard
id="action_lot2"
model="stock.production.lot"
name="stock.traceability.lot.upstream"
string="Upstream traceability"/-->
<!--wizard <!--wizard
id="action_lot4" id="action_lot4"
model="stock.production.lot" model="stock.production.lot"
@ -428,6 +424,25 @@
</field> </field>
</record> </record>
<record id="view_location_search" model="ir.ui.view">
<field name="name">stock.location.search</field>
<field name="model">stock.location</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Stock Locations">
<filter icon="terp-stock" name="in_location"
string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
<filter icon="terp-stock" name="customer"
string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
<filter icon="terp-stock" name="supplier"
string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
<separator orientation="vertical"/>
<field name="name"/>
</search>
</field>
</record>
<record id="view_location_tree2" model="ir.ui.view"> <record id="view_location_tree2" model="ir.ui.view">
<field name="name">stock.location.tree</field> <field name="name">stock.location.tree</field>
<field name="model">stock.location</field> <field name="model">stock.location</field>
@ -449,7 +464,7 @@
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="view_location_tree2"/> <field name="view_id" ref="view_location_tree2"/>
<field name="context">{'full':'1'}</field> <field name="context">{'full':1, 'search_default_in_location':1}</field>
</record> </record>
<menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration" /> <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration" />

14
addons/survey/survey_view.xml
View File

@ -41,7 +41,7 @@
<form string="Survey Question"> <form string="Survey Question">
<field name="question" colspan="4" select="1"/> <field name="question" colspan="4" select="1"/>
<field name="sequence"/> <field name="sequence"/>
<field name="tot_resp" select="2"/> <field name="tot_resp"/>
<field name="type" on_change="on_change_type(type)"/> <field name="type" on_change="on_change_type(type)"/>
<field name="in_visible_rating_weight" invisible="1"/> <field name="in_visible_rating_weight" invisible="1"/>
<field name="in_visible_menu_choice" invisible="1"/> <field name="in_visible_menu_choice" invisible="1"/>
@ -193,7 +193,7 @@
<group colspan="6" col='4'> <group colspan="6" col='4'>
<field name="max_response_limit" select="1" <field name="max_response_limit" select="1"
attrs="{'readonly':[('state','in',('open','close'))]}"/> attrs="{'readonly':[('state','in',('open','close'))]}"/>
<field name="response_user" select="2" <field name="response_user"
attrs="{'readonly':[('state','in',('open','close'))]}"/> attrs="{'readonly':[('state','in',('open','close'))]}"/>
<field name="type"/> <field name="type"/>
<field name="send_response"/> <field name="send_response"/>
@ -203,7 +203,7 @@
</page> </page>
<page string="History"> <page string="History">
<field name="date_open" select="1"/> <field name="date_open" select="1"/>
<field name="date_close" select="2"/> <field name="date_close"/>
<field name="tot_start_survey" select="1"/> <field name="tot_start_survey" select="1"/>
<field name="tot_comp_survey" select="1"/> <field name="tot_comp_survey" select="1"/>
<field name="history" colspan="4" nolabel="1"> <field name="history" colspan="4" nolabel="1">
@ -231,9 +231,9 @@
<field name="title" select="1"/> <field name="title" select="1"/>
<field name="type" select="1"/> <field name="type" select="1"/>
<field name="date_open" select="1" string="Open Date"/> <field name="date_open" select="1" string="Open Date"/>
<field name="responsible_id" select="2"/> <field name="responsible_id"/>
<field name="tot_start_survey" select="2" string="Started"/> <field name="tot_start_survey" string="Started"/>
<field name="tot_comp_survey" select="2" string="Completed"/> <field name="tot_comp_survey" string="Completed"/>
<field name="state" select="1"/> <field name="state" select="1"/>
<button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
string="Test Survey" type="action" icon="gtk-new" string="Test Survey" type="action" icon="gtk-new"
@ -301,7 +301,7 @@
<form string="Survey Question"> <form string="Survey Question">
<field name="question" colspan="4" select="1"/> <field name="question" colspan="4" select="1"/>
<field name="sequence"/> <field name="sequence"/>
<field name="tot_resp" select="2"/> <field name="tot_resp"/>
<field name="type" on_change="on_change_type(type)"/> <field name="type" on_change="on_change_type(type)"/>
<field name="in_visible_rating_weight" invisible="1"/> <field name="in_visible_rating_weight" invisible="1"/>
<field name="in_visible_menu_choice" invisible="1"/> <field name="in_visible_menu_choice" invisible="1"/>

6
addons/wiki/wiki_view.xml
View File

@ -127,17 +127,17 @@
<group col="6" colspan="4"> <group col="6" colspan="4">
<field name="name" select="1" colspan="6"/> <field name="name" select="1" colspan="6"/>
<field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/> <field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
<field name="section" select="2" invisible="not context.get('section',False)"/> <field name="section" invisible="not context.get('section',False)"/>
<field name="parent_id"/> <field name="parent_id"/>
</group> </group>
<field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/> <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
<separator colspan="4" string="Modifications"/> <separator colspan="4" string="Modifications"/>
<group col="6" colspan="4"> <group col="6" colspan="4">
<field name="write_date" readonly="1" select="2"/> <field name="write_date" readonly="1"/>
<field name="review" select="1"/> <field name="review" select="1"/>
<field name="toc"/> <field name="toc"/>
<field name="tags" select="1" groups="base.group_extended"/> <field name="tags" select="1" groups="base.group_extended"/>
<field name="summary" colspan="4" select="2" groups="base.group_extended"/> <field name="summary" colspan="4" groups="base.group_extended"/>
</group> </group>
</form> </form>
</field> </field>