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

[MERGE]merge with addons trunk 

bzr revid: sgo@tinyerp.com-20120704052224-0rv2gtt2rejuev3z
This commit is contained in:
Sanjay Gohel (Open ERP) 2012-07-04 10:52:24 +05:30
parent ef37a6856a f5f8cb037b
commit d7bcb161d7
378 changed files with 59423 additions and 42857 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/account/account_installer.xml
View File

@ -13,8 +13,7 @@
<attribute name="string">Continue</attribute> <attribute name="string">Continue</attribute>
</button> </button>
<separator string="title" position="replace"> <separator string="title" position="replace">
<group string="Select an Accounting Setup"> <group>
<label colspan="2" string="This will automatically configure your taxes and accounts."/>
<field name="charts"/> <field name="charts"/>
</group> </group>
<group string="Configure your Fiscal Year" groups="account.group_account_user"> <group string="Configure your Fiscal Year" groups="account.group_account_user">

62
addons/account/account_invoice_view.xml
View File

@ -157,33 +157,39 @@
<field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
</header> </header>
<sheet string="Supplier Invoice"> <sheet string="Supplier Invoice">
<group> <div class="oe_title">
<group> <h1>
<field string="Supplier" name="partner_id" <label string="Draft Invoice" attrs="{'invisible': [('state', '&lt;&gt;', 'draft')]}"/>
<label for="number" class="oe_edit_only" attrs="{'invisible': [('state', '=', 'draft')]}"/>
<field name="number" class="oe_inline" attrs="{'invisible': [('state', '=', 'draft')]}"/>
</h1>
<h2>
<label for="origin" string="Concerns" class="oe_inline"/>
<field name="origin" placeholder="PO0025" class="oe_inline"/>
<label string=" from " attrs="{'invisible': [('origin', '=', False)]}" class='oe_inline'/>
<field string="Supplier" name="partner_id" class="oe_inline"
on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
domain="[('supplier', '=', True)]"/> domain="[('supplier', '=', True)]"/>
<field name="fiscal_position" widget="selection"/> </h2>
</div>
<group>
<group>
<field name="date_invoice"/>
<field name="date_due"/>
<field name="type" invisible="1"/>
<field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
</group> </group>
<group> <group>
<field name="number"/> <field name="fiscal_position" widget="selection"/>
<field name="date_invoice"/>
<field name="period_id" domain="[('state', '=', 'draft')]"
groups="account.group_account_user" widget="selection"/>
<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
groups="account.group_account_user"/>
<field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
name="account_id" groups="account.group_account_user"/>
<field name="currency_id"/> <field name="currency_id"/>
<field name="type" invisible="1"/> <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user" invisible="1"/>
</group> </group>
<group> <group>
<label for="reference"/> <label for="reference"/>
<div> <div>
<field name="reference_type"/>
<field name="reference" placeholder="Payment Reference"/> <field name="reference" placeholder="Payment Reference"/>
</div> </div>
<field name="date_due"/>
</group> </group>
</group> </group>
<notebook> <notebook>
@ -196,10 +202,11 @@
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/> <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
<field name="quantity"/> <field name="quantity"/>
<field name="price_unit"/> <field name="price_unit"/>
<!-- Removed if subtotal is set -->
<field name="price_subtotal"/> <field name="price_subtotal"/>
<field invisible="True" name="name"/> <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" invisible="1"/>
<field invisible="True" name="uos_id"/> <!-- Removed if subtotal is set -->
<field name="name" invisible="1"/>
<field name="uos_id" invisible="1"/>
</tree> </tree>
</field> </field>
<group> <group>
@ -232,16 +239,17 @@
<field name="comment"/> <field name="comment"/>
</page> </page>
<page string="Other Info"> <page string="Other Info">
<group col="4"> <group>
<group>
<field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/> <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="payment_term" widget="selection"/> <field name="payment_term" widget="selection"/>
<field name="name"/> </group>
<newline/> <group>
<field name="origin" placeholder="PO0025"/>
<field name="user_id"/> <field name="user_id"/>
<field name="name" invisible="1"/>
<field name="move_id" groups="account.group_account_user"/> <field name="move_id" groups="account.group_account_user"/>
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
</group>
</group> </group>
</page> </page>
<page string="Payments"> <page string="Payments">
@ -262,7 +270,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</footer> </footer>
</form> </form>
</field> </field>
@ -308,7 +316,7 @@
on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
groups="base.group_user" context="{'search_default_customer': 1}" groups="base.group_user" context="{'search_default_customer': 1}"
domain="[('customer', '=', True)]"/> domain="[('customer', '=', True)]"/>
<field name="fiscal_position" widget="selection" options='{"quick_create": false}'/> <field name="fiscal_position" widget="selection" />
<field name="payment_term" widget="selection"/> <field name="payment_term" widget="selection"/>
</group> </group>
@ -397,7 +405,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/> <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer> </footer>
</form> </form>
</field> </field>

7
addons/account/account_view.xml
View File

@ -17,7 +17,7 @@
<button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/> <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/>
<field name="state" widget="statusbar" nolabel="1" /> <field name="state" widget="statusbar" nolabel="1" />
</header> </header>
<sheet string="Fiscalyear" layout="auto"> <sheet string="Fiscalyear" >
<group> <group>
<group> <group>
<field name="name"/> <field name="name"/>
@ -1272,7 +1272,7 @@
<button name="button_cancel" states="posted" string="Cancel" type="object"/> <button name="button_cancel" states="posted" string="Cancel" type="object"/>
<field name="state" widget="statusbar"/> <field name="state" widget="statusbar"/>
</header> </header>
<sheet string="Journal Entries" layout="auto"> <sheet string="Journal Entries" >
<group col="4"> <group col="4">
<field name="name" readonly="True"/> <field name="name" readonly="True"/>
<field name="ref"/> <field name="ref"/>
@ -2357,12 +2357,11 @@
<group string="res_config_contents" position="replace"> <group string="res_config_contents" position="replace">
<field name="only_one_chart_template" invisible="1"/> <field name="only_one_chart_template" invisible="1"/>
<field name="complete_tax_set" invisible="1"/> <field name="complete_tax_set" invisible="1"/>
<p>This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template.</p>
<div groups="base.group_multi_company"> <div groups="base.group_multi_company">
<label for="company_id"/> <label for="company_id"/>
<field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it --> <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
</div> </div>
<group string="Set Your Accounting Options"> <group>
<div attrs="{'invisible': [('only_one_chart_template','=',True)]}"> <div attrs="{'invisible': [('only_one_chart_template','=',True)]}">
<label for="chart_template_id"/> <label for="chart_template_id"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/> <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>

90
addons/account/demo/account_invoice_demo.xml
View File

@ -1,48 +1,48 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<record id="demo_invoice_0" model="account.invoice"> <record id="demo_invoice_0" model="account.invoice">
<field name="date_due" eval="time.strftime('%Y')+'-01-30'"/> <field name="date_due" eval="time.strftime('%Y')+'-01-30'"/>
<field name="payment_term" ref="account.account_payment_term"/> <field name="payment_term" ref="account.account_payment_term"/>
<field name="journal_id" ref="account.expenses_journal"/> <field name="journal_id" ref="account.expenses_journal"/>
<field name="currency_id" ref="base.EUR"/> <field name="currency_id" ref="base.EUR"/>
<field name="user_id" ref="base.user_demo"/> <field name="user_id" ref="base.user_demo"/>
<field name="reference_type">none</field> <field name="reference_type">none</field>
<field name="company_id" ref="base.main_company"/> <field name="company_id" ref="base.main_company"/>
<field name="state">draft</field> <field name="state">draft</field>
<field name="type">in_invoice</field> <field name="type">in_invoice</field>
<field name="account_id" ref="account.a_pay"/> <field name="account_id" ref="account.a_pay"/>
<field eval="0" name="reconciled"/> <field eval="0" name="reconciled"/>
<field name="date_invoice" eval="time.strftime('%Y')+'-01-01'"/> <field name="date_invoice" eval="time.strftime('%Y')+'-01-01'"/>
<field eval="14.0" name="amount_untaxed"/> <field eval="14.0" name="amount_untaxed"/>
<field eval="14.0" name="amount_total"/> <field eval="14.0" name="amount_total"/>
<field name="partner_id" ref="base.res_partner_maxtor"/> <field name="partner_id" ref="base.res_partner_maxtor"/>
</record> </record>
<record id="demo_invoice_0_line_rpanrearpanelshe0" model="account.invoice.line"> <record id="demo_invoice_0_line_rpanrearpanelshe0" model="account.invoice.line">
<field name="invoice_id" ref="demo_invoice_0"/> <field name="invoice_id" ref="demo_invoice_0"/>
<field name="account_id" ref="account.a_expense"/> <field name="account_id" ref="account.a_expense"/>
<field name="uos_id" ref="product.product_uom_unit"/> <field name="uos_id" ref="product.product_uom_unit"/>
<field name="price_unit" eval="10.0" /> <field name="price_unit" eval="10.0" />
<field name="price_subtotal" eval="10.0" /> <field name="price_subtotal" eval="10.0" />
<field name="company_id" ref="base.main_company"/> <field name="company_id" ref="base.main_company"/>
<field name="invoice_line_tax_id" eval="[(6,0,[])]"/> <field name="invoice_line_tax_id" eval="[(6,0,[])]"/>
<field name="product_id" ref="product.product_product_rearpanelarm0"/> <field name="product_id" ref="product.product_product_rearpanelarm0"/>
<field name="quantity" eval="1.0" /> <field name="quantity" eval="1.0" />
<field name="partner_id" ref="base.res_partner_maxtor"/> <field name="partner_id" ref="base.res_partner_maxtor"/>
<field name="name">[RPAN100] Rear Panel SHE100</field> <field name="name">[RPAN100] Rear Panel SHE100</field>
</record> </record>
<record id="demo_invoice_0_line_rckrackcm0" model="account.invoice.line"> <record id="demo_invoice_0_line_rckrackcm0" model="account.invoice.line">
<field name="invoice_id" ref="demo_invoice_0"/> <field name="invoice_id" ref="demo_invoice_0"/>
<field name="account_id" ref="account.a_expense"/> <field name="account_id" ref="account.a_expense"/>
<field name="uos_id" ref="product.product_uom_unit"/> <field name="uos_id" ref="product.product_uom_unit"/>
<field name="price_unit" eval="4.0"/> <field name="price_unit" eval="4.0"/>
<field name="price_subtotal" eval="4.0"/> <field name="price_subtotal" eval="4.0"/>
<field name="company_id" ref="base.main_company"/> <field name="company_id" ref="base.main_company"/>
<field name="invoice_line_tax_id" eval="[(6,0,[])]"/> <field name="invoice_line_tax_id" eval="[(6,0,[])]"/>
<field name="product_id" ref="product.product_product_shelf1"/> <field name="product_id" ref="product.product_product_shelf1"/>
<field name="quantity" eval="1.0" /> <field name="quantity" eval="1.0" />
<field name="partner_id" ref="base.res_partner_maxtor"/> <field name="partner_id" ref="base.res_partner_maxtor"/>
<field name="name">[RCK200] Rack 200cm</field> <field name="name">[RCK200] Rack 200cm</field>
</record> </record>
</data> </data>
</openerp> </openerp>

10387
addons/account/i18n/es_DO.po Normal file
View File

File diff suppressed because it is too large Load Diff

2
addons/account/partner_view.xml
View File

@ -65,7 +65,7 @@
<!-- <!--
Partners Extension Partners Extension
--> -->
<record id="view_partner_property_form" model="ir.ui.view"> <record id="view_partner_property_form" model="ir.ui.view">
<field name="name">res.partner.property.form.inherit</field> <field name="name">res.partner.property.form.inherit</field>

2
addons/account/process/customer_invoice_process.xml
View File

@ -69,7 +69,7 @@
<field name="subflow_id" ref="process_process_statementprocess0"/> <field name="subflow_id" ref="process_process_statementprocess0"/>
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/> <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/> <field eval="1" name="flow_start"/>
</record> </record>
<record id="process_node_paymententries0" model="process.node"> <record id="process_node_paymententries0" model="process.node">
<field name="menu_id" ref="account.menu_action_move_journal_line_form"/> <field name="menu_id" ref="account.menu_action_move_journal_line_form"/>

2
addons/account/process/statement_process.xml
View File

@ -64,7 +64,7 @@
Process Transition Process Transition
--> -->
<record id="process_transition_filestatement0" model="process.transition"> <record id="process_transition_filestatement0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Automatic import of the bank statement&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Automatic import of the bank statement&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Import of the statement in the system from an electronic file&quot;&quot;&quot;" name="note"/> <field eval="&quot;&quot;&quot;Import of the statement in the system from an electronic file&quot;&quot;&quot;" name="note"/>

2
addons/account/process/supplier_invoice_process.xml
View File

@ -106,7 +106,7 @@
Process Transition Process Transition
--> -->
<record id="process_transition_supplieranalyticcost0" model="process.transition"> <record id="process_transition_supplieranalyticcost0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices.&quot;&quot;&quot;" name="note"/> <field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices.&quot;&quot;&quot;" name="note"/>

8
addons/account/product_view.xml
View File

@ -51,12 +51,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="product.product_category_form_view"/> <field name="inherit_id" ref="product.product_category_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form position="inside"> <data>
<group string="Accounting Properties"> <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
<field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/> <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/> <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
</group> </xpath>
</form> </data>
</field> </field>
</record> </record>

13
addons/account/report/account_invoice_report_view.xml
View File

@ -56,6 +56,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Invoices Analysis"> <search string="Invoices Analysis">
<group> <group>
<filter icon="terp-go-year" string="Year"
name="year"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
help="year"/>
<separator orientation="vertical"/>
<field name="date"/> <field name="date"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Draft" <filter string="Draft"
@ -98,6 +103,9 @@
<filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/> <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
<filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
<filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
<filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/> <filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
@ -106,15 +114,12 @@
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/> <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/>
<separator orientation="vertical"/>
<filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
<filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
<separator orientation="vertical" groups="base.group_multi_company"/> <separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/> <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/>
<filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/> <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
<filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/> <filter string="Year" name="group_year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
</group> </group>
</search> </search>
</field> </field>

2
addons/account/wizard/account_reconcile_partner_process_view.xml
View File

@ -39,5 +39,5 @@
<field name="model">account.move.line</field> <field name="model">account.move.line</field>
</record> </record>
</data> </data>
</openerp> </openerp>

4
addons/account/wizard/account_report_general_journal_view.xml
View File

@ -14,8 +14,8 @@
<label nolabel="1" colspan="4" string="This report gives you an overview of the situation of your general journals"/> <label nolabel="1" colspan="4" string="This report gives you an overview of the situation of your general journals"/>
</xpath> </xpath>
<xpath expr="//field[@name='target_move']" position="after"> <xpath expr="//field[@name='target_move']" position="after">
<field name="amount_currency"/> <field name="amount_currency"/>
<newline/> <newline/>
</xpath> </xpath>
</data> </data>
</field> </field>

2
addons/account/wizard/account_report_print_journal_view.xml
View File

@ -67,5 +67,5 @@
sequence="1"/> sequence="1"/>
</data> </data>
</openerp> </openerp>

2
addons/account_accountant/account_accountant_demo.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<record id="base.user_demo" model="res.users"> <record id="base.user_demo" model="res.users">
<field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/> <field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/>
</record> </record>
</data> </data>

2
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
View File

@ -77,7 +77,7 @@
<menuitem id="base.menu_sales" name="Sales" <menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner" parent="base.menu_base_partner"
sequence="1"/> sequence="1"/>
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="6" parent="base.menu_sales"/> <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="7" parent="base.menu_sales"/>
</data> </data>

20
addons/account_analytic_plans/account_analytic_plans_report.xml
View File

@ -1,16 +1,16 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
<report <report
id="account_analytic_account_crossovered_analytic" id="account_analytic_account_crossovered_analytic"
string="Crossovered Analytic" string="Crossovered Analytic"
model="account.analytic.account" model="account.analytic.account"
name="account.analytic.account.crossovered.analytic" name="account.analytic.account.crossovered.analytic"
rml="account_analytic_plans/report/crossovered_analytic.rml" rml="account_analytic_plans/report/crossovered_analytic.rml"
auto="False" auto="False"
menu="False"/> menu="False"/>
</data> </data>
</openerp> </openerp>

9
addons/account_anglo_saxon/product_view.xml
View File

@ -34,12 +34,11 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="product.product_category_form_view"/> <field name="inherit_id" ref="product.product_category_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form position="inside"> <data>
<group> <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
<separator string="Accounting Property" colspan="2"/>
<field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/> <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
</group> </xpath>
</form> </data>
</field> </field>
</record> </record>

14
addons/account_asset/report/account_asset_report_view.xml
View File

@ -69,16 +69,16 @@
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical" /> <separator orientation="vertical" />
<filter string="Purchase Date" icon="terp-go-month" <filter string="Purchase Date" icon="terp-go-month"
domain="[]" context="{'group_by':'purchase_date'}" help="Date of asset purchase"/> domain="[]" context="{'group_by':'purchase_date'}" help="Date of asset purchase"/>
<separator orientation="vertical" /> <separator orientation="vertical" />
<filter string="Depreciation Date" icon="terp-go-today" <filter string="Depreciation Date" icon="terp-go-today"
domain="[]" context="{'group_by':'depreciation_date'}" help="Date of depreciation"/> domain="[]" context="{'group_by':'depreciation_date'}" help="Date of depreciation"/>
</group> </group>
</search> </search>
</field> </field>
</record> </record>
<record model="ir.actions.act_window" id="action_asset_asset_report"> <record model="ir.actions.act_window" id="action_asset_asset_report">
<field name="name">Assets Analysis</field> <field name="name">Assets Analysis</field>
<field name="res_model">asset.asset.report</field> <field name="res_model">asset.asset.report</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -89,7 +89,7 @@
</record> </record>
<menuitem action="action_asset_asset_report" <menuitem action="action_asset_asset_report"
id="menu_action_asset_asset_report" id="menu_action_asset_asset_report"
parent="account.menu_finance_reporting"/> parent="account.menu_finance_reporting"/>
</data> </data>
</openerp> </openerp>

4
addons/account_asset/wizard/account_asset_change_duration_view.xml
View File

@ -26,7 +26,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="action_asset_modify" model="ir.actions.act_window"> <record id="action_asset_modify" model="ir.actions.act_window">
<field name="name">Modify Asset</field> <field name="name">Modify Asset</field>
<field name="res_model">asset.modify</field> <field name="res_model">asset.modify</field>
@ -36,6 +36,6 @@
<field name="view_id" ref="asset_modify_form"/> <field name="view_id" ref="asset_modify_form"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
</data> </data>
</openerp> </openerp>

81
addons/account_bank_statement_extensions/i18n/sv.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-04-25 10:49+0000\n" "PO-Revision-Date: 2012-07-03 09:17+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
"Language-Team: Swedish <sv@li.org>\n" "Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-04-26 04:41+0000\n" "X-Launchpad-Export-Date: 2012-07-04 04:39+0000\n"
"X-Generator: Launchpad (build 15149)\n" "X-Generator: Launchpad (build 15544)\n"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
@ -42,7 +42,7 @@ msgstr "CODA"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,parent_id:0 #: field:account.bank.statement.line.global,parent_id:0
msgid "Parent Code" msgid "Parent Code"
msgstr "Förälderns kod" msgstr "Överliggande kod"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
@ -54,7 +54,7 @@ msgstr "Debet"
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line #: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
msgid "Cancel selected statement lines" msgid "Cancel selected statement lines"
msgstr "" msgstr "Avbryt valda utdragsrader"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: constraint:res.partner.bank:0 #: constraint:res.partner.bank:0
@ -118,6 +118,8 @@ msgid ""
"Delete operation not allowed ! Please go to the associated bank " "Delete operation not allowed ! Please go to the associated bank "
"statement in order to delete and/or modify this bank statement line" "statement in order to delete and/or modify this bank statement line"
msgstr "" msgstr ""
"Radering inte tillåten ! Vänligen använd associerat bankuttdrag för att "
"radera och/eller ändra utdragsrader"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,type:0 #: field:account.bank.statement.line.global,type:0
@ -134,27 +136,27 @@ msgstr "Journal"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Confirmed Statement Lines." msgid "Confirmed Statement Lines."
msgstr "" msgstr "Bekräfta utdragsrader"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Credit Transactions." msgid "Credit Transactions."
msgstr "" msgstr "Kredittransaktioner"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
msgid "cancel selected statement lines." msgid "cancel selected statement lines."
msgstr "" msgstr "avbryt valda utdragsrader."
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_number:0 #: field:account.bank.statement.line,counterparty_number:0
msgid "Counterparty Number" msgid "Counterparty Number"
msgstr "" msgstr "Motpartens nummer"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0 #: view:account.bank.statement.line.global:0
msgid "Transactions" msgid "Transactions"
msgstr "" msgstr "Transaktioner"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
@ -200,6 +202,9 @@ msgid ""
"Please define BIC/Swift code on bank for bank type IBAN Account to make " "Please define BIC/Swift code on bank for bank type IBAN Account to make "
"valid payments" "valid payments"
msgstr "" msgstr ""
"\n"
"Vänligen ange BIC/Swift-kod på bank för banktyp IBAN-konto för korrekta "
"utbetalningar"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line,val_date:0 #: field:account.bank.statement.line,val_date:0
@ -214,7 +219,7 @@ msgstr "Bekräfta valda rader från kontoutdraget."
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:cancel.statement.line:0 #: view:cancel.statement.line:0
msgid "Are you sure you want to cancel the selected Bank Statement lines ?" msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
msgstr "" msgstr "Är du säker på att du vill avbryta valda bankutdragsrader ?"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0 #: report:bank.statement.balance.report:0
@ -234,42 +239,42 @@ msgstr "Anteckningar"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0 #: selection:account.bank.statement.line.global,type:0
msgid "Manual" msgid "Manual"
msgstr "" msgstr "Manuell"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Credit" msgid "Credit"
msgstr "" msgstr "Kredit"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,amount:0 #: field:account.bank.statement.line.global,amount:0
msgid "Amount" msgid "Amount"
msgstr "" msgstr "Belopp"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Fin.Account" msgid "Fin.Account"
msgstr "" msgstr "Fin.konto"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_currency:0 #: field:account.bank.statement.line,counterparty_currency:0
msgid "Counterparty Currency" msgid "Counterparty Currency"
msgstr "" msgstr "Motpartsvaluta"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_bic:0 #: field:account.bank.statement.line,counterparty_bic:0
msgid "Counterparty BIC" msgid "Counterparty BIC"
msgstr "" msgstr "Motpartens BIC"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,child_ids:0 #: field:account.bank.statement.line.global,child_ids:0
msgid "Child Codes" msgid "Child Codes"
msgstr "" msgstr "Barnkoder"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:confirm.statement.line:0 #: view:confirm.statement.line:0
msgid "Are you sure you want to confirm the selected Bank Statement lines ?" msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
msgstr "" msgstr "Är du säker på att du vill bekräfta valda bankutdragsrader?"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: constraint:account.bank.statement.line:0 #: constraint:account.bank.statement.line:0
@ -277,6 +282,7 @@ msgid ""
"The amount of the voucher must be the same amount as the one on the " "The amount of the voucher must be the same amount as the one on the "
"statement line" "statement line"
msgstr "" msgstr ""
"Beloppet på bokföringsordern måste överenstämma med beloppet på kontoutdraget"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: help:account.bank.statement.line,globalisation_id:0 #: help:account.bank.statement.line,globalisation_id:0
@ -284,91 +290,92 @@ msgid ""
"Code to identify transactions belonging to the same globalisation level " "Code to identify transactions belonging to the same globalisation level "
"within a batch payment" "within a batch payment"
msgstr "" msgstr ""
"Kod för att identifiera transaktioner som tillhör samma batchbetalning"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Draft Statement Lines." msgid "Draft Statement Lines."
msgstr "" msgstr "Preleminära utdragsrader."
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Glob. Am." msgid "Glob. Am."
msgstr "" msgstr "Glob. Am."
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
msgid "Bank Statement Line" msgid "Bank Statement Line"
msgstr "" msgstr "Kontoutdragsrad"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,code:0 #: field:account.bank.statement.line.global,code:0
msgid "Code" msgid "Code"
msgstr "" msgstr "Kod"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_name:0 #: field:account.bank.statement.line,counterparty_name:0
msgid "Counterparty Name" msgid "Counterparty Name"
msgstr "" msgstr "Motpartsnamn"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,name:0 #: field:account.bank.statement.line.global,name:0
msgid "Communication" msgid "Communication"
msgstr "" msgstr "Kommunikation"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
msgid "Bank Accounts" msgid "Bank Accounts"
msgstr "" msgstr "Bankkonton"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: constraint:account.bank.statement:0 #: constraint:account.bank.statement:0
msgid "The journal and period chosen have to belong to the same company." msgid "The journal and period chosen have to belong to the same company."
msgstr "" msgstr "Journalen och perioden måste tillhöra samma bolag."
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
msgid "Bank Statement" msgid "Bank Statement"
msgstr "" msgstr "Bankkontoutdrag"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Statement Line" msgid "Statement Line"
msgstr "" msgstr "Utdragsrad"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: sql_constraint:account.bank.statement.line.global:0 #: sql_constraint:account.bank.statement.line.global:0
msgid "The code must be unique !" msgid "The code must be unique !"
msgstr "" msgstr "Koden måste vara unik !"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,bank_statement_line_ids:0 #: field:account.bank.statement.line.global,bank_statement_line_ids:0
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line #: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
msgid "Bank Statement Lines" msgid "Bank Statement Lines"
msgstr "" msgstr "Bankutdragsrad"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0 #: view:account.bank.statement.line.global:0
msgid "Child Batch Payments" msgid "Child Batch Payments"
msgstr "" msgstr "Barnbatchbetalningar"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:cancel.statement.line:0 #: view:cancel.statement.line:0
#: view:confirm.statement.line:0 #: view:confirm.statement.line:0
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr "Avbryt"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Statement Lines" msgid "Statement Lines"
msgstr "" msgstr "Utdragsrader"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Total Amount" msgid "Total Amount"
msgstr "" msgstr "Totalsumma"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line,globalisation_id:0 #: field:account.bank.statement.line,globalisation_id:0
msgid "Globalisation ID" msgid "Globalisation ID"
msgstr "" msgstr "Globalt ID"

2
addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data> <data>
<!-- Cancel selected statement lines --> <!-- Cancel selected statement lines -->

2
addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data> <data>
<!-- Confirm selected statement lines --> <!-- Confirm selected statement lines -->

36
addons/account_budget/account_budget_report.xml
View File

@ -1,24 +1,24 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
<!-- Reports on crossovered.budget --> <!-- Reports on crossovered.budget -->
<report id="report_crossovered_budget" <report id="report_crossovered_budget"
string="Budgets" string="Budgets"
model="crossovered.budget" model="crossovered.budget"
name="crossovered.budget.report" name="crossovered.budget.report"
rml="account_budget/report/crossovered_budget_report.rml" rml="account_budget/report/crossovered_budget_report.rml"
auto="False" auto="False"
menu="False" /> menu="False" />
<!-- moved from account module --> <!-- moved from account module -->
<report auto="False" <report auto="False"
id="account_budget" id="account_budget"
menu="False" menu="False"
model="account.budget.post" model="account.budget.post"
name="account.budget" name="account.budget"
rml="account_budget/report/budget_report.rml" rml="account_budget/report/budget_report.rml"
string="Budget"/> string="Budget"/>
</data> </data>
</openerp> </openerp>

138
addons/account_budget/account_budget_workflow.xml
View File

@ -2,89 +2,89 @@
<openerp> <openerp>
<data> <data>
<!-- Workflow definition --> <!-- Workflow definition -->
<record model="workflow" id="wkf_crossovered_budget"> <record model="workflow" id="wkf_crossovered_budget">
<field name="name">wkf.crossovered.budget</field> <field name="name">wkf.crossovered.budget</field>
<field name="osv">crossovered.budget</field> <field name="osv">crossovered.budget</field>
<field name="on_create">True</field> <field name="on_create">True</field>
</record> </record>
<record model="workflow.activity" id="act_draft"> <record model="workflow.activity" id="act_draft">
<field name="wkf_id" ref="wkf_crossovered_budget" /> <field name="wkf_id" ref="wkf_crossovered_budget" />
<field name="flow_start">True</field> <field name="flow_start">True</field>
<field name="name">draft</field> <field name="name">draft</field>
<field name="action">write({'state':'draft'})</field> <field name="action">write({'state':'draft'})</field>
<field name="kind">function</field> <field name="kind">function</field>
</record> </record>
<record model="workflow.activity" id="act_confirm"> <record model="workflow.activity" id="act_confirm">
<field name="wkf_id" ref="wkf_crossovered_budget" /> <field name="wkf_id" ref="wkf_crossovered_budget" />
<field name="name">confirm</field> <field name="name">confirm</field>
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">budget_confirm()</field> <field name="action">budget_confirm()</field>
<field name="split_mode">OR</field> <field name="split_mode">OR</field>
</record> </record>
<record model="workflow.activity" id="act_validate"> <record model="workflow.activity" id="act_validate">
<field name="wkf_id" ref="wkf_crossovered_budget" /> <field name="wkf_id" ref="wkf_crossovered_budget" />
<field name="name">validate</field> <field name="name">validate</field>
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">budget_validate()</field> <field name="action">budget_validate()</field>
</record> </record>
<record model="workflow.activity" id="act_cancel"> <record model="workflow.activity" id="act_cancel">
<field name="wkf_id" ref="wkf_crossovered_budget" /> <field name="wkf_id" ref="wkf_crossovered_budget" />
<field name="name">cancel</field> <field name="name">cancel</field>
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">budget_cancel()</field> <field name="action">budget_cancel()</field>
</record> </record>
<record model="workflow.activity" id="act_done"> <record model="workflow.activity" id="act_done">
<field name="wkf_id" ref="wkf_crossovered_budget" /> <field name="wkf_id" ref="wkf_crossovered_budget" />
<field name="name">done</field> <field name="name">done</field>
<field name="flow_stop">True</field> <field name="flow_stop">True</field>
<field name="kind">stopall</field> <field name="kind">stopall</field>
<field name="action">budget_done()</field> <field name="action">budget_done()</field>
<field name="join_mode">XOR</field> <field name="join_mode">XOR</field>
</record> </record>
<record model="workflow.transition" id="t1"> <record model="workflow.transition" id="t1">
<field name="act_from" ref="act_draft" /> <field name="act_from" ref="act_draft" />
<field name="act_to" ref="act_confirm" /> <field name="act_to" ref="act_confirm" />
<field name="signal">confirm</field> <field name="signal">confirm</field>
</record> </record>
<record model="workflow.transition" id="t2"> <record model="workflow.transition" id="t2">
<field name="act_from" ref="act_confirm" /> <field name="act_from" ref="act_confirm" />
<field name="act_to" ref="act_validate" /> <field name="act_to" ref="act_validate" />
<field name="signal">validate</field> <field name="signal">validate</field>
</record> </record>
<record model="workflow.transition" id="t3"> <record model="workflow.transition" id="t3">
<field name="act_from" ref="act_confirm" /> <field name="act_from" ref="act_confirm" />
<field name="act_to" ref="act_cancel" /> <field name="act_to" ref="act_cancel" />
<field name="signal">cancel</field> <field name="signal">cancel</field>
</record> </record>
<record model="workflow.transition" id="t4"> <record model="workflow.transition" id="t4">
<field name="act_from" ref="act_validate" /> <field name="act_from" ref="act_validate" />
<field name="act_to" ref="act_cancel" /> <field name="act_to" ref="act_cancel" />
<field name="signal">cancel</field> <field name="signal">cancel</field>
</record> </record>
<record model="workflow.transition" id="t5"> <record model="workflow.transition" id="t5">
<field name="act_from" ref="act_validate" /> <field name="act_from" ref="act_validate" />
<field name="act_to" ref="act_done" /> <field name="act_to" ref="act_done" />
<field name="signal">done</field> <field name="signal">done</field>
</record> </record>
<record model="workflow.transition" id="t6"> <record model="workflow.transition" id="t6">
<field name="act_from" ref="act_cancel" /> <field name="act_from" ref="act_cancel" />
<field name="act_to" ref="act_draft" /> <field name="act_to" ref="act_draft" />
<field name="signal">draft</field> <field name="signal">draft</field>
</record> </record>
</data> </data>
</openerp> </openerp>

2
addons/account_coda/account_coda_wizard.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data> <data>
<record id="account_coda_import_view" model="ir.ui.view"> <record id="account_coda_import_view" model="ir.ui.view">
<field name="name">Import CODA File</field> <field name="name">Import CODA File</field>

4
addons/account_payment/account_payment_demo.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<record id="partner_bank_1" model="res.partner.bank"> <record id="partner_bank_1" model="res.partner.bank">
<field name="name">Reserve Bank</field> <field name="name">Reserve Bank</field>
<field name="acc_number">00987654321</field> <field name="acc_number">00987654321</field>
<field name="partner_id" ref="base.res_partner_agrolait"></field> <field name="partner_id" ref="base.res_partner_agrolait"></field>
<field name="state">bank</field> <field name="state">bank</field>
<field name="bank" ref="base.res_bank_1"/> <field name="bank" ref="base.res_bank_1"/>
</record> </record>
<record id="payment_mode_1" model="payment.mode"> <record id="payment_mode_1" model="payment.mode">
<field name="name">Direct Payment</field> <field name="name">Direct Payment</field>
<field name="journal" ref="account.bank_journal"/> <field name="journal" ref="account.bank_journal"/>
<field name="bank_id" ref="account_payment.partner_bank_1"/> <field name="bank_id" ref="account_payment.partner_bank_1"/>

2
addons/account_payment/account_payment_view.xml
View File

@ -112,7 +112,7 @@
<button name="cancel" states="draft,open" string="Cancel"/> <button name="cancel" states="draft,open" string="Cancel"/>
<field name="state" widget="statusbar" statusbar_visible="draft,open"/> <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
</header> </header>
<sheet string="Payment order" layout="auto"> <sheet string="Payment order" >
<group col="4"> <group col="4">
<field name="reference"/> <field name="reference"/>
<field name="mode" widget='selection'/> <field name="mode" widget='selection'/>

4
addons/account_payment/wizard/account_payment_populate_statement_view.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<openerp> <openerp>
<data> <data>
<record id="account_payment_populate_statement_view" model="ir.ui.view"> <record id="account_payment_populate_statement_view" model="ir.ui.view">
<field name="name">Payment Populate statement</field> <field name="name">Payment Populate statement</field>
@ -42,5 +42,5 @@
<field name="target">new</field> <field name="target">new</field>
</record> </record>
</data> </data>
</openerp> </openerp>

2
addons/account_voucher/account_voucher_view.xml
View File

@ -112,7 +112,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</footer> </footer>
</form> </form>
</field> </field>

4
addons/account_voucher/voucher_payment_receipt_view.xml
View File

@ -258,7 +258,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</footer> </footer>
</form> </form>
</field> </field>
@ -431,7 +431,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</footer> </footer>
</form> </form>
</field> </field>

6
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -87,7 +87,7 @@
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/> <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header> </header>
<sheet string="Sales Receipt" layout="auto"> <sheet string="Sales Receipt" >
<div class="oe_title"> <div class="oe_title">
<label for="number" class="oe_edit_only"/> <label for="number" class="oe_edit_only"/>
<h1><field name="number" readonly="0" /></h1> <h1><field name="number" readonly="0" /></h1>
@ -168,7 +168,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</footer> </footer>
</form> </form>
</field> </field>
@ -321,7 +321,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</footer> </footer>
</form> </form>
</field> </field>

2
addons/analytic/analytic_sequence.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<record id="seq_type_analytic_account_main" model="ir.sequence.type"> <record id="seq_type_analytic_account_main" model="ir.sequence.type">
<field name="name">Analytic account</field> <field name="name">Analytic account</field>
<field name="code">account.analytic.account</field> <field name="code">account.analytic.account</field>
</record> </record>

2
addons/analytic/analytic_view.xml
View File

@ -44,7 +44,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</footer> </footer>
</form> </form>
</field> </field>

8
addons/analytic_user_function/analytic_user_function_view.xml
View File

@ -78,7 +78,7 @@
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='account_id']" position="replace"> <xpath expr="//field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/> <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" />
</xpath> </xpath>
</field> </field>
</record> </record>
@ -90,7 +90,7 @@
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='user_id']" position="replace"> <xpath expr="//field[@name='user_id']" position="replace">
<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/> <field name="user_id" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
</xpath> </xpath>
</field> </field>
</record> </record>
@ -102,7 +102,7 @@
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="/tree/field[@name='account_id']" position="replace"> <xpath expr="/tree/field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/> <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" />
</xpath> </xpath>
</field> </field>
</record> </record>
@ -114,7 +114,7 @@
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="/tree/field[@name='user_id']" position="replace"> <xpath expr="/tree/field[@name='user_id']" position="replace">
<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/> <field name="user_id" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
</xpath> </xpath>
</field> </field>
</record> </record>

4
addons/anonymization/anonymization_view.xml
View File

@ -10,7 +10,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Anonymized Field" version="7.0"> <form string="Anonymized Field" version="7.0">
<sheet> <sheet>
<group col="4"> <group col="4">
<field name="model_id" on_change="onchange_model_id(model_id)" /> <field name="model_id" on_change="onchange_model_id(model_id)" />
<field name="model_name" on_change="onchange_model_name(model_name)" /> <field name="model_name" on_change="onchange_model_name(model_name)" />
@ -104,7 +104,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Anonymization History" version="7.0"> <form string="Anonymization History" version="7.0">
<sheet> <sheet>
<group col="4"> <group col="4">
<field name="date"/> <field name="date"/>
<field name="state"/> <field name="state"/>

1
addons/audittrail/__openerp__.py
View File

@ -39,7 +39,6 @@ delete on objects and can check logs.
'wizard/audittrail_view_log_view.xml', 'wizard/audittrail_view_log_view.xml',
'audittrail_view.xml', 'audittrail_view.xml',
'security/ir.model.access.csv', 'security/ir.model.access.csv',
'security/audittrail_security.xml'
], ],
'demo_xml': ['audittrail_demo.xml'], 'demo_xml': ['audittrail_demo.xml'],
'installable': True, 'installable': True,

14
addons/audittrail/audittrail_demo.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<record model="audittrail.rule" id="demo_audittrail_rule"> <record model="audittrail.rule" id="demo_audittrail_rule">
<field name="name">Audit on Partners</field> <field name="name">Audit on Partners</field>
<field name="object_id" search="[('model','=','res.partner')]"/> <field name="object_id" search="[('model','=','res.partner')]"/>
<field name="user_id" search="[]"/> <field name="user_id" search="[]"/>
</record> </record>
</data> </data>
</openerp> </openerp>

7
addons/audittrail/security/audittrail_security.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="0">
<!-- Set access to menu -->
</data>
</openerp>

10
addons/base_action_rule/i18n/nl.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-10 18:05+0000\n" "PO-Revision-Date: 2012-07-02 15:02+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" "Last-Translator: Erwin <Unknown>\n"
"Language-Team: Dutch <nl@li.org>\n" "Language-Team: Dutch <nl@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" "X-Launchpad-Export-Date: 2012-07-03 05:36+0000\n"
"X-Generator: Launchpad (build 15505)\n" "X-Generator: Launchpad (build 15531)\n"
#. module: base_action_rule #. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0 #: help:base.action.rule,act_mail_to_user:0
@ -337,7 +337,7 @@ msgstr "Actief"
#: code:addons/base_action_rule/base_action_rule.py:329 #: code:addons/base_action_rule/base_action_rule.py:329
#, python-format #, python-format
msgid "No Email ID Found for your Company address!" msgid "No Email ID Found for your Company address!"
msgstr "" msgstr "Geen e-mail id gevonden voor uw bedrijfsadres!"
#. module: base_action_rule #. module: base_action_rule
#: field:base.action.rule,act_remind_user:0 #: field:base.action.rule,act_remind_user:0

234
addons/base_calendar/base_calendar_data.xml
View File

@ -1,138 +1,138 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<record model="res.request.link" id="request_link_meeting"> <record model="res.request.link" id="request_link_meeting">
<field name="name">Event</field> <field name="name">Event</field>
<field name="object">calendar.event</field> <field name="object">calendar.event</field>
</record> </record>
<record model="res.alarm" id="alarm1"> <record model="res.alarm" id="alarm1">
<field name="name">1 minute before</field> <field name="name">1 minute before</field>
<field name="active" eval="1" /> <field name="active" eval="1" />
<field name="trigger_duration" eval="1" /> <field name="trigger_duration" eval="1" />
<field name="trigger_interval">minutes</field> <field name="trigger_interval">minutes</field>
<field name="trigger_occurs">before</field> <field name="trigger_occurs">before</field>
<field name="trigger_related">start</field> <field name="trigger_related">start</field>
</record> </record>
<record model="res.alarm" id="alarm2"> <record model="res.alarm" id="alarm2">
<field name="name">5 minutes before</field> <field name="name">5 minutes before</field>
<field name="active" eval="1" /> <field name="active" eval="1" />
<field name="trigger_duration" eval="5" /> <field name="trigger_duration" eval="5" />
<field name="trigger_interval">minutes</field> <field name="trigger_interval">minutes</field>
<field name="trigger_occurs">before</field> <field name="trigger_occurs">before</field>
<field name="trigger_related">start</field> <field name="trigger_related">start</field>
</record> </record>
<record model="res.alarm" id="alarm3"> <record model="res.alarm" id="alarm3">
<field name="name">10 minutes before</field> <field name="name">10 minutes before</field>
<field name="active" eval="1" /> <field name="active" eval="1" />
<field name="trigger_duration" eval="10" /> <field name="trigger_duration" eval="10" />
<field name="trigger_interval">minutes</field> <field name="trigger_interval">minutes</field>
<field name="trigger_occurs">before</field> <field name="trigger_occurs">before</field>
<field name="trigger_related">start</field> <field name="trigger_related">start</field>
</record> </record>
<record model="res.alarm" id="alarm4"> <record model="res.alarm" id="alarm4">
<field name="name">15 minutes before</field> <field name="name">15 minutes before</field>
<field name="active" eval="1" /> <field name="active" eval="1" />
<field name="trigger_duration" eval="15" /> <field name="trigger_duration" eval="15" />
<field name="trigger_interval">minutes</field> <field name="trigger_interval">minutes</field>
<field name="trigger_occurs">before</field> <field name="trigger_occurs">before</field>
<field name="trigger_related">start</field> <field name="trigger_related">start</field>
</record> </record>
<record model="res.alarm" id="alarm5"> <record model="res.alarm" id="alarm5">
<field name="name">30 minutes before</field> <field name="name">30 minutes before</field>
<field name="active" eval="1" /> <field name="active" eval="1" />
<field name="trigger_duration" eval="30" /> <field name="trigger_duration" eval="30" />
<field name="trigger_interval">minutes</field> <field name="trigger_interval">minutes</field>
<field name="trigger_occurs">before</field> <field name="trigger_occurs">before</field>
<field name="trigger_related">start</field> <field name="trigger_related">start</field>
</record> </record>
<record model="res.alarm" id="alarm6"> <record model="res.alarm" id="alarm6">
<field name="name">45 minutes before</field> <field name="name">45 minutes before</field>
<field name="active" eval="1" /> <field name="active" eval="1" />
<field name="trigger_duration" eval="45" /> <field name="trigger_duration" eval="45" />
<field name="trigger_interval">minutes</field> <field name="trigger_interval">minutes</field>
<field name="trigger_occurs">before</field> <field name="trigger_occurs">before</field>
<field name="trigger_related">start</field> <field name="trigger_related">start</field>
</record> </record>
<record model="res.alarm" id="alarm7"> <record model="res.alarm" id="alarm7">
<field name="name">1 hour before</field> <field name="name">1 hour before</field>
<field name="active" eval="1" /> <field name="active" eval="1" />
<field name="trigger_duration" eval="1" /> <field name="trigger_duration" eval="1" />
<field name="trigger_interval">hours</field> <field name="trigger_interval">hours</field>
<field name="trigger_occurs">before</field> <field name="trigger_occurs">before</field>
<field name="trigger_related">start</field> <field name="trigger_related">start</field>
</record> </record>
<record model="res.alarm" id="alarm8"> <record model="res.alarm" id="alarm8">
<field name="name">2 hours before</field> <field name="name">2 hours before</field>
<field name="active" eval="1" /> <field name="active" eval="1" />
<field name="trigger_duration" eval="2" /> <field name="trigger_duration" eval="2" />
<field name="trigger_interval">hours</field> <field name="trigger_interval">hours</field>
<field name="trigger_occurs">before</field> <field name="trigger_occurs">before</field>
<field name="trigger_related">start</field> <field name="trigger_related">start</field>
</record> </record>
<record model="res.alarm" id="alarm9"> <record model="res.alarm" id="alarm9">
<field name="name">3 hours before</field> <field name="name">3 hours before</field>
<field name="active" eval="1" /> <field name="active" eval="1" />
<field name="trigger_duration" eval="3" /> <field name="trigger_duration" eval="3" />
<field name="trigger_interval">hours</field> <field name="trigger_interval">hours</field>
<field name="trigger_occurs">before</field> <field name="trigger_occurs">before</field>
<field name="trigger_related">start</field> <field name="trigger_related">start</field>
</record> </record>
<record model="res.alarm" id="alarm10"> <record model="res.alarm" id="alarm10">
<field name="name">4 hours before</field> <field name="name">4 hours before</field>
<field name="active" eval="1" /> <field name="active" eval="1" />
<field name="trigger_duration" eval="4" /> <field name="trigger_duration" eval="4" />
<field name="trigger_interval">hours</field> <field name="trigger_interval">hours</field>
<field name="trigger_occurs">before</field> <field name="trigger_occurs">before</field>
<field name="trigger_related">start</field> <field name="trigger_related">start</field>
</record> </record>
<record model="res.alarm" id="alarm11"> <record model="res.alarm" id="alarm11">
<field name="name">5 hours before</field> <field name="name">5 hours before</field>
<field name="active" eval="1" /> <field name="active" eval="1" />
<field name="trigger_duration" eval="5" /> <field name="trigger_duration" eval="5" />
<field name="trigger_interval">hours</field> <field name="trigger_interval">hours</field>
<field name="trigger_occurs">before</field> <field name="trigger_occurs">before</field>
<field name="trigger_related">start</field> <field name="trigger_related">start</field>
</record> </record>
<record model="res.alarm" id="alarm12"> <record model="res.alarm" id="alarm12">
<field name="name">18 hours before</field> <field name="name">18 hours before</field>
<field name="active" eval="1" /> <field name="active" eval="1" />
<field name="trigger_duration" eval="18" /> <field name="trigger_duration" eval="18" />
<field name="trigger_interval">hours</field> <field name="trigger_interval">hours</field>
<field name="trigger_occurs">before</field> <field name="trigger_occurs">before</field>
<field name="trigger_related">start</field> <field name="trigger_related">start</field>
</record> </record>
<!-- Scheduler for Event Alarm--> <!-- Scheduler for Event Alarm-->
<record forcecreate="True" id="ir_cron_scheduler_alarm" <record forcecreate="True" id="ir_cron_scheduler_alarm"
model="ir.cron"> model="ir.cron">
<field name="name">Run Event Reminder</field> <field name="name">Run Event Reminder</field>
<field eval="True" name="active" /> <field eval="True" name="active" />
<field name="user_id" ref="base.user_root" /> <field name="user_id" ref="base.user_root" />
<field name="interval_number">1</field> <field name="interval_number">1</field>
<field name="interval_type">minutes</field> <field name="interval_type">minutes</field>
<field name="numbercall">-1</field> <field name="numbercall">-1</field>
<field eval="False" name="doall" /> <field eval="False" name="doall" />
<field eval="'calendar.alarm'" name="model" /> <field eval="'calendar.alarm'" name="model" />
<field eval="'do_run_scheduler'" name="function" /> <field eval="'do_run_scheduler'" name="function" />
<field eval="'(False,)'" name="args" /> <field eval="'(False,)'" name="args" />
</record> </record>
</data> </data>
</openerp> </openerp>

4
addons/base_calendar/base_calendar_view.xml
View File

@ -45,10 +45,10 @@
</group> </group>
</group> </group>
<group> <group>
<group string="Delegrated From"> <group string="Delegated From">
<field name="parent_ids" readonly="1" nolabel="1" /> <field name="parent_ids" readonly="1" nolabel="1" />
</group> </group>
<group string="Delegrated To" > <group string="Delegated To" >
<field name="child_ids" readonly="1" nolabel="1" /> <field name="child_ids" readonly="1" nolabel="1" />
</group> </group>
</group> </group>

6
addons/base_calendar/security/calendar_security.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data noupdate="0"> <data noupdate="0">
<record model="res.groups" id="base.group_survey_user"> <record model="res.groups" id="base.group_survey_user">
<field name="name">Survey / User</field> <field name="name">Survey / User</field>
<field name="users" eval="[(4, ref('base.user_root'))]"/> <field name="users" eval="[(4, ref('base.user_root'))]"/>
</record> </record>
</data> </data>
</openerp> </openerp>

4
addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
View File

@ -25,14 +25,14 @@
</group> </group>
<group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'internal')]}"> <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'internal')]}">
<separator string="Users" colspan="4"/> <separator string="Users" colspan="4"/>
<field name="user_ids" select="1" colspan="4" nolabel="1" height="180"/> <field name="user_ids" colspan="4" nolabel="1" height="180"/>
<newline/> <newline/>
</group> </group>
<group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'partner')]}"> <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'partner')]}">
<field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/> <field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/>
<newline/> <newline/>
<separator string="Partner Contacts" colspan="6"/> <separator string="Partner Contacts" colspan="6"/>
<field name="contact_ids" select="1" colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/> <field name="contact_ids" colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
</group> </group>
</page> </page>
</notebook> </notebook>

2
addons/base_setup/__openerp__.py
View File

@ -38,7 +38,7 @@ Shows you a list of applications features to install from.
'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml', 'res_config_view.xml'], 'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml', 'res_config_view.xml'],
'demo_xml': [], 'demo_xml': [],
'installable': True, 'installable': True,
'auto_install': True, 'auto_install': False,
'certificate': '0086711085869', 'certificate': '0086711085869',
'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',], 'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',],
} }

4
addons/base_setup/base_setup_views.xml
View File

@ -24,8 +24,8 @@
<attribute name="string">Specify Your Terminology</attribute> <attribute name="string">Specify Your Terminology</attribute>
</form> </form>
<group string="res_config_contents" position="replace"> <group string="res_config_contents" position="replace">
<label string="You can use this wizard to change the terminologies for customers in the whole application."/> <label string="You can use this wizard to change the terminologies for customers in the whole application."/>
<separator string="Specify Your Terminology"/> <separator string="Specify Your Terminology"/>
<group colspan="4"> <group colspan="4">
<field colspan="4" name="partner"/> <field colspan="4" name="partner"/>
</group> </group>

3
addons/base_setup/res_config.py
View File

@ -43,7 +43,8 @@ class base_config_settings(osv.osv_memory):
'view_mode': 'form', 'view_mode': 'form',
'res_model': 'res.company', 'res_model': 'res.company',
'res_id': user.company_id.id, 'res_id': user.company_id.id,
} 'target': 'current',
}
# Preferences wizard for Sales & CRM. # Preferences wizard for Sales & CRM.
# It is defined here because it is inherited independently in modules sale, crm, # It is defined here because it is inherited independently in modules sale, crm,

2
addons/board/__openerp__.py
View File

@ -45,7 +45,7 @@ The user can also publish notes.
'board_demo.xml' 'board_demo.xml'
], ],
'installable': True, 'installable': True,
'auto_install': True, 'auto_install': False,
'certificate': '0076912305725', 'certificate': '0076912305725',
'images': ['images/1_dashboard_definition.jpeg','images/2_publish_note.jpeg','images/3_admin_dashboard.jpeg',], 'images': ['images/1_dashboard_definition.jpeg','images/2_publish_note.jpeg','images/3_admin_dashboard.jpeg',],
} }

2
addons/board/board_mydashboard_view.xml
View File

@ -7,7 +7,7 @@
<field name="model">board.board</field> <field name="model">board.board</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="My Dashboard" layout="manual" version="7.0"> <form string="My Dashboard" version="7.0">
<board style="2-1"> <board style="2-1">
<column> <column>
</column> </column>

6
addons/board/board_view.xml
View File

@ -69,9 +69,9 @@
</record> </record>
<menuitem action="action_view_board_list_form" <menuitem action="action_view_board_list_form"
id="menu_view_board_form" parent="base.menu_reporting_config" id="menu_view_board_form" parent="base.menu_reporting_config"
groups="base.group_no_one" groups="base.group_no_one"
sequence="2"/> sequence="2"/>
</data> </data>
</openerp> </openerp>

61
addons/caldav/wizard/caldav_browse_view.xml
View File

@ -7,13 +7,36 @@
<field name="model">caldav.browse</field> <field name="model">caldav.browse</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Browse Caldav" > <form string="Browse Caldav" version="7.0">
<group colspan="4" width="700" height="500"> <header>
<separator string="Browse Caldav" colspan="4"/> <button special="cancel" string="_Close" icon="gtk-close"/>
<field name="url" colspan="4" /> </header>
<separator string="Description" colspan="4"/> <sheet>
<field name="description" colspan="4" nolabel="1"/> <group>
</group> <separator string="Browse Caldav" colspan="4"/>
<field name="url" colspan="2" />
<separator string="Help" colspan="4"/>
<group colspan="4"><div>
1. Webdav server that provides remote access to calendar<br/>
2. Synchronisation of calendar using WebDAV<br/>
3. Customize calendar event and todo attribute with any of OpenERP model<br/>
4. Provides iCal Import/Export functionality
<br/></div></group>
<group colspan="4"><div>
To access Calendars using CalDAV clients, point them to:
http://<i>HOSTNAME</i>:<i>PORT</i>/webdav/<i>DATABASE_NAME</i>/calendars/users/<i>USERNAME</i>/c</div></group>
<group colspan="4"><div>
To access OpenERP Calendar using WebCal to remote site use the URL like:
http://<i>HOSTNAME</i>:<i>PORT</i>/webdav/<i>DATABASE_NAME</i>/Calendars/<i>CALENDAR_NAME</i>.ics</div></group>
<group colspan="4"><div>
<i>
HOSTNAME: Host on which OpenERP server(With webdav) is running<br/>
PORT : Port on which OpenERP server is running (By Default : 8069)<br/>
DATABASE_NAME: Name of database on which OpenERP Calendar is created</i>
</div></group>
</group>
</sheet>
</form> </form>
</field> </field>
</record> </record>
@ -29,12 +52,11 @@
or or
<button string="Cancel" class="oe_link" special="cancel"/> <button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<label string="Configure your openerp hostname. For example : " colspan="4"></label> <sheet>
<newline/> <group>
<label string="database.my.openerp.com or companyserver.com" colspan="4"/> <field name="host_name" colspan="2" width="250" placeholder="For example : database.my.openerp.com or companyserver.com"/>
<newline/> </group>
<separator colspan="4"/> </sheet>
<field name="host_name" colspan="4" width="250" />
</form> </form>
</field> </field>
</record> </record>
@ -50,11 +72,14 @@
or or
<button string="Cancel" class="oe_link" special="cancel"/> <button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<separator string="" colspan="4"/> <sheet>
<field name="service" colspan="4" width="250" readonly="1"/> <group>
<field name="collection" colspan="4" width="250" invisible="1" /> <field name="service" readonly="1"/>
<field name="calendar" colspan="4" width="250" domain="[('collection_id','=', collection)]" readonly="1"/> <field name="collection" invisible="1" />
<field name="device" colspan="4" width="250" /> <field name="calendar" domain="[('collection_id','=', collection)]" readonly="1"/>
<field name="device"/>
</group>
</sheet>
</form> </form>
</field> </field>
</record> </record>

2
addons/crm/crm_action_rule_view.xml
View File

@ -27,7 +27,7 @@
<group name="partner" position="after"> <group name="partner" position="after">
<group col="2" colspan="2"> <group col="2" colspan="2">
<separator colspan="4" string="Condition Case Fields"/> <separator colspan="4" string="Condition Case Fields"/>
<field name="trg_section_id" select="1" widget="selection"/> <field name="trg_section_id" widget="selection"/>
<field name="trg_categ_id"/> <field name="trg_categ_id"/>
</group> </group>
</group> </group>

8
addons/crm/crm_demo.xml
View File

@ -19,10 +19,10 @@
</record> </record>
<record model="crm.segmentation" id="crm_segmentation0"> <record model="crm.segmentation" id="crm_segmentation0">
<field name="name">OpenERP partners</field> <field name="name">OpenERP partners</field>
<field name="exclusif">True</field> <field name="exclusif">True</field>
<field name="categ_id" ref="base.res_partner_category_2"/> <field name="categ_id" ref="base.res_partner_category_2"/>
</record> </record>
</data> </data>
</openerp> </openerp>

127
addons/crm/crm_lead.py
View File

@ -273,14 +273,6 @@ class crm_lead(base_stage, osv.osv):
'color': 0, 'color': 0,
} }
def get_needaction_user_ids(self, cr, uid, ids, context=None):
result = dict.fromkeys(ids, [])
for obj in self.browse(cr, uid, ids, context=context):
# salesman must perform an action when in draft mode
if obj.state == 'draft' and obj.user_id:
result[obj.id] = [obj.user_id.id]
return result
def create(self, cr, uid, vals, context=None): def create(self, cr, uid, vals, context=None):
obj_id = super(crm_lead, self).create(cr, uid, vals, context) obj_id = super(crm_lead, self).create(cr, uid, vals, context)
self.create_send_note(cr, uid, [obj_id], context=context) self.create_send_note(cr, uid, [obj_id], context=context)
@ -770,64 +762,6 @@ class crm_lead(base_stage, osv.osv):
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
} }
def message_new(self, cr, uid, msg, custom_values=None, context=None):
"""Automatically calls when new email message arrives"""
res_id = super(crm_lead, self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
subject = msg.get('subject') or _("No Subject")
body = msg.get('body_text')
msg_from = msg.get('from')
priority = msg.get('priority')
vals = {
'name': subject,
'email_from': msg_from,
'email_cc': msg.get('cc'),
'description': body,
'user_id': False,
}
if priority:
vals['priority'] = priority
vals.update(self.message_partner_by_email(cr, uid, msg.get('from', False)))
self.write(cr, uid, [res_id], vals, context)
return res_id
def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
if isinstance(ids, (str, int, long)):
ids = [ids]
if vals == None:
vals = {}
super(crm_lead, self).message_update(cr, uid, ids, msg, context=context)
if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
vals['priority'] = msg.get('priority')
maps = {
'cost':'planned_cost',
'revenue': 'planned_revenue',
'probability':'probability'
}
vls = {}
for line in msg['body_text'].split('\n'):
line = line.strip()
res = tools.misc.command_re.match(line)
if res and maps.get(res.group(1).lower()):
key = maps.get(res.group(1).lower())
vls[key] = res.group(2).lower()
vals.update(vls)
# Unfortunately the API is based on lists
# but we want to update the state based on the
# previous state, so we have to loop:
for case in self.browse(cr, uid, ids, context=context):
values = dict(vals)
if case.state in CRM_LEAD_PENDING_STATES:
#re-open
values.update(state=crm.AVAILABLE_STATES[1][0])
if not case.date_open:
values['date_open'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
res = self.write(cr, uid, [case.id], values, context=context)
return res
def action_makeMeeting(self, cr, uid, ids, context=None): def action_makeMeeting(self, cr, uid, ids, context=None):
""" """
This opens Meeting's calendar view to schedule meeting on current Opportunity This opens Meeting's calendar view to schedule meeting on current Opportunity
@ -882,19 +816,66 @@ class crm_lead(base_stage, osv.osv):
if stage.on_change: if stage.on_change:
vals['probability'] = stage.probability vals['probability'] = stage.probability
return super(crm_lead,self).write(cr, uid, ids, vals, context) return super(crm_lead,self).write(cr, uid, ids, vals, context)
# ----------------------------------------
# Mail Gateway
# ----------------------------------------
def message_new(self, cr, uid, msg, custom_values=None, context=None):
""" Overrides mail_thread message_new that is called by the mailgateway
through message_process.
This override updates the document according to the email.
"""
if custom_values is None: custom_values = {}
custom_values.update({
'name': msg.get('subject') or _("No Subject"),
'description': msg.get('body_text'),
'email_from': msg.get('from'),
'email_cc': msg.get('cc'),
'user_id': False,
})
if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
custom_values['priority'] = msg.get('priority')
custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from', False), context=context))
return super(crm_lead, self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
""" Overrides mail_thread message_update that is called by the mailgateway
through message_process.
This method updates the document according to the email.
"""
if isinstance(ids, (str, int, long)):
ids = [ids]
if update_vals is None: update_vals = {}
if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
vals['priority'] = msg.get('priority')
maps = {
'cost':'planned_cost',
'revenue': 'planned_revenue',
'probability':'probability',
}
for line in msg.get('body_text', '').split('\n'):
line = line.strip()
res = tools.misc.command_re.match(line)
if res and maps.get(res.group(1).lower()):
key = maps.get(res.group(1).lower())
vals[key] = res.group(2).lower()
return super(crm_lead, self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
# ---------------------------------------- # ----------------------------------------
# OpenChatter methods and notifications # OpenChatter methods and notifications
# ---------------------------------------- # ----------------------------------------
def message_get_subscribers(self, cr, uid, ids, context=None): def message_get_subscribers(self, cr, uid, ids, context=None):
sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context) """ Override to add the salesman. """
# add salesman to the subscribers user_ids = super(crm_lead, self).message_get_subscribers(cr, uid, ids, context=context)
for obj in self.browse(cr, uid, ids, context=context): for obj in self.browse(cr, uid, ids, context=context):
if obj.user_id: if obj.user_id and not obj.user_id.id in user_ids:
sub_ids.append(obj.user_id.id) user_ids.append(obj.user_id.id)
return self.pool.get('res.users').read(cr, uid, sub_ids, context=context) return user_ids
def stage_set_send_note(self, cr, uid, ids, stage_id, context=None): def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
""" Override of the (void) default notification method. """ """ Override of the (void) default notification method. """
stage_name = self.pool.get('crm.case.stage').name_get(cr, uid, [stage_id], context=context)[0][1] stage_name = self.pool.get('crm.case.stage').name_get(cr, uid, [stage_id], context=context)[0][1]

36
addons/crm/crm_lead_demo.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data noupdate="1">
<!-- Demo Leads --> <!--
Demo Leads
-->
<record id="crm_case_itisatelesalescampaign0" model="crm.lead"> <record id="crm_case_itisatelesalescampaign0" model="crm.lead">
<field name="type_id" ref="crm.type_lead1"/> <field name="type_id" ref="crm.type_lead1"/>
<field eval="'3'" name="priority"/> <field eval="'3'" name="priority"/>
@ -21,7 +24,6 @@
<field eval="'Plan to Attend a Training'" name="name"/> <field eval="'Plan to Attend a Training'" name="name"/>
<field eval="'0033 769 703-274'" name="phone"/> <field eval="'0033 769 703-274'" name="phone"/>
</record> </record>
<record id="crm_case_electonicgoodsdealer0" model="crm.lead"> <record id="crm_case_electonicgoodsdealer0" model="crm.lead">
<field name="type_id" ref="crm.type_lead7"/> <field name="type_id" ref="crm.type_lead7"/>
<field eval="'4'" name="priority"/> <field eval="'4'" name="priority"/>
@ -76,7 +78,6 @@
<field eval="'(514) 698-4118'" name="phone"/> <field eval="'(514) 698-4118'" name="phone"/>
<field eval="'hmc@thgascompany.com'" name="email_from"/> <field eval="'hmc@thgascompany.com'" name="email_from"/>
</record> </record>
<record id="crm_case_itdeveloper0" model="crm.lead"> <record id="crm_case_itdeveloper0" model="crm.lead">
<field name="type_id" ref="crm.type_lead4"/> <field name="type_id" ref="crm.type_lead4"/>
<field eval="'3'" name="priority"/> <field eval="'3'" name="priority"/>
@ -96,7 +97,6 @@
<field eval="'(855) 924-4364'" name="phone"/> <field eval="'(855) 924-4364'" name="phone"/>
<field eval="'helle@stonageit.be'" name="email_from"/> <field eval="'helle@stonageit.be'" name="email_from"/>
</record> </record>
<record id="crm_case_mgroperations0" model="crm.lead"> <record id="crm_case_mgroperations0" model="crm.lead">
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field name="type_id" ref="crm.type_lead3"/> <field name="type_id" ref="crm.type_lead3"/>
@ -209,10 +209,21 @@
<!-- Call Function to Cancel the leads (set as Dead) --> <!-- Call Function to Cancel the leads (set as Dead) -->
<function model="crm.lead" name="case_cancel" <function model="crm.lead" name="case_cancel"
eval="[ref('crm_case_company_partnership0'), ref('crm_case_vpoperations0'), ref('crm_case_developingwebapplications0'), ref('crm_case_webvisitor0')], {'install_mode': True}" eval="[ ref('crm_case_company_partnership0'), ref('crm_case_vpoperations0'),
ref('crm_case_developingwebapplications0'), ref('crm_case_webvisitor0')],
{'install_mode': True}"
/>
<!-- Call Function to set the leads as Unread -->
<function model="crm.lead" name="message_mark_as_unread"
eval="[ ref('crm_case_itisatelesalescampaign0'), ref('crm_case_electonicgoodsdealer0'),
ref('crm_case_itdeveloper0'), ref('crm_case_employee0')], {}"
/> />
<!-- Demo Opportunities -->
<!--
Demo Opportunities
-->
<record id="crm_case_construstazunits0" model="crm.lead"> <record id="crm_case_construstazunits0" model="crm.lead">
<field eval="60" name="probability"/> <field eval="60" name="probability"/>
<field eval="1" name="active"/> <field eval="1" name="active"/>
@ -398,7 +409,7 @@
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field name="categ_id" ref="crm.categ_oppor5"/> <field name="categ_id" ref="crm.categ_oppor5"/>
<field name="stage_id" ref="crm.stage_lead5"/> <field name="stage_id" ref="crm.stage_lead5"/>
<field eval="'Need new design for my website'" name="name"/> <field eval="'Need a new design for my website'" name="name"/>
<field eval="time.strftime('%Y-05-01')" name="date_action"/> <field eval="time.strftime('%Y-05-01')" name="date_action"/>
<field eval="time.strftime('%Y-06-30')" name="date_deadline"/> <field eval="time.strftime('%Y-06-30')" name="date_deadline"/>
<field eval="'info@opensides.be'" name="email_from"/> <field eval="'info@opensides.be'" name="email_from"/>
@ -469,7 +480,7 @@
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field name="categ_id" ref="crm.categ_oppor1"/> <field name="categ_id" ref="crm.categ_oppor1"/>
<field name="stage_id" ref="crm.stage_lead4"/> <field name="stage_id" ref="crm.stage_lead4"/>
<field eval="'Need customize the solution'" name="name"/> <field eval="'Need to customize the solution'" name="name"/>
<field eval="'Conf call with technical service'" name="title_action"/> <field eval="'Conf call with technical service'" name="title_action"/>
<field name="partner_name">Thymbra</field> <field name="partner_name">Thymbra</field>
<field name="street">Palermo, Capital Federal</field> <field name="street">Palermo, Capital Federal</field>
@ -522,5 +533,12 @@
<field name="stage_id" ref="crm.stage_lead1"/> <field name="stage_id" ref="crm.stage_lead1"/>
<field eval="'Need more info about your pc2'" name="name"/> <field eval="'Need more info about your pc2'" name="name"/>
</record> </record>
<!-- Call Function to set the opportunities as Unread -->
<function model="crm.lead" name="message_mark_as_unread"
eval="[ ref('crm_case_rdroundfundingunits25'), ref('crm_case_unifliege'),
ref('crm_case_ericdubois4'), ref('crm_case_abcfuelcounits0')], {}"
/>
</data> </data>
</openerp> </openerp>

92
addons/crm/crm_lead_view.xml
View File

@ -2,6 +2,43 @@
<openerp> <openerp>
<data> <data>
<!-- Read/Unread actions -->
<record id="actions_server_crm_lead_unread" model="ir.actions.server">
<field name="name">Mark unread</field>
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="model_id" ref="model_crm_lead"/>
<field name="state">code</field>
<field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
</record>
<record id="action_crm_lead_unread" model="ir.values">
<field name="name">action_crm_lead_unread</field>
<field name="action_id" ref="actions_server_crm_lead_unread"/>
<field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_unread'))" />
<field name="key">action</field>
<field name="model_id" ref="model_crm_lead" />
<field name="model">crm.lead</field>
<field name="key2">client_action_multi</field>
</record>
<record id="actions_server_crm_lead_read" model="ir.actions.server">
<field name="name">Mark read</field>
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="model_id" ref="model_crm_lead"/>
<field name="state">code</field>
<field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
</record>
<record id="action_crm_lead_read" model="ir.values">
<field name="name">action_crm_lead_read</field>
<field name="action_id" ref="actions_server_crm_lead_read"/>
<field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_read'))" />
<field name="key">action</field>
<field name="model_id" ref="model_crm_lead" />
<field name="model">crm.lead</field>
<field name="key2">client_action_multi</field>
</record>
<!-- <!--
CRM CASE STAGE CRM CASE STAGE
--> -->
@ -134,10 +171,13 @@
</div> </div>
</group> </group>
<group> <group>
<field name="contact_name" /> <label for="contact_name" />
<div>
<field name="contact_name" class="oe_inline"/>,
<field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
</div>
<field name="email_from" widget="email"/> <field name="email_from" widget="email"/>
<field name="function" /> <field name="function" />
<field domain="[('domain', '=', 'contact')]" name="title"/>
<field name="phone"/> <field name="phone"/>
<field name="mobile"/> <field name="mobile"/>
<field name="fax"/> <field name="fax"/>
@ -172,9 +212,9 @@
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
<div class="oe_bottom"> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</div> </footer>
</form> </form>
</field> </field>
</record> </record>
@ -185,8 +225,7 @@
<field name="model">crm.lead</field> <field name="model">crm.lead</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Leads" fonts="bold:needaction_pending==True" colors="blue:state=='pending';grey:state in ('cancel', 'done')"> <tree string="Leads" fonts="bold:needaction_pending==True" colors="grey:state in ('cancel', 'done')">
<field name="needaction_pending" invisible="1"/>
<field name="date_deadline" invisible="1"/> <field name="date_deadline" invisible="1"/>
<field name="create_date" groups="base.group_no_one"/> <field name="create_date" groups="base.group_no_one"/>
<field name="name"/> <field name="name"/>
@ -202,6 +241,7 @@
<field name="referred" invisible="1"/> <field name="referred" invisible="1"/>
<field name="channel_id" invisible="1"/> <field name="channel_id" invisible="1"/>
<field name="subjects" invisible="1"/> <field name="subjects" invisible="1"/>
<field name="needaction_pending" invisible="1"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -235,6 +275,8 @@
<field name="user_email"/> <field name="user_email"/>
<field name="user_id"/> <field name="user_id"/>
<field name="partner_address_email"/> <field name="partner_address_email"/>
<field name="message_summary"/>
<field name="needaction_pending"/>
<templates> <templates>
<t t-name="lead_details"> <t t-name="lead_details">
<ul class="oe_kanban_tooltip"> <ul class="oe_kanban_tooltip">
@ -288,6 +330,8 @@
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/> <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
</div> </div>
<div class="oe_kanban_footer_left"> <div class="oe_kanban_footer_left">
<t t-if="record.needaction_pending.raw_value"><span class="oe_kanban_mail_new">New</span></t>
<t t-raw="record.message_summary.raw_value"/>
</div> </div>
</div> </div>
<div class="oe_clear"></div> <div class="oe_clear"></div>
@ -313,6 +357,10 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Leads"> <search string="Search Leads">
<filter icon="terp-mail-message-new"
string="Inbox" help="Unread messages"
name="needaction_pending"
domain="[('needaction_pending','=',True)]"/>
<field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/> <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
<!-- subjects is not set as store=True so, it is placed outside filter_domain--> <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
<field name="subjects"/> <field name="subjects"/>
@ -327,10 +375,6 @@
string="Open" string="Open"
name="open" name="open"
domain="[('state','=','open')]"/> domain="[('state','=','open')]"/>
<filter icon="terp-gtk-media-pause"
string="Pending"
name="pending"
domain="[('state','=','pending')]"/>
<filter string="Unassigned Leads" <filter string="Unassigned Leads"
icon="terp-personal-" icon="terp-personal-"
domain="[('user_id','=', False)]" domain="[('user_id','=', False)]"
@ -424,7 +468,6 @@
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only"/> <label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1> <h1><field name="name"/></h1>
<label for="planned_revenue" class="oe_edit_only"/> <label for="planned_revenue" class="oe_edit_only"/>
<h2> <h2>
<field name="planned_revenue" class="oe_inline"/> <field name="planned_revenue" class="oe_inline"/>
@ -491,9 +534,12 @@
</group> </group>
<group> <group>
<field name="contact_name" /> <label for="contact_name" />
<div>
<field name="contact_name" class="oe_inline"/>,
<field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
</div>
<field name="function" /> <field name="function" />
<field domain="[('domain', '=', 'contact')]" name="title"/>
<field name="mobile"/> <field name="mobile"/>
<field name="fax"/> <field name="fax"/>
</group> </group>
@ -523,7 +569,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</footer> </footer>
</form> </form>
</field> </field>
@ -535,8 +581,7 @@
<field name="model">crm.lead</field> <field name="model">crm.lead</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Opportunities" fonts="bold:needaction_pending==True" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)"> <tree string="Opportunities" fonts="bold:needaction_pending==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
<field name="needaction_pending" invisible="1"/>
<field name="date_deadline" invisible="1"/> <field name="date_deadline" invisible="1"/>
<field name="create_date" groups="base.group_no_one"/> <field name="create_date" groups="base.group_no_one"/>
<field name="name" string="Opportunity"/> <field name="name" string="Opportunity"/>
@ -555,6 +600,7 @@
<field name="priority" invisible="1"/> <field name="priority" invisible="1"/>
<field name="categ_id" invisible="1"/> <field name="categ_id" invisible="1"/>
<field name="state" groups="base.group_no_one"/> <field name="state" groups="base.group_no_one"/>
<field name="needaction_pending" invisible="1"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -567,21 +613,21 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Opportunities"> <search string="Search Opportunities">
<filter icon="terp-mail-message-new"
string="Inbox" help="Unread messages"
name="needaction_pending"
domain="[('needaction_pending','=',True)]"/>
<field name="name" string="Opportunity / Customer" <field name="name" string="Opportunity / Customer"
filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/> filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter icon="terp-check" <filter icon="terp-check"
string="New" help="New Opportunities" string="New" help="New Opportunities"
name="new" name="new"
domain="[('state','=','draft')]"/> domain="[('state','=','draft')]"/>
<filter icon="terp-camera_test" <filter icon="terp-camera_test"
string="Open" help="Open Opportunities" string="Open" help="Open Opportunities"
name="open" name="open"
domain="[('state','=','open')]"/> domain="[('state','=','open')]"/>
<filter icon="terp-gtk-media-pause"
string="Pending" help="Pending Opportunities"
name="pending"
domain="[('state','=','pending')]"/>
<filter string="Unassigned Opportunities" <filter string="Unassigned Opportunities"
icon="terp-personal-" icon="terp-personal-"
domain="[('user_id','=', False)]" domain="[('user_id','=', False)]"

7
addons/crm/crm_meeting.py
View File

@ -76,13 +76,6 @@ class crm_meeting(base_state, osv.Model):
self.create_send_note(cr, uid, [obj_id], context=context) self.create_send_note(cr, uid, [obj_id], context=context)
return obj_id return obj_id
def get_needaction_user_ids(self, cr, uid, ids, context=None):
result = dict.fromkeys(ids, [])
for obj in self.browse(cr, uid, ids, context=context):
if (obj.state == 'draft' and obj.user_id):
result[obj.id] = [obj.user_id.id]
return result
def case_open(self, cr, uid, ids, context=None): def case_open(self, cr, uid, ids, context=None):
""" Confirms meeting """ """ Confirms meeting """
res = super(crm_meeting, self).case_open(cr, uid, ids, context) res = super(crm_meeting, self).case_open(cr, uid, ids, context)

170
addons/crm/crm_meeting_demo.xml
View File

@ -1,91 +1,91 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<!-- <!--
((((((((((( Demo Cases ))))))))))) ((((((((((( Demo Cases )))))))))))
--> -->
<!--For Meetings--> <!--For Meetings-->
<record id="crm_case_followuponproposal0" model="crm.meeting"> <record id="crm_case_followuponproposal0" model="crm.meeting">
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field name="partner_id" ref="base.res_partner_maxtor"/> <field name="partner_id" ref="base.res_partner_maxtor"/>
<field name="user_id" ref="base.user_root"/> <field name="user_id" ref="base.user_root"/>
<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation &quot;" name="description"/> <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation &quot;" name="description"/>
<field eval="&quot;open&quot;" name="state"/> <field eval="&quot;open&quot;" name="state"/>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/> <field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
<field name="categ_id" ref="crm.categ_meet2"/> <field name="categ_id" ref="crm.categ_meet2"/>
<field eval="&quot;Follow-up on proposal&quot;" name="name"/> <field eval="&quot;Follow-up on proposal&quot;" name="name"/>
<field eval="time.strftime('%Y-%m-03 16:38:03')" name="date_deadline"/> <field eval="time.strftime('%Y-%m-03 16:38:03')" name="date_deadline"/>
<field eval="6.3" name="duration"/> <field eval="6.3" name="duration"/>
</record> </record>
<record id="crm_case_initialdiscussion0" model="crm.meeting"> <record id="crm_case_initialdiscussion0" model="crm.meeting">
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field eval="7.0" name="duration"/> <field eval="7.0" name="duration"/>
<field name="partner_id" ref="base.res_partner_10"/> <field name="partner_id" ref="base.res_partner_10"/>
<field name="user_id" ref="base.user_root"/> <field name="user_id" ref="base.user_root"/>
<field eval="&quot;draft&quot;" name="state"/> <field eval="&quot;draft&quot;" name="state"/>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/> <field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
<field name="categ_id" ref="crm.categ_meet3"/> <field name="categ_id" ref="crm.categ_meet3"/>
<field eval="&quot;Initial discussion&quot;" name="name"/> <field eval="&quot;Initial discussion&quot;" name="name"/>
<field eval="time.strftime('%Y-%m-05 19:01:01')" name="date_deadline"/> <field eval="time.strftime('%Y-%m-05 19:01:01')" name="date_deadline"/>
<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/> <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
</record> </record>
<record id="crm_case_discusspricing0" model="crm.meeting"> <record id="crm_case_discusspricing0" model="crm.meeting">
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field eval="3.0" name="duration"/> <field eval="3.0" name="duration"/>
<field name="partner_id" ref="base.res_partner_3"/> <field name="partner_id" ref="base.res_partner_3"/>
<field name="user_id" ref="base.user_root"/> <field name="user_id" ref="base.user_root"/>
<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation &quot;" name="description"/> <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation &quot;" name="description"/>
<field eval="&quot;done&quot;" name="state"/> <field eval="&quot;done&quot;" name="state"/>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/> <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
<field name="categ_id" ref="crm.categ_meet1"/> <field name="categ_id" ref="crm.categ_meet1"/>
<field eval="&quot;Discuss pricing&quot;" name="name"/> <field eval="&quot;Discuss pricing&quot;" name="name"/>
<field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/> <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
</record> </record>
<record id="crm_case_reviewneeds0" model="crm.meeting"> <record id="crm_case_reviewneeds0" model="crm.meeting">
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field eval="6.0" name="duration"/> <field eval="6.0" name="duration"/>
<field name="partner_id" ref="base.res_partner_11"/> <field name="partner_id" ref="base.res_partner_11"/>
<field name="user_id" ref="base.user_demo"/> <field name="user_id" ref="base.user_demo"/>
<field eval="&quot;open&quot;" name="state"/> <field eval="&quot;open&quot;" name="state"/>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/> <field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
<field name="categ_id" ref="crm.categ_meet3"/> <field name="categ_id" ref="crm.categ_meet3"/>
<field eval="&quot;Review needs&quot;" name="name"/> <field eval="&quot;Review needs&quot;" name="name"/>
<field eval="time.strftime('%Y-%m-20 16:02:02')" name="date_deadline"/> <field eval="time.strftime('%Y-%m-20 16:02:02')" name="date_deadline"/>
</record> </record>
<record id="crm_case_changesindesigning0" model="crm.meeting"> <record id="crm_case_changesindesigning0" model="crm.meeting">
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field eval="05" name="duration"/> <field eval="05" name="duration"/>
<field name="partner_id" ref="base.res_partner_9"/> <field name="partner_id" ref="base.res_partner_9"/>
<field name="user_id" ref="base.user_demo"/> <field name="user_id" ref="base.user_demo"/>
<field eval="&quot;draft&quot;" name="state"/> <field eval="&quot;draft&quot;" name="state"/>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/> <field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
<field name="categ_id" ref="crm.categ_meet2"/> <field name="categ_id" ref="crm.categ_meet2"/>
<field eval="&quot;Changes in Designing&quot;" name="name"/> <field eval="&quot;Changes in Designing&quot;" name="name"/>
<field eval="time.strftime('%Y-%m-22 16:05:05')" name="date_deadline"/> <field eval="time.strftime('%Y-%m-22 16:05:05')" name="date_deadline"/>
<field eval="&quot;info@opensides.be&quot;" name="email_from"/> <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
</record> </record>
<record id="crm_case_updatethedata0" model="crm.meeting"> <record id="crm_case_updatethedata0" model="crm.meeting">
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field name="partner_id" ref="base.res_partner_4"/> <field name="partner_id" ref="base.res_partner_4"/>
<field name="user_id" ref="base.user_root"/> <field name="user_id" ref="base.user_root"/>
<field eval="&quot;done&quot;" name="state"/> <field eval="&quot;done&quot;" name="state"/>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/> <field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
<field name="categ_id" ref="crm.categ_meet2"/> <field name="categ_id" ref="crm.categ_meet2"/>
<field eval="&quot;Update the data&quot;" name="name"/> <field eval="&quot;Update the data&quot;" name="name"/>
<field eval="13.3" name="duration"/> <field eval="13.3" name="duration"/>
<field eval="time.strftime('%Y-%m-19 02:30:49')" name="date_deadline"/> <field eval="time.strftime('%Y-%m-19 02:30:49')" name="date_deadline"/>
</record> </record>
</data> </data>
</openerp> </openerp>

2
addons/crm/crm_meeting_menu.xml
View File

@ -83,7 +83,7 @@
<menuitem name="Meetings" id="menu_crm_case_categ_meet" <menuitem name="Meetings" id="menu_crm_case_categ_meet"
action="crm_case_categ_meet" parent="base.menu_sales" action="crm_case_categ_meet" parent="base.menu_sales"
sequence="7" /> sequence="8" />
<record id="action_view_attendee_form" model="ir.actions.act_window"> <record id="action_view_attendee_form" model="ir.actions.act_window">
<field name="name">Meeting Invitations</field> <field name="name">Meeting Invitations</field>

12
addons/crm/crm_meeting_shortcut_data.xml
View File

@ -2,12 +2,12 @@
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc"> <record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
<field name="name">Meetings</field> <field name="name">Meetings</field>
<field name="resource">ir.ui.menu</field> <field name="resource">ir.ui.menu</field>
<field name="user_id" ref="base.user_root"/> <field name="user_id" ref="base.user_root"/>
<field name="res_id" ref="crm.menu_crm_case_categ_meet"/> <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
</record> </record>
</data> </data>
</openerp> </openerp>

82
addons/crm/crm_meeting_view.xml
View File

@ -2,6 +2,43 @@
<openerp> <openerp>
<data> <data>
<!-- Read/Unread actions -->
<record id="actions_server_crm_meeting_unread" model="ir.actions.server">
<field name="name">Mark unread</field>
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="model_id" ref="model_crm_meeting"/>
<field name="state">code</field>
<field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
</record>
<record id="action_crm_meeting_unread" model="ir.values">
<field name="name">action_crm_meeting_unread</field>
<field name="action_id" ref="actions_server_crm_meeting_unread"/>
<field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_unread'))" />
<field name="key">action</field>
<field name="model_id" ref="model_crm_meeting" />
<field name="model">crm.meeting</field>
<field name="key2">client_action_multi</field>
</record>
<record id="actions_server_crm_meeting_read" model="ir.actions.server">
<field name="name">Mark read</field>
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="model_id" ref="model_crm_meeting"/>
<field name="state">code</field>
<field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
</record>
<record id="action_crm_meeting_read" model="ir.values">
<field name="name">action_crm_meeting_read</field>
<field name="action_id" ref="actions_server_crm_meeting_read"/>
<field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_read'))" />
<field name="key">action</field>
<field name="model_id" ref="model_crm_meeting" />
<field name="model">crm.meeting</field>
<field name="key2">client_action_multi</field>
</record>
<!-- CRM Meetings Categories Form View --> <!-- CRM Meetings Categories Form View -->
<record id="crm_meeting_categ_action" model="ir.actions.act_window"> <record id="crm_meeting_categ_action" model="ir.actions.act_window">
@ -47,24 +84,26 @@
<h1> <h1>
<field name="name"/> <field name="name"/>
</h1> </h1>
<h2>
At <field name="location" class="oe_inline" />
</h2>
</div> </div>
<h2> <group>
<label for="duration" string="Duration" /> <h2>
<field name="duration" widget="float_time" <label for="date" string="Starting at"/>
on_change="onchange_dates(date,duration,False,allday)" <field name="date" required="1" class="oe_inline"/>
class="oe_inline"/> from <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Specify the location here" class="oe_inline"/>
<field name="date" </h2>
string="Start Date" </group>
required="1" <group>
class="oe_edit_only oe_inline"/> to <h2>
<field name="date_deadline" <label for="duration" string="Duration" />
string="End Date" required="1" <field name="duration" widget="float_time"
on_change="onchange_dates(date,False,date_deadline)" on_change="onchange_dates(date,duration,False,allday)"
class="oe_inline"/> class="oe_inline"/> (
</h2> <field name="date_deadline"
string="End Date" required="1"
on_change="onchange_dates(date,False,date_deadline)"
class="oe_inline"/> )
</h2>
</group>
<group colspan="4" col="4"> <group colspan="4" col="4">
<group colspan="2"> <group colspan="2">
<field name="user_id" /> <field name="user_id" />
@ -219,7 +258,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</footer> </footer>
</form> </form>
</field> </field>
@ -234,7 +273,6 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Meetings" fonts="bold:needaction_pending==True" <tree string="Meetings" fonts="bold:needaction_pending==True"
colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')"> colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
<field name="needaction_pending" invisible="1"/>
<field name="name" string="Subject" /> <field name="name" string="Subject" />
<field name="user_id"/> <field name="user_id"/>
<field name="date"/> <field name="date"/>
@ -243,6 +281,7 @@
<field name="partner_id" string="Partner" /> <field name="partner_id" string="Partner" />
<field name="location" /> <field name="location" />
<field name="categ_id"/> <field name="categ_id"/>
<field name="needaction_pending" invisible="1"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -284,6 +323,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Meetings"> <search string="Search Meetings">
<group> <group>
<filter icon="terp-mail-message-new"
string="Inbox" help="Unread messages"
name="needaction_pending"
domain="[('needaction_pending','=',True)]"/>
<separator orientation="vertical"/>
<field name="name" string="Meeting / Partner" <field name="name" string="Meeting / Partner"
filter_domain="['|',('name','ilike',self),('partner_id','ilike', self)]"/> filter_domain="['|',('name','ilike',self),('partner_id','ilike', self)]"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>

8
addons/crm/crm_phonecall.py
View File

@ -288,14 +288,6 @@ class crm_phonecall(base_state, osv.osv):
# ---------------------------------------- # ----------------------------------------
# OpenChatter # OpenChatter
# ---------------------------------------- # ----------------------------------------
def get_needaction_user_ids(self, cr, uid, ids, context=None):
result = dict.fromkeys(ids)
for obj in self.browse(cr, uid, ids, context=context):
result[obj.id] = []
if (obj.state == 'draft' and obj.user_id):
result[obj.id] = [obj.user_id.id]
return result
def case_get_note_msg_prefix(self, cr, uid, id, context=None): def case_get_note_msg_prefix(self, cr, uid, id, context=None):
return 'Phonecall' return 'Phonecall'

184
addons/crm/crm_phonecall_demo.xml
View File

@ -1,95 +1,95 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<!-- <!--
((((((((((( Demo Cases ))))))))))) ((((((((((( Demo Cases )))))))))))
--> -->
<record id="crm_case_phone01" model="crm.phonecall"> <record id="crm_case_phone01" model="crm.phonecall">
<field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/> <field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
<field name="partner_id" ref="base.res_partner_11"/> <field name="partner_id" ref="base.res_partner_11"/>
<field eval="&quot;3&quot;" name="priority"/> <field eval="&quot;3&quot;" name="priority"/>
<field name="user_id" ref="base.user_root"/> <field name="user_id" ref="base.user_root"/>
<field eval="&quot;Left the message&quot;" name="name"/> <field eval="&quot;Left the message&quot;" name="name"/>
<field eval="&quot;open&quot;" name="state"/> <field eval="&quot;open&quot;" name="state"/>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/> <field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field name="categ_id" ref="crm.categ_phone1"/> <field name="categ_id" ref="crm.categ_phone1"/>
<field eval="&quot;(769) 703-274&quot;" name="partner_phone"/> <field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
<field eval="2.3" name="duration"/> <field eval="2.3" name="duration"/>
<field eval="&quot;done&quot;" name="state"/> <field eval="&quot;done&quot;" name="state"/>
</record> </record>
<record id="crm_case_phone02" model="crm.phonecall"> <record id="crm_case_phone02" model="crm.phonecall">
<field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/> <field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
<field name="partner_id" ref="base.res_partner_6"/> <field name="partner_id" ref="base.res_partner_6"/>
<field eval="&quot;4&quot;" name="priority"/> <field eval="&quot;4&quot;" name="priority"/>
<field name="user_id" ref="base.user_root"/> <field name="user_id" ref="base.user_root"/>
<field eval="&quot;Get More information on the proposed deal&quot;" name="name"/> <field eval="&quot;Get More information on the proposed deal&quot;" name="name"/>
<field eval="&quot;open&quot;" name="state"/> <field eval="&quot;open&quot;" name="state"/>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/> <field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field name="categ_id" ref="crm.categ_phone1"/> <field name="categ_id" ref="crm.categ_phone1"/>
<field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/> <field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
<field eval="1.5" name="duration"/> <field eval="1.5" name="duration"/>
<field eval="&quot;done&quot;" name="state"/> <field eval="&quot;done&quot;" name="state"/>
</record> </record>
<record id="crm_case_phone03" model="crm.phonecall"> <record id="crm_case_phone03" model="crm.phonecall">
<field eval="time.strftime('%Y-%m-15 17:44:12')" name="date"/> <field eval="time.strftime('%Y-%m-15 17:44:12')" name="date"/>
<field name="partner_id" ref="base.res_partner_10"/> <field name="partner_id" ref="base.res_partner_10"/>
<field eval="&quot;2&quot;" name="priority"/> <field eval="&quot;2&quot;" name="priority"/>
<field name="user_id" ref="base.user_demo"/> <field name="user_id" ref="base.user_demo"/>
<field eval="&quot;Bad time, will call back&quot;" name="name"/> <field eval="&quot;Bad time, will call back&quot;" name="name"/>
<field eval="&quot;open&quot;" name="state"/> <field eval="&quot;open&quot;" name="state"/>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/> <field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field name="categ_id" ref="crm.categ_phone1"/> <field name="categ_id" ref="crm.categ_phone1"/>
<field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/> <field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/>
<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/> <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
<field eval="5.0" name="duration"/> <field eval="5.0" name="duration"/>
<field eval="&quot;done&quot;" name="state"/> <field eval="&quot;done&quot;" name="state"/>
</record> </record>
<record id="crm_case_phone04" model="crm.phonecall"> <record id="crm_case_phone04" model="crm.phonecall">
<field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/> <field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
<field name="partner_id" ref="base.res_partner_tinyatwork"/> <field name="partner_id" ref="base.res_partner_tinyatwork"/>
<field eval="&quot;3&quot;" name="priority"/> <field eval="&quot;3&quot;" name="priority"/>
<field name="user_id" ref="base.user_root"/> <field name="user_id" ref="base.user_root"/>
<field eval="&quot;Discuss Review Process&quot;" name="name"/> <field eval="&quot;Discuss Review Process&quot;" name="name"/>
<field eval="&quot;open&quot;" name="state"/> <field eval="&quot;open&quot;" name="state"/>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/> <field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field name="categ_id" ref="crm.categ_phone2"/> <field name="categ_id" ref="crm.categ_phone2"/>
<field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/> <field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
<field eval="3.45" name="duration"/> <field eval="3.45" name="duration"/>
</record> </record>
<record id="crm_case_phone05" model="crm.phonecall"> <record id="crm_case_phone05" model="crm.phonecall">
<field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/> <field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
<field name="partner_id" ref="base.res_partner_5"/> <field name="partner_id" ref="base.res_partner_5"/>
<field eval="&quot;3&quot;" name="priority"/> <field eval="&quot;3&quot;" name="priority"/>
<field name="user_id" ref="base.user_root"/> <field name="user_id" ref="base.user_root"/>
<field eval="&quot;More information on the proposed deal&quot;" name="name"/> <field eval="&quot;More information on the proposed deal&quot;" name="name"/>
<field eval="&quot;pending&quot;" name="state"/> <field eval="&quot;pending&quot;" name="state"/>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/> <field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field name="categ_id" ref="crm.categ_phone2"/> <field name="categ_id" ref="crm.categ_phone2"/>
<field eval="&quot;(855) 924-4364&quot;" name="partner_phone"/> <field eval="&quot;(855) 924-4364&quot;" name="partner_phone"/>
<field eval="2.08" name="duration"/> <field eval="2.08" name="duration"/>
</record> </record>
<record id="crm_case_phone06" model="crm.phonecall"> <record id="crm_case_phone06" model="crm.phonecall">
<field eval="&quot;3&quot;" name="priority"/> <field eval="&quot;3&quot;" name="priority"/>
<field name="user_id" ref="base.user_root"/> <field name="user_id" ref="base.user_root"/>
<field eval="&quot;Bad time&quot;" name="name"/> <field eval="&quot;Bad time&quot;" name="name"/>
<field eval="&quot;open&quot;" name="state"/> <field eval="&quot;open&quot;" name="state"/>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
<field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/> <field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/>
<field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/> <field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
<field name="categ_id" ref="crm.categ_phone2"/> <field name="categ_id" ref="crm.categ_phone2"/>
<field eval="&quot;(373) 907-1009&quot;" name="partner_phone"/> <field eval="&quot;(373) 907-1009&quot;" name="partner_phone"/>
<field eval="&quot;info@opensides.be&quot;" name="email_from"/> <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
<field eval="8.56" name="duration"/> <field eval="8.56" name="duration"/>
</record> </record>
</data> </data>
</openerp> </openerp>

53
addons/crm/crm_phonecall_view.xml
View File

@ -2,8 +2,44 @@
<openerp> <openerp>
<data> <data>
<!-- Phonecall Categories Form View --> <!-- Read/Unread actions -->
<record id="actions_server_crm_phonecall_unread" model="ir.actions.server">
<field name="name">Mark unread</field>
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="model_id" ref="model_crm_phonecall"/>
<field name="state">code</field>
<field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
</record>
<record id="action_crm_phonecall_unread" model="ir.values">
<field name="name">action_crm_phonecall_unread</field>
<field name="action_id" ref="actions_server_crm_phonecall_unread"/>
<field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_unread'))" />
<field name="key">action</field>
<field name="model_id" ref="model_crm_phonecall" />
<field name="model">crm.phonecall</field>
<field name="key2">client_action_multi</field>
</record>
<record id="actions_server_crm_phonecall_read" model="ir.actions.server">
<field name="name">Mark read</field>
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="model_id" ref="model_crm_phonecall"/>
<field name="state">code</field>
<field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
</record>
<record id="action_crm_phonecall_read" model="ir.values">
<field name="name">action_crm_phonecall_read</field>
<field name="action_id" ref="actions_server_crm_phonecall_read"/>
<field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_read'))" />
<field name="key">action</field>
<field name="model_id" ref="model_crm_phonecall" />
<field name="model">crm.phonecall</field>
<field name="key2">client_action_multi</field>
</record>
<!-- Phonecall Categories Form View -->
<record id="crm_phonecall_categ_action" model="ir.actions.act_window"> <record id="crm_phonecall_categ_action" model="ir.actions.act_window">
<field name="name">Phonecall Categories</field> <field name="name">Phonecall Categories</field>
<field name="res_model">crm.case.categ</field> <field name="res_model">crm.case.categ</field>
@ -34,6 +70,7 @@
<field name="categ_id" invisible="1"/> <field name="categ_id" invisible="1"/>
<field name="create_date" invisible="1"/> <field name="create_date" invisible="1"/>
<field name="opportunity_id" invisible="1"/> <field name="opportunity_id" invisible="1"/>
<field name="needaction_pending" invisible="1"/>
<button string="Convert to Opportunity" <button string="Convert to Opportunity"
name="%(phonecall2opportunity_act)d" name="%(phonecall2opportunity_act)d"
states="open,pending" states="open,pending"
@ -109,7 +146,7 @@
<field name="description" placeholder="Description..." /> <field name="description" placeholder="Description..." />
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</footer> </footer>
</form> </form>
</field> </field>
@ -123,7 +160,6 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Phone Calls" fonts="bold:needaction_pending==True" editable="top"> <tree string="Phone Calls" fonts="bold:needaction_pending==True" editable="top">
<field name="needaction_pending" invisible="1"/>
<field name="date"/> <field name="date"/>
<field name="name"/> <field name="name"/>
<field name="partner_id" <field name="partner_id"
@ -138,6 +174,7 @@
<field name="state" invisible="1"/> <field name="state" invisible="1"/>
<field name="create_date" invisible="1"/> <field name="create_date" invisible="1"/>
<field name="opportunity_id" invisible="1"/> <field name="opportunity_id" invisible="1"/>
<field name="needaction_pending" invisible="1"/>
<button string="Schedule Other Call" <button string="Schedule Other Call"
icon="terp-call-start" icon="terp-call-start"
name="%(phonecall_to_phonecall_act)d" name="%(phonecall_to_phonecall_act)d"
@ -154,7 +191,7 @@
</field> </field>
</record> </record>
<!-- Phonecalls Calendar View --> <!-- Phonecalls Calendar View -->
<record model="ir.ui.view" id="crm_case_phone_calendar_view"> <record model="ir.ui.view" id="crm_case_phone_calendar_view">
<field name="name">CRM - Phone Calls Calendar</field> <field name="name">CRM - Phone Calls Calendar</field>
@ -169,14 +206,18 @@
</field> </field>
</record> </record>
<!-- Phonecalls Search View --> <!-- Phonecalls Search View -->
<record id="view_crm_case_phonecalls_filter" model="ir.ui.view"> <record id="view_crm_case_phonecalls_filter" model="ir.ui.view">
<field name="name">CRM - Phone Calls Search</field> <field name="name">CRM - Phone Calls Search</field>
<field name="model">crm.phonecall</field> <field name="model">crm.phonecall</field>
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Phonecalls"> <search string="Search Phonecalls">
<filter icon="terp-mail-message-new"
string="Inbox" help="Unread messages"
name="needaction_pending"
domain="[('needaction_pending','=',True)]"/>
<separator orientation="vertical"/>
<field name="name" string="Phonecalls"/> <field name="name" string="Phonecalls"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="date"/> <field name="date"/>

4
addons/crm/crm_report.xml
View File

@ -2,7 +2,7 @@
<openerp> <openerp>
<data> <data>
<report auto="False" id="crm_business_opportunities_report" <report auto="False" id="crm_business_opportunities_report"
keyword="client_print_multi" menu="True" model="crm.case" keyword="client_print_multi" menu="True" model="crm.case"
multi="True" name="crm.case" string="Business Opportunities" /> multi="True" name="crm.case" string="Business Opportunities" />
</data> </data>
</openerp> </openerp>

26
addons/crm/crm_report_view.xml
View File

@ -35,12 +35,12 @@
<field name="name"/> <field name="name"/>
<field name="month"/> <field name="month"/>
<field name="user_id"/> <field name="user_id"/>
<field name="section_id" select="1" widget="selection"/> <field name="section_id" widget="selection"/>
<field name="category2_id" select="1"/> <field name="category2_id" />
<field name="stage_id"/> <field name="stage_id"/>
<field name="amount_revenue"/> <field name="amount_revenue"/>
<field name="nbr" select="1"/> <field name="nbr" />
<field name="state" select="1"/> <field name="state" />
<field name="delay_close"/> <field name="delay_close"/>
</form> </form>
</field> </field>
@ -124,11 +124,11 @@
<field name="name"/> <field name="name"/>
<field name="month"/> <field name="month"/>
<field name="user_id"/> <field name="user_id"/>
<field name="section_id" select="1" widget="selection"/> <field name="section_id" widget="selection"/>
<field name="stage_id"/> <field name="stage_id"/>
<field name="amount_revenue"/> <field name="amount_revenue"/>
<field name="nbr" select="1"/> <field name="nbr" />
<field name="state" select="1"/> <field name="state" />
<field name="delay_close"/> <field name="delay_close"/>
</form> </form>
</field> </field>
@ -211,11 +211,11 @@
<field name="name"/> <field name="name"/>
<field name="month"/> <field name="month"/>
<field name="user_id"/> <field name="user_id"/>
<field name="section_id" select="1" widget="selection"/> <field name="section_id" widget="selection"/>
<field name="categ_id"/> <field name="categ_id"/>
<field name="stage_id"/> <field name="stage_id"/>
<field name="nbr" select="1"/> <field name="nbr" />
<field name="state" select="1"/> <field name="state" />
<field name="delay_close"/> <field name="delay_close"/>
</form> </form>
</field> </field>
@ -299,12 +299,12 @@
<field name="name"/> <field name="name"/>
<field name="month"/> <field name="month"/>
<field name="user_id"/> <field name="user_id"/>
<field name="section_id" select="1" widget="selection"/> <field name="section_id" widget="selection"/>
<field name="categ_id"/> <field name="categ_id"/>
<field name="category2_id"/> <field name="category2_id"/>
<field name="stage_id"/> <field name="stage_id"/>
<field name="nbr" select="1"/> <field name="nbr" />
<field name="state" select="1"/> <field name="state" />
<field name="delay_close"/> <field name="delay_close"/>
</form> </form>
</field> </field>

15
addons/crm/crm_view.xml
View File

@ -20,7 +20,7 @@
<menuitem id="base.next_id_64" name="Sales" <menuitem id="base.next_id_64" name="Sales"
parent="base.menu_reporting" sequence="1" /> parent="base.menu_reporting" sequence="1" />
<menuitem id="base.menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="75"/> <menuitem id="base.menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="75"/>
<!-- crm.case.channel --> <!-- crm.case.channel -->
@ -81,11 +81,16 @@
<notebook colspan="4"> <notebook colspan="4">
<page string="Sales Team"> <page string="Sales Team">
<group col="4"> <group col="4">
<field name="reply_to"/> <group>
<field name="allow_unlink"/> <field name="reply_to"/>
<field name="change_responsible"/> </group>
<field name="member_ids"/> <group>
<field name="change_responsible"/>
<field name="allow_unlink"/>
</group>
</group> </group>
<separator string="Team Members"/>
<field name="member_ids"/>
</page> </page>
<page string="Stages"> <page string="Stages">
<separator string="Select Stages for this Sales Team"/> <separator string="Select Stages for this Sales Team"/>

2
addons/crm/res_config_view.xml
View File

@ -12,7 +12,7 @@
<label for="fetchmail_lead"/> <label for="fetchmail_lead"/>
<div> <div>
<field name="fetchmail_lead"/> <field name="fetchmail_lead"/>
<button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward" <button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_lead','=',False)]}"/> attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
</div> </div>
</group> </group>

89
addons/crm/res_partner_view.xml
View File

@ -45,25 +45,57 @@
</field> </field>
</record> </record>
<act_window <!-- open meetings related to given partner -->
id="crm_meeting_partner" <record id="crm_meeting_partner" model="ir.actions.act_window">
name="Meetings" <field name="name">Meetings</field>
res_model="crm.meeting" <field name="src_model">res.partner</field>
src_model="res.partner" <field name="res_model">crm.meeting</field>
view_mode="calendar,tree,form,gantt" <field name="view_mode">calendar,tree,form,gantt</field>
context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}" <field name="context">{'search_default_partner_id': active_id}</field>
/> </record>
<act_window
id="act_res_partner_2_opportunity"
name="Opportunities"
res_model="crm.lead"
src_model="res.partner"
view_mode="kanban,tree,form,graph,calendar"
domain="[('type','=','opportunity')]"
context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
/>
<!-- Partner kanban view inherte --> <!-- open opportunities related to given partner -->
<record model="ir.actions.act_window" id="relate_partner_opportunities">
<field name="name">Opportunities</field>
<field name="res_model">crm.lead</field>
<field name="view_mode">kanban,tree,form,graph,calendar</field>
<field name="domain">[('type','=','opportunity')]</field>
<field name="context">{'search_default_partner_id': active_id,
'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
<field name="help">
With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.
</field>
</record>
<record model="ir.actions.act_window.view" id="relate_partner_opportunities_kanban">
<field name="sequence" eval="0"/>
<field name="view_mode">kanban</field>
<field name="view_id" ref="crm_case_kanban_view_leads"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
<record model="ir.actions.act_window.view" id="relate_partner_opportunities_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_tree_view_oppor"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
<record model="ir.actions.act_window.view" id="relate_partner_opportunities_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_case_form_view_oppor"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
<record model="ir.actions.act_window.view" id="relate_partner_opportunities_graph">
<field name="sequence" eval="4"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_case_graph_view_opportunity"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
<!-- Partner kanban view inherte -->
<record model="ir.ui.view" id="crm_lead_partner_kanban_view"> <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
<field name="name">res.partner.kanban.inherit</field> <field name="name">res.partner.kanban.inherit</field>
<field name="model">res.partner</field> <field name="model">res.partner</field>
@ -74,13 +106,13 @@
<field name="opportunity_count"/> <field name="opportunity_count"/>
<field name="meeting_count"/> <field name="meeting_count"/>
</field> </field>
<xpath expr="//h4[@class='oe_partner_heading']" position="after"> <xpath expr="//h4[@class='oe_partner_heading']" position="after">
<a name="%(act_res_partner_2_opportunity)d" type="action"> <a name="%(relate_partner_opportunities)d" type="action">
<t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t> <t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t>
</a> </a>
<a name="%(crm_meeting_partner)d" type="action"> <a name="%(crm_meeting_partner)d" type="action">
<t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t> <t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t>
</a> </a>
</xpath> </xpath>
</field> </field>
</record> </record>
@ -96,13 +128,12 @@
<button type="action" <button type="action"
string="Schedule a Meeting" string="Schedule a Meeting"
name="%(crm.crm_case_categ_meet_create_partner)d" name="%(crm.crm_case_categ_meet_create_partner)d"
context="{'default_partner_id': [active_id], 'default_duration': 4.0}"/> context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"/>
<button type="action" string="Schedule a Call" <button type="action" string="Schedule a Call"
name="%(crm.crm_case_categ_phone_create_partner)d" name="%(crm.crm_case_categ_phone_create_partner)d"
context="{'search_default_partner_id': [active_id], 'default_duration': 1.0}" /> context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
<button type="action" string="Opportunities" <button type="action" string="Opportunities"
context="{'search_default_partner_id': [active_id]}" name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': active_id}"/>
name="%(crm.action_view_crm_partner2opportunity)d" />
</xpath> </xpath>
</field> </field>
</record> </record>

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

@ -65,8 +65,8 @@
<field name="view_id" ref="view_crm_lead2opportunity_partner"/> <field name="view_id" ref="view_crm_lead2opportunity_partner"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<act_window id="action_crm_send_mass_convert" <act_window id="action_crm_send_mass_convert"
multi="True" multi="True"
key2="client_action_multi" name="Convert opportunities" key2="client_action_multi" name="Convert opportunities"
res_model="crm.lead2opportunity.partner.mass" src_model="crm.lead" res_model="crm.lead2opportunity.partner.mass" src_model="crm.lead"

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

@ -9,7 +9,7 @@
<field name="model">crm.opportunity2phonecall</field> <field name="model">crm.opportunity2phonecall</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Schedule/Log a Call" layout="manual" version="7.0"> <form string="Schedule/Log a Call" version="7.0">
<header> <header>
<button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/> <button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
<button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight" /> <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight" />

3
addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
View File

@ -17,15 +17,12 @@
<button string="Cancel" class="oe_link" special="cancel" /> <button string="Cancel" class="oe_link" special="cancel" />
</header> </header>
<group col="4"> <group col="4">
<separator string="Schedule/Log a Call" colspan="4"/>
<field name="action"/> <field name="action"/>
<separator string="Call Details" colspan="4"/>
<field name="name"/> <field name="name"/>
<field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/> <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
<field name="partner_id" readonly="True"/> <field name="partner_id" readonly="True"/>
<field name="user_id" /> <field name="user_id" />
<field name="section_id"/> <field name="section_id"/>
<field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
</group> </group>
</form> </form>
</field> </field>

2
addons/crm_caldav/crm_caldav_view.xml
View File

@ -2,7 +2,7 @@
<openerp> <openerp>
<data> <data>
<record id="action_caldav_browse" model="ir.actions.act_window"> <record id="action_caldav_browse" model="ir.actions.act_window">
<field name="name">Caldav Browse</field> <field name="name">Synchronize Your Meetings</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">user.preference</field> <field name="res_model">user.preference</field>
<field name="view_id" ref="caldav.host_prefernce_form"/> <field name="view_id" ref="caldav.host_prefernce_form"/>

66
addons/crm_claim/crm_claim.py
View File

@ -183,59 +183,53 @@ class crm_claim(base_stage, osv.osv):
} }
address = self.pool.get('res.partner').browse(cr, uid, part) address = self.pool.get('res.partner').browse(cr, uid, part)
return {'value': {'email_from': address.email, 'partner_phone': address.phone}} return {'value': {'email_from': address.email, 'partner_phone': address.phone}}
def message_new(self, cr, uid, msg, custom_values=None, context=None):
"""Automatically called when new email message arrives"""
res_id = super(crm_claim,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
subject = msg.get('subject')
body = msg.get('body_text')
msg_from = msg.get('from')
priority = msg.get('priority')
vals = {
'name': subject,
'email_from': msg_from,
'email_cc': msg.get('cc'),
'description': body,
'user_id': False,
}
if priority:
vals['priority'] = priority
vals.update(self.message_partner_by_email(cr, uid, msg.get('from', False)))
self.write(cr, uid, [res_id], vals, context=context)
return res_id
def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None): # -------------------------------------------------------
# Mail gateway
# -------------------------------------------------------
def message_new(self, cr, uid, msg, custom_values=None, context=None):
""" Overrides mail_thread message_new that is called by the mailgateway
through message_process.
This override updates the document according to the email.
"""
if custom_values is None: custom_values = {}
custom_values.update({
'name': msg.get('subject') or _("No Subject"),
'description': msg.get('body_text'),
'email_from': msg.get('from'),
'email_cc': msg.get('cc'),
})
if msg.get('priority'):
custom_values['priority'] = msg.get('priority')
custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
return super(crm_claim,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
""" Overrides mail_thread message_update that is called by the mailgateway
through message_process.
This method updates the document according to the email.
"""
if isinstance(ids, (str, int, long)): if isinstance(ids, (str, int, long)):
ids = [ids] ids = [ids]
if update_vals is None: update_vals = {}
res_id = super(crm_claim,self).message_update(cr, uid, ids, msg, context=context)
if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES): if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
vals['priority'] = msg.get('priority') update_vals['priority'] = msg.get('priority')
maps = { maps = {
'cost':'planned_cost', 'cost':'planned_cost',
'revenue': 'planned_revenue', 'revenue': 'planned_revenue',
'probability':'probability' 'probability':'probability'
} }
vls = {}
for line in msg['body_text'].split('\n'): for line in msg['body_text'].split('\n'):
line = line.strip() line = line.strip()
res = tools.misc.command_re.match(line) res = tools.misc.command_re.match(line)
if res and maps.get(res.group(1).lower()): if res and maps.get(res.group(1).lower()):
key = maps.get(res.group(1).lower()) key = maps.get(res.group(1).lower())
vls[key] = res.group(2).lower() update_vals[key] = res.group(2).lower()
vals.update(vls)
# Unfortunately the API is based on lists return super(crm_claim,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
# but we want to update the state based on the
# previous state, so we have to loop:
for case in self.browse(cr, uid, ids, context=context):
values = dict(vals)
if case.state in CRM_CLAIM_PENDING_STATES:
values.update(state=crm.AVAILABLE_STATES[1][0]) #re-open
res = self.write(cr, uid, [case.id], values, context=context)
return res
# --------------------------------------------------- # ---------------------------------------------------
# OpenChatter methods and notifications # OpenChatter methods and notifications

10
addons/crm_claim/crm_claim_view.xml
View File

@ -75,7 +75,7 @@
<field name="stage_id"/> <field name="stage_id"/>
<field name="date_action_next"/> <field name="date_action_next"/>
<field name="action_next"/> <field name="action_next"/>
<field name="categ_id" string="Type" select="1"/> <field name="categ_id" string="Type"/>
<field name="date_deadline" invisible="1"/> <field name="date_deadline" invisible="1"/>
<field name="date_closed" invisible="1"/> <field name="date_closed" invisible="1"/>
<field name="state" groups="base.group_no_one"/> <field name="state" groups="base.group_no_one"/>
@ -109,7 +109,7 @@
<field name="stage_id" widget="statusbar" <field name="stage_id" widget="statusbar"
on_change="onchange_stage_id(stage_id)"/> on_change="onchange_stage_id(stage_id)"/>
</header> </header>
<sheet string="Claims" layout="auto"> <sheet string="Claims">
<group> <group>
<field name="name"/> <field name="name"/>
<field name="date"/> <field name="date"/>
@ -168,9 +168,9 @@
</notebook> </notebook>
</group> </group>
</sheet> </sheet>
<div class="oe_sheet_width"> <footer>
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/> <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</div> </footer>
</form> </form>
</field> </field>
</record> </record>

29
addons/crm_fundraising/crm_fundraising.py
View File

@ -127,21 +127,26 @@ class crm_fundraising(base_stage, osv.osv):
self.create_send_note(cr, uid, [obj_id], context=context) self.create_send_note(cr, uid, [obj_id], context=context)
return obj_id return obj_id
# -------------------------------------------------------
# Mail gateway
# -------------------------------------------------------
def message_new(self, cr, uid, msg, custom_values=None, context=None): def message_new(self, cr, uid, msg, custom_values=None, context=None):
"""Automatically called when new email message arrives""" """ Overrides mail_thread message_new that is called by the mailgateway
res_id = super(crm_fundraising,self).message_new(cr, uid, msg, custom_values=custom_values, context=context) through message_process.
vals = { This override also updates the document according to the email.
'name': msg.get('subject'), """
if custom_values is None: custom_values = {}
custom_values.update({
'name': msg.get('subject') or _("No Subject"),
'description': msg.get('body_text'),
'email_from': msg.get('from'), 'email_from': msg.get('from'),
'email_cc': msg.get('cc'), 'email_cc': msg.get('cc'),
'description': msg.get('body_text'), })
} if msg.get('priority'):
priority = msg.get('priority') custom_values['priority'] = priority
if priority: custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
vals['priority'] = priority return super(crm_fundraising,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
vals.update(self.message_partner_by_email(cr, uid, msg.get('from')))
self.write(cr, uid, [res_id], vals, context=context)
return res_id
# --------------------------------------------------- # ---------------------------------------------------
# OpenChatter methods and notifications # OpenChatter methods and notifications

36
addons/crm_fundraising/crm_fundraising_view.xml
View File

@ -71,39 +71,49 @@
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" /> <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/> <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header> </header>
<sheet string="Funds Form" layout="auto"> <sheet string="Funds Form">
<group col="4"> <label for="name" class="oe_edit_only"/>
<field name="name" string="Name"/> <h1>
<field name="section_id" colspan="1" widget="selection"/> <field name="name"/>
<field name="user_id" string="Responsible"/> </h1>
<field name="date"/> <label for="categ_id" class="oe_edit_only"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/> <h2>
<field name="type_id" string="Payment Mode" widget="selection"/> <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]" class="oe_inline"/>
</h2>
<group>
<group>
<field name="user_id" string="Responsible"/>
<field name="section_id" colspan="1" widget="selection"/>
</group>
<group>
<field name="date"/>
<field name="type_id" string="Payment Mode" widget="selection"/>
<field name="priority" string="Priority"/>
</group>
</group> </group>
<notebook> <notebook>
<page string="Funds"> <page string="Funds">
<group> <group>
<group string="Communication"> <group>
<field name="partner_id" <field name="partner_id"
on_change="onchange_partner_id(partner_id, email_from)" on_change="onchange_partner_id(partner_id, email_from)"
/> />
<field name="email_from"/> <field name="email_from"/>
</group> </group>
<group string="Estimates"> <group>
<field name="planned_cost"/> <field name="planned_cost"/>
<field name="planned_revenue"/> <field name="planned_revenue"/>
<field name="probability"/> <field name="probability"/>
</group> </group>
</group> </group>
<separator colspan="4" string="Notes"/> <separator colspan="4" string="Notes"/>
<field name="description"/> <field name="description" placeholder="Add a note..."/>
</page> </page>
<page string="Extra Info"> <page string="Extra Info">
<group> <group>
<group string="Misc"> <group string="Misc">
<field name="active"/> <field name="active"/>
<field name="id"/> <field name="id"/>
<field name="priority" string="Priority"/>
</group> </group>
<group groups="base.group_no_one" string="Dates"> <group groups="base.group_no_one" string="Dates">
<field name="create_date"/> <field name="create_date"/>
@ -119,7 +129,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/> <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer> </footer>
</form> </form>
</field> </field>

60
addons/crm_helpdesk/crm_helpdesk.py
View File

@ -95,55 +95,51 @@ class crm_helpdesk(base_state, osv.osv):
self.create_send_note(cr, uid, [obj_id], context=context) self.create_send_note(cr, uid, [obj_id], context=context)
return obj_id return obj_id
def message_new(self, cr, uid, msg_dict, custom_values=None, context=None): # -------------------------------------------------------
"""Automatically called when new email message arrives""" # Mail gateway
res_id = super(crm_helpdesk,self).message_new(cr, uid, msg_dict, custom_values=custom_values, context=context) # -------------------------------------------------------
subject = msg_dict.get('subject') or _("No Subject")
body = msg_dict.get('body_text')
msg_from = msg_dict.get('from')
vals = {
'name': subject,
'email_from': msg_from,
'email_cc': msg_dict.get('cc'),
'description': body,
'user_id': False,
}
vals.update(self.message_partner_by_email(cr, uid, msg_from))
self.write(cr, uid, [res_id], vals, context)
return res_id
def message_update(self, cr, uid, ids, msg, vals={}, default_act='pending', context=None): def message_new(self, cr, uid, msg, custom_values=None, context=None):
""" Overrides mail_thread message_new that is called by the mailgateway
through message_process.
This override updates the document according to the email.
"""
if custom_values is None: custom_values = {}
custom_values.update({
'name': msg.get('subject') or _("No Subject"),
'description': msg.get('body_text'),
'email_from': msg.get('from'),
'email_cc': msg.get('cc'),
'user_id': False,
})
custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
return super(crm_helpdesk,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
""" Overrides mail_thread message_update that is called by the mailgateway
through message_process.
This method updates the document according to the email.
"""
if isinstance(ids, (str, int, long)): if isinstance(ids, (str, int, long)):
ids = [ids] ids = [ids]
if update_vals is None: update_vals = {}
super(crm_helpdesk,self).message_update(cr, uid, ids, msg, context=context)
if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES): if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
vals['priority'] = msg.get('priority') update_vals['priority'] = msg.get('priority')
maps = { maps = {
'cost':'planned_cost', 'cost':'planned_cost',
'revenue': 'planned_revenue', 'revenue': 'planned_revenue',
'probability':'probability' 'probability':'probability'
} }
vls = {}
for line in msg['body_text'].split('\n'): for line in msg['body_text'].split('\n'):
line = line.strip() line = line.strip()
res = tools.misc.command_re.match(line) res = tools.misc.command_re.match(line)
if res and maps.get(res.group(1).lower()): if res and maps.get(res.group(1).lower()):
key = maps.get(res.group(1).lower()) key = maps.get(res.group(1).lower())
vls[key] = res.group(2).lower() update_vals[key] = res.group(2).lower()
vals.update(vls)
# Unfortunately the API is based on lists return super(crm_helpdesk,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
# but we want to update the state based on the
# previous state, so we have to loop:
for case in self.browse(cr, uid, ids, context=context):
values = dict(vals)
if case.state in CRM_HELPDESK_STATES:
values.update(state=crm.AVAILABLE_STATES[1][0]) #re-open
res = self.write(cr, uid, [case.id], values, context=context)
return res
# ****************************** # ******************************
# OpenChatter # OpenChatter

4
addons/crm_helpdesk/crm_helpdesk_view.xml
View File

@ -46,7 +46,7 @@
states="draft,open,pending"/> states="draft,open,pending"/>
<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/> <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header> </header>
<sheet string="Helpdesk Support" layout="auto"> <sheet string="Helpdesk Support">
<group col="4" class="oe_header"> <group col="4" class="oe_header">
<field name="name" string="Query"/> <field name="name" string="Query"/>
<field name="section_id" widget="selection"/> <field name="section_id" widget="selection"/>
@ -100,7 +100,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</footer> </footer>
</form> </form>
</field> </field>

2
addons/crm_partner_assign/crm_lead_view.xml
View File

@ -27,7 +27,7 @@
<group string="Geo Assignation"> <group string="Geo Assignation">
<field name="partner_latitude"/> <field name="partner_latitude"/>
<field name="partner_longitude"/> <field name="partner_longitude"/>
<span/> <span/>
<button string="Geo Assign" name="action_assign_partner" type="object" colspan="1" <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
icon="gtk-apply"/> icon="gtk-apply"/>
</group> </group>

378
addons/crm_profiling/crm_profiling_demo.xml
View File

@ -3,208 +3,208 @@
<data noupdate="1"> <data noupdate="1">
<!-- <!--
Questions Questions
--> -->
<record model="crm_profiling.question" id="activity_sector"> <record model="crm_profiling.question" id="activity_sector">
<field name="name">Activity sector?</field> <field name="name">Activity sector?</field>
</record> </record>
<record model="crm_profiling.question" id="nb_employees"> <record model="crm_profiling.question" id="nb_employees">
<field name="name">Number of employees?</field> <field name="name">Number of employees?</field>
</record> </record>
<record model="crm_profiling.question" id="partner_level"> <record model="crm_profiling.question" id="partner_level">
<field name="name">Partner level?</field> <field name="name">Partner level?</field>
</record> </record>
<record model="crm_profiling.question" id="partner_tiny"> <record model="crm_profiling.question" id="partner_tiny">
<field name="name">OpenERP partner?</field> <field name="name">OpenERP partner?</field>
</record> </record>
<!-- <!--
Questionnaires Questionnaires
--> -->
<record model="crm_profiling.questionnaire" id="questionnaire1"> <record model="crm_profiling.questionnaire" id="questionnaire1">
<field name="name">Base questionnaire</field> <field name="name">Base questionnaire</field>
<field name="description">First questionnaire.</field> <field name="description">First questionnaire.</field>
<field name="questions_ids" eval="[(6,0,[activity_sector,nb_employees,partner_level])]"/> <field name="questions_ids" eval="[(6,0,[activity_sector,nb_employees,partner_level])]"/>
</record> </record>
<!-- <!--
Answers Answers
--> -->
<record model="crm_profiling.answer" id="sector1"> <record model="crm_profiling.answer" id="sector1">
<field name="name">HR</field> <field name="name">HR</field>
<field name="question_id" ref="activity_sector"/> <field name="question_id" ref="activity_sector"/>
</record> </record>
<record model="crm_profiling.answer" id="sector2"> <record model="crm_profiling.answer" id="sector2">
<field name="name">Telecom</field> <field name="name">Telecom</field>
<field name="question_id" ref="activity_sector"/> <field name="question_id" ref="activity_sector"/>
</record> </record>
<record model="crm_profiling.answer" id="sector3"> <record model="crm_profiling.answer" id="sector3">
<field name="name">IT</field> <field name="name">IT</field>
<field name="question_id" ref="activity_sector"/> <field name="question_id" ref="activity_sector"/>
</record> </record>
<record model="crm_profiling.answer" id="nb_employees1"> <record model="crm_profiling.answer" id="nb_employees1">
<field name="name">1 to 50</field> <field name="name">1 to 50</field>
<field name="question_id" ref="nb_employees"/> <field name="question_id" ref="nb_employees"/>
</record> </record>
<record model="crm_profiling.answer" id="nb_employees2"> <record model="crm_profiling.answer" id="nb_employees2">
<field name="name">51 to 100</field> <field name="name">51 to 100</field>
<field name="question_id" ref="nb_employees"/> <field name="question_id" ref="nb_employees"/>
</record> </record>
<record model="crm_profiling.answer" id="nb_employees3"> <record model="crm_profiling.answer" id="nb_employees3">
<field name="name">more than 100</field> <field name="name">more than 100</field>
<field name="question_id" ref="nb_employees"/> <field name="question_id" ref="nb_employees"/>
</record> </record>
<record model="crm_profiling.answer" id="partner_quality1"> <record model="crm_profiling.answer" id="partner_quality1">
<field name="name">bronze</field> <field name="name">bronze</field>
<field name="question_id" ref="partner_level"/> <field name="question_id" ref="partner_level"/>
</record> </record>
<record model="crm_profiling.answer" id="partner_quality2"> <record model="crm_profiling.answer" id="partner_quality2">
<field name="name">silver</field> <field name="name">silver</field>
<field name="question_id" ref="partner_level"/> <field name="question_id" ref="partner_level"/>
</record> </record>
<record model="crm_profiling.answer" id="partner_quality3"> <record model="crm_profiling.answer" id="partner_quality3">
<field name="name">gold</field> <field name="name">gold</field>
<field name="question_id" ref="partner_level"/> <field name="question_id" ref="partner_level"/>
</record> </record>
<record model="crm_profiling.answer" id="partner_tiny1"> <record model="crm_profiling.answer" id="partner_tiny1">
<field name="name">yes</field> <field name="name">yes</field>
<field name="question_id" ref="partner_tiny"/> <field name="question_id" ref="partner_tiny"/>
</record> </record>
<record model="crm_profiling.answer" id="partner_tiny2"> <record model="crm_profiling.answer" id="partner_tiny2">
<field name="name">no</field> <field name="name">no</field>
<field name="question_id" ref="partner_tiny"/> <field name="question_id" ref="partner_tiny"/>
</record> </record>
<!-- <!--
Resource: res.partner.category Resource: res.partner.category
--> -->
<record id="base.res_partner_category_15" model="res.partner.category"> <record id="base.res_partner_category_15" model="res.partner.category">
<field name="name">IT sector</field> <field name="name">IT sector</field>
<field name="parent_id" ref="base.res_partner_category_12"/> <field name="parent_id" ref="base.res_partner_category_12"/>
</record> </record>
<record id="base.res_partner_category_16" model="res.partner.category"> <record id="base.res_partner_category_16" model="res.partner.category">
<field name="name">Telecom sector</field> <field name="name">Telecom sector</field>
<field name="parent_id" ref="base.res_partner_category_12"/> <field name="parent_id" ref="base.res_partner_category_12"/>
</record> </record>
<record id="base.res_partner_category_17" model="res.partner.category"> <record id="base.res_partner_category_17" model="res.partner.category">
<field name="name">HR sector</field> <field name="name">HR sector</field>
<field name="parent_id" ref="base.res_partner_category_12"/> <field name="parent_id" ref="base.res_partner_category_12"/>
</record> </record>
<!-- <!--
Profiles / crm.segmentation Profiles / crm.segmentation
--> -->
<record model="crm.segmentation" id="crm.crm_segmentation0"> <record model="crm.segmentation" id="crm.crm_segmentation0">
<field name="name">OpenERP partners</field> <field name="name">OpenERP partners</field>
<field name="answer_yes" eval="[(6,0,[partner_tiny1])]" /> <field name="answer_yes" eval="[(6,0,[partner_tiny1])]" />
<field name="categ_id" ref="base.res_partner_category_2"/> <field name="categ_id" ref="base.res_partner_category_2"/>
<field name="profiling_active">True</field> <field name="profiling_active">True</field>
</record> </record>
<record model="crm.segmentation" id="crm_segmentation1"> <record model="crm.segmentation" id="crm_segmentation1">
<field name="name">Bronze partners</field> <field name="name">Bronze partners</field>
<field name="answer_yes" eval="[(6,0,[partner_quality1])]" /> <field name="answer_yes" eval="[(6,0,[partner_quality1])]" />
<field name="parent_id" ref="crm.crm_segmentation0"/> <field name="parent_id" ref="crm.crm_segmentation0"/>
<field name="categ_id" ref="base.res_partner_category_3"/> <field name="categ_id" ref="base.res_partner_category_3"/>
<field name="profiling_active">True</field> <field name="profiling_active">True</field>
</record> </record>
<record model="crm.segmentation" id="crm_segmentation2"> <record model="crm.segmentation" id="crm_segmentation2">
<field name="name">Silver partners</field> <field name="name">Silver partners</field>
<field name="answer_yes" eval="[(6,0,[partner_quality2])]" /> <field name="answer_yes" eval="[(6,0,[partner_quality2])]" />
<field name="parent_id" ref="crm.crm_segmentation0"/> <field name="parent_id" ref="crm.crm_segmentation0"/>
<field name="categ_id" ref="base.res_partner_category_4"/> <field name="categ_id" ref="base.res_partner_category_4"/>
<field name="profiling_active">True</field> <field name="profiling_active">True</field>
</record> </record>
<record model="crm.segmentation" id="crm_segmentation3"> <record model="crm.segmentation" id="crm_segmentation3">
<field name="name">Gold partners</field> <field name="name">Gold partners</field>
<field name="answer_yes" eval="[(6,0,[partner_quality3])]" /> <field name="answer_yes" eval="[(6,0,[partner_quality3])]" />
<field name="parent_id" ref="crm.crm_segmentation0"/> <field name="parent_id" ref="crm.crm_segmentation0"/>
<field name="categ_id" ref="base.res_partner_category_5"/> <field name="categ_id" ref="base.res_partner_category_5"/>
<field name="exclusif">True</field> <field name="exclusif">True</field>
<field name="profiling_active">True</field> <field name="profiling_active">True</field>
</record> </record>
<record model="crm.segmentation" id="crm_segmentation4"> <record model="crm.segmentation" id="crm_segmentation4">
<field name="name">HR partners</field> <field name="name">HR partners</field>
<field name="answer_yes" eval="[(6,0,[sector1])]" /> <field name="answer_yes" eval="[(6,0,[sector1])]" />
<field name="categ_id" ref="base.res_partner_category_17"/> <field name="categ_id" ref="base.res_partner_category_17"/>
<field name="profiling_active">True</field> <field name="profiling_active">True</field>
</record> </record>
<record model="crm.segmentation" id="crm_segmentation5"> <record model="crm.segmentation" id="crm_segmentation5">
<field name="name">Telecom partners</field> <field name="name">Telecom partners</field>
<field name="answer_yes" eval="[(6,0,[sector2])]" /> <field name="answer_yes" eval="[(6,0,[sector2])]" />
<field name="categ_id" ref="base.res_partner_category_16"/> <field name="categ_id" ref="base.res_partner_category_16"/>
<field name="profiling_active">True</field> <field name="profiling_active">True</field>
</record> </record>
<record model="crm.segmentation" id="crm_segmentation6"> <record model="crm.segmentation" id="crm_segmentation6">
<field name="name">IT partners</field> <field name="name">IT partners</field>
<field name="answer_yes" eval="[(6,0,[sector3])]" /> <field name="answer_yes" eval="[(6,0,[sector3])]" />
<field name="categ_id" ref="base.res_partner_category_15"/> <field name="categ_id" ref="base.res_partner_category_15"/>
<field name="profiling_active">True</field> <field name="profiling_active">True</field>
</record> </record>
<!-- <!--
Partners Partners
--> -->
<record model="res.partner" id="base.res_partner_asus"> <record model="res.partner" id="base.res_partner_asus">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees2'), ref('sector2'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees2'), ref('sector2'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_16')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_16')])]"/>
</record> </record>
<record model="res.partner" id="base.res_partner_agrolait"> <record model="res.partner" id="base.res_partner_agrolait">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees1'), ref('sector1'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees1'), ref('sector1'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_17')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_17')])]"/>
</record> </record>
<record model="res.partner" id="base.res_partner_c2c"> <record model="res.partner" id="base.res_partner_c2c">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector3'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector3'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_5'), ref('base.res_partner_category_15')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_5'), ref('base.res_partner_category_15')])]"/>
</record> </record>
<record model="res.partner" id="base.res_partner_sednacom"> <record model="res.partner" id="base.res_partner_sednacom">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees1'), ref('sector2'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees1'), ref('sector2'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_16')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_16')])]"/>
</record> </record>
<record model="res.partner" id="base.res_partner_thymbra"> <record model="res.partner" id="base.res_partner_thymbra">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector3'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector3'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_5'), ref('base.res_partner_category_15')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_5'), ref('base.res_partner_category_15')])]"/>
</record> </record>
<record model="res.partner" id="base.res_partner_desertic_hispafuentes"> <record model="res.partner" id="base.res_partner_desertic_hispafuentes">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees2'), ref('sector2'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees2'), ref('sector2'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_16')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_16')])]"/>
</record> </record>
<record model="res.partner" id="base.res_partner_tinyatwork"> <record model="res.partner" id="base.res_partner_tinyatwork">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees1'), ref('sector1'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees1'), ref('sector1'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_17')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_17')])]"/>
</record> </record>
<record model="res.partner" id="base.res_partner_2"> <record model="res.partner" id="base.res_partner_2">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees2'), ref('sector3'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality1'), ref('nb_employees2'), ref('sector3'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_15')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_3'), ref('base.res_partner_category_15')])]"/>
</record> </record>
<record model="res.partner" id="base.res_partner_3"> <record model="res.partner" id="base.res_partner_3">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees1'), ref('sector3'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality2'), ref('nb_employees1'), ref('sector3'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_15')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_4'), ref('base.res_partner_category_15')])]"/>
</record> </record>
<record model="res.partner" id="base.res_partner_4"> <record model="res.partner" id="base.res_partner_4">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees1'), ref('sector2'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees1'), ref('sector2'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_16')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_16')])]"/>
</record> </record>
<record model="res.partner" id="base.res_partner_5"> <record model="res.partner" id="base.res_partner_5">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees2'), ref('sector1'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees2'), ref('sector1'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_17')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_17')])]"/>
</record> </record>
<record model="res.partner" id="base.res_partner_6"> <record model="res.partner" id="base.res_partner_6">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector2'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees3'), ref('sector2'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_16')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_16')])]"/>
</record> </record>
<record model="res.partner" id="base.res_partner_maxtor"> <record model="res.partner" id="base.res_partner_maxtor">
<field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees1'), ref('sector3'), ref('partner_tiny1')])]" /> <field name="answers_ids" eval="[(6,0,[ref('partner_quality3'), ref('nb_employees1'), ref('sector3'), ref('partner_tiny1')])]" />
<field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_15')])]"/> <field name="category_id" eval="[(6,0,[ref('base.res_partner_category_1'), ref('base.res_partner_category_15')])]"/>
</record> </record>
</data> </data>
</openerp> </openerp>

26
addons/crm_profiling/crm_profiling_view.xml
View File

@ -31,8 +31,8 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Questionnaires"> <tree string="Questionnaires">
<field name="name" select="1" colspan="4"/> <field name="name" colspan="4"/>
<field name="description" select="1" colspan="4"/> <field name="description" colspan="4"/>
<field name="questions_ids" colspan="4" nolabel="1"/> <field name="questions_ids" colspan="4" nolabel="1"/>
</tree> </tree>
</field> </field>
@ -46,13 +46,13 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Questionnaires"> <form string="Questionnaires">
<field name="name" select="1" /> <field name="name"/>
<newline/> <newline/>
<separator string="Questions List" colspan="4"/> <separator string="Questions List" colspan="4"/>
<field name="questions_ids" colspan="4" nolabel="1"/> <field name="questions_ids" colspan="4" nolabel="1"/>
<newline/> <newline/>
<separator string="Description" colspan="4"/> <separator string="Description" colspan="4"/>
<field name="description" colspan="4" select="1" nolabel="1"/> <field name="description" colspan="4" nolabel="1"/>
</form> </form>
</field> </field>
</record> </record>
@ -65,8 +65,8 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Answers"> <tree string="Answers">
<field name="question_id" select="1"/> <field name="question_id"/>
<field name="name" select="1"/> <field name="name"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -79,8 +79,8 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Answers"> <form string="Answers">
<field name="question_id" select="1"/> <field name="question_id"/>
<field name="name" select="1"/> <field name="name"/>
</form> </form>
</field> </field>
</record> </record>
@ -93,7 +93,7 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Questions"> <tree string="Questions">
<field name="name" select="1" colspan="4"/> <field name="name" colspan="4"/>
<field name="answers_ids" colspan="4" nolabel="1"/> <field name="answers_ids" colspan="4" nolabel="1"/>
</tree> </tree>
</field> </field>
@ -108,15 +108,15 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Questions"> <form string="Questions">
<newline/> <newline/>
<field name="name" select="1" /> <field name="name"/>
<newline/> <newline/>
<separator string="Avalaible Answers" colspan="4"/> <separator string="Avalaible Answers" colspan="4"/>
<field name="answers_ids" colspan="4" nolabel="1"> <field name="answers_ids" colspan="4" nolabel="1">
<tree string="Answers" editable="bottom"> <tree string="Answers" editable="bottom">
<field name="name" select="1"/> <field name="name"/>
</tree> </tree>
<form string="Answers"> <form string="Answers">
<field name="name" select="1"/> <field name="name"/>
</form> </form>
</field> </field>
</form> </form>
@ -153,7 +153,7 @@
<notebook> <notebook>
<page string="Segmentation"> <page string="Segmentation">
<separator string="Segmentation Description" colspan="4"/> <separator string="Segmentation Description" colspan="4"/>
<field name="name" select="1"/> <field name="name"/>
<field name="exclusif"/> <field name="exclusif"/>
<newline/> <newline/>
<field name="categ_id" colspan="2"/> <field name="categ_id" colspan="2"/>

2
addons/crm_todo/crm_todo_view.xml
View File

@ -58,7 +58,7 @@
id="menu_crm_todo" id="menu_crm_todo"
parent="base.menu_sales" parent="base.menu_sales"
action="crm_todo_action" action="crm_todo_action"
sequence="5"/> sequence="6"/>
</data> </data>

6
addons/document/custom_report.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0"?>
<openerp>
<data>
</data>
</openerp>

4
addons/document/document_view.xml
View File

@ -93,7 +93,7 @@
</group> </group>
<group col="4"> <group col="4">
<field name="ressource_parent_type_id"/> <field name="ressource_parent_type_id"/>
<field name="ressource_id" select="2" readonly="1"/> <field name="ressource_id" readonly="1"/>
</group> </group>
<group col="2" attrs="{'invisible': [('type','!=','ressource'),('ressource_parent_type_id','=',False)]}"> <group col="2" attrs="{'invisible': [('type','!=','ressource'),('ressource_parent_type_id','=',False)]}">
<field name="resource_find_all"/> <field name="resource_find_all"/>
@ -421,7 +421,7 @@
<act_window <act_window
domain="[('parent_id', '=', active_id)]" domain="[('parent_id', '=', active_id)]"
context="{'default_parent_id': active_id}" context="{'default_parent_id': active_id}"
id="zoom_directory" name="Related Documents" id="zoom_directory" name="Related Documents"
res_model="ir.attachment" res_model="ir.attachment"
src_model="document.directory"/> src_model="document.directory"/>
</data> </data>

16
addons/document/report/document_report_view.xml
View File

@ -7,10 +7,10 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Files"> <form string="Files">
<field name="name" select="1"/> <field name="name"/>
<field name="user" select="1"/> <field name="user"/>
<field name="directory" select="1"/> <field name="directory"/>
<field name="datas_fname" select="1"/> <field name="datas_fname"/>
<field name="file_size"/> <field name="file_size"/>
<field name="create_date"/> <field name="create_date"/>
</form> </form>
@ -24,10 +24,10 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Files"> <tree string="Files">
<field name="name" select="1"/> <field name="name"/>
<field name="month" select="1"/> <field name="month"/>
<field name="user" select="1" invisible="1"/> <field name="user" invisible="1"/>
<field name="directory" select="1" invisible="1"/> <field name="directory" invisible="1"/>
<field name="file_size" invisible="1"/> <field name="file_size" invisible="1"/>
<field name="create_date" invisible="1"/> <field name="create_date" invisible="1"/>
<field name="nbr"/> <field name="nbr"/>

4
addons/document_ftp/wizard/ftp_configuration_view.xml
View File

@ -18,8 +18,8 @@
<attribute name="string">Knowledge Application Configuration</attribute> <attribute name="string">Knowledge Application Configuration</attribute>
</form> </form>
<group string="res_config_contents" position="replace"> <group string="res_config_contents" position="replace">
<separator string="Configure FTP Server" /> <separator string="Configure FTP Server" />
<label string="Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself.."/> <label string="Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself.."/>
<field name="host"/> <field name="host"/>
</group> </group>
</data> </data>

18
addons/document_webdav/webdav_demo.xml
View File

@ -2,19 +2,19 @@
<openerp> <openerp>
<data> <data>
<record id="document_webdav_dir_property_nodeclass0" model="document.webdav.dir.property"> <record id="document_webdav_dir_property_nodeclass0" model="document.webdav.dir.property">
<field name="namespace">debug:</field> <field name="namespace">debug:</field>
<field name="name">node_class</field> <field name="name">node_class</field>
<field name="value">%(node_classname)s</field> <field name="value">%(node_classname)s</field>
<field eval="1" name="do_subst"/> <field eval="1" name="do_subst"/>
</record> </record>
<!-- <!--
<record id="document_webdav_dir_property_debug0" model="document.webdav.dir.property"> <record id="document_webdav_dir_property_debug0" model="document.webdav.dir.property">
<field name="namespace">debug:</field> <field name="namespace">debug:</field>
<field name="name">node_context</field> <field name="name">node_context</field>
<field name="value">%r</field> <field name="value">%r</field>
<! dash dash This will expose the whole context at the property !> <! dash dash This will expose the whole context at the property !>
<field eval="1" name="do_subst"/> <field eval="1" name="do_subst"/>
</record> </record>
--> -->

10
addons/email_template/i18n/nl.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-10 18:29+0000\n" "PO-Revision-Date: 2012-07-02 15:02+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" "Last-Translator: Erwin <Unknown>\n"
"Language-Team: Dutch <nl@li.org>\n" "Language-Team: Dutch <nl@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n" "X-Launchpad-Export-Date: 2012-07-03 05:36+0000\n"
"X-Generator: Launchpad (build 15505)\n" "X-Generator: Launchpad (build 15531)\n"
#. module: email_template #. module: email_template
#: field:email.template,subtype:0 #: field:email.template,subtype:0
@ -192,7 +192,7 @@ msgstr ""
#. module: email_template #. module: email_template
#: model:ir.model,name:email_template.model_mail_compose_message #: model:ir.model,name:email_template.model_mail_compose_message
msgid "Email composition wizard" msgid "Email composition wizard"
msgstr "" msgstr "E-mail samenstellen wizard"
#. module: email_template #. module: email_template
#: view:email.template:0 #: view:email.template:0

4
addons/email_template/wizard/email_template_preview_view.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<!-- Email Template Preview --> <!-- Email Template Preview -->
<record model="ir.ui.view" id="email_template_preview_form"> <record model="ir.ui.view" id="email_template_preview_form">
<field name="name">email_template.preview.form</field> <field name="name">email_template.preview.form</field>
@ -44,5 +44,5 @@
<field name="context">{'template_id':active_id}</field> <field name="context">{'template_id':active_id}</field>
</record> </record>
</data> </data>
</openerp> </openerp>

2
addons/event/__openerp__.py
View File

@ -39,7 +39,7 @@ Note that:
Association / Configuration / Types of Events Association / Configuration / Types of Events
""", """,
'author': 'OpenERP SA', 'author': 'OpenERP SA',
'depends': ['email_template','google_map'], 'depends': ['base_setup', 'board', 'email_template', 'google_map'],
'init_xml': [], 'init_xml': [],
'update_xml': [ 'update_xml': [
'security/event_security.xml', 'security/event_security.xml',

14
addons/event/event.py
View File

@ -271,13 +271,6 @@ class event_event(osv.osv):
# OpenChatter methods and notifications # OpenChatter methods and notifications
# ---------------------------------------- # ----------------------------------------
def get_needaction_user_ids(self, cr, uid, ids, context=None):
result = dict.fromkeys(ids, [])
for obj in self.browse(cr, uid, ids, context=context):
if obj.state == 'draft' and obj.user_id:
result[obj.id] = [obj.user_id.id]
return result
def create_send_note(self, cr, uid, ids, context=None): def create_send_note(self, cr, uid, ids, context=None):
message = _("Event has been <b>created</b>.") message = _("Event has been <b>created</b>.")
self.message_append_note(cr, uid, ids, body=message, context=context) self.message_append_note(cr, uid, ids, body=message, context=context)
@ -451,13 +444,6 @@ class event_registration(osv.osv):
# OpenChatter methods and notifications # OpenChatter methods and notifications
# ---------------------------------------- # ----------------------------------------
def get_needaction_user_ids(self, cr, uid, ids, context=None):
result = dict.fromkeys(ids, [])
for obj in self.browse(cr, uid, ids, context=context):
if obj.state == 'draft' and obj.user_id:
result[obj.id] = [obj.user_id.id]
return result
def create_send_note(self, cr, uid, ids, context=None): def create_send_note(self, cr, uid, ids, context=None):
message = _("Registration has been <b>created</b>.") message = _("Registration has been <b>created</b>.")
self.message_append_note(cr, uid, ids, body=message, context=context) self.message_append_note(cr, uid, ids, body=message, context=context)

121
addons/event/event_view.xml
View File

@ -47,6 +47,43 @@
<!-- Events Organisation/CONFIGURATION/EVENTS --> <!-- Events Organisation/CONFIGURATION/EVENTS -->
<!-- Event Read/Unread actions -->
<record id="actions_server_event_event_unread" model="ir.actions.server">
<field name="name">Mark unread</field>
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="model_id" ref="model_event_event"/>
<field name="state">code</field>
<field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
</record>
<record id="action_event_event_unread" model="ir.values">
<field name="name">action_event_event_unread</field>
<field name="action_id" ref="actions_server_event_event_unread"/>
<field name="value" eval="'ir.actions.server,' + str(ref('actions_server_event_event_unread'))" />
<field name="key">action</field>
<field name="model_id" ref="model_event_event" />
<field name="model">event.event</field>
<field name="key2">client_action_multi</field>
</record>
<record id="actions_server_event_event_read" model="ir.actions.server">
<field name="name">Mark read</field>
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="model_id" ref="model_event_event"/>
<field name="state">code</field>
<field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
</record>
<record id="action_event_event_read" model="ir.values">
<field name="name">action_event_event_read</field>
<field name="action_id" ref="actions_server_event_event_read"/>
<field name="value" eval="'ir.actions.server,' + str(ref('actions_server_event_event_read'))" />
<field name="key">action</field>
<field name="model_id" ref="model_event_event" />
<field name="model">event.event</field>
<field name="key2">client_action_multi</field>
</record>
<record model="ir.ui.view" id="view_event_form"> <record model="ir.ui.view" id="view_event_form">
<field name="name">Events</field> <field name="name">Events</field>
<field name="model">event.event</field> <field name="model">event.event</field>
@ -120,7 +157,7 @@
<group col="8" colspan="4"> <group col="8" colspan="4">
<separator string="" colspan="4"/> <separator string="" colspan="4"/>
<newline/> <newline/>
<field name="state" select="1" colspan="2"/> <field name="state" colspan="2"/>
<button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/> <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
<button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/> <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/> <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
@ -130,9 +167,9 @@
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
<div class="oe_sheet_width"> <footer>
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/> <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</div> </footer>
</form> </form>
</field> </field>
</record> </record>
@ -144,7 +181,7 @@
<field name="model">event.event</field> <field name="model">event.event</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Events" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'"> <tree string="Events" fonts="bold:needaction_pending==True" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'">
<field name="name" string="Name"/> <field name="name" string="Name"/>
<field name="type"/> <field name="type"/>
<field name="date_begin"/> <field name="date_begin"/>
@ -155,6 +192,7 @@
<field name="main_speaker_id" groups="base.extended"/> <field name="main_speaker_id" groups="base.extended"/>
<field name="user_id"/> <field name="user_id"/>
<field name="state"/> <field name="state"/>
<field name="needaction_pending" invisible="1"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -264,6 +302,11 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Events"> <search string="Events">
<filter icon="terp-mail-message-new"
string="Inbox" help="Unread messages"
name="needaction_pending"
domain="[('needaction_pending','=',True)]"/>
<separator orientation="vertical"/>
<group> <group>
<field name="name" string="Events"/> <field name="name" string="Events"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
@ -330,12 +373,49 @@
<!-- EVENTS/REGISTRATIONS/EVENTS --> <!-- EVENTS/REGISTRATIONS/EVENTS -->
<!-- Registration Read/Unread actions -->
<record id="actions_server_event_registration_unread" model="ir.actions.server">
<field name="name">Mark unread</field>
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="model_id" ref="model_event_registration"/>
<field name="state">code</field>
<field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
</record>
<record id="action_event_registration_unread" model="ir.values">
<field name="name">action_event_registration_unread</field>
<field name="action_id" ref="actions_server_event_registration_unread"/>
<field name="value" eval="'ir.actions.server,' + str(ref('actions_server_event_registration_unread'))" />
<field name="key">action</field>
<field name="model_id" ref="model_event_registration" />
<field name="model">event.registration</field>
<field name="key2">client_action_multi</field>
</record>
<record id="actions_server_event_registration_read" model="ir.actions.server">
<field name="name">Mark read</field>
<field name="condition">True</field>
<field name="type">ir.actions.server</field>
<field name="model_id" ref="model_event_registration"/>
<field name="state">code</field>
<field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
</record>
<record id="action_event_registration_read" model="ir.values">
<field name="name">action_event_registration_read</field>
<field name="action_id" ref="actions_server_event_registration_read"/>
<field name="value" eval="'ir.actions.server,' + str(ref('actions_server_event_registration_read'))" />
<field name="key">action</field>
<field name="model_id" ref="model_event_registration" />
<field name="model">event.registration</field>
<field name="key2">client_action_multi</field>
</record>
<record model="ir.ui.view" id="view_event_registration_tree"> <record model="ir.ui.view" id="view_event_registration_tree">
<field name="name">event.registration.tree</field> <field name="name">event.registration.tree</field>
<field name="model">event.registration</field> <field name="model">event.registration</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Registration" > <tree string="Registration" fonts="bold:needaction_pending==True">
<field name="create_date"/> <field name="create_date"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="name"/> <field name="name"/>
@ -345,6 +425,7 @@
<field name="user_id"/> <field name="user_id"/>
<field name="origin"/> <field name="origin"/>
<field name="state"/> <field name="state"/>
<field name="needaction_pending" invisible="1"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -360,9 +441,9 @@
<button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/> <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
<button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" /> <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/> <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
<field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/> <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
</header> </header>
<sheet string="Registration" layout="auto"> <sheet string="Registration">
<group col="6" colspan="4"> <group col="6" colspan="4">
<field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/> <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
<field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/> <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
@ -387,19 +468,6 @@
</group> </group>
</page> </page>
<page string="Emails"> <page string="Emails">
<!--
<field name="message_ids" colspan="4" nolabel="1" mode="tree">
<tree string="History">
<field name="display_text" string="History Information"/>
<field name="reply_to" invisible="1"/>
<button
string="Reply" attrs="{'invisible': [('reply_to', '=', False)]}"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
</tree>
</field>
-->
<button string="Send New Email" <button string="Send New Email"
name="%(mail.action_email_compose_message_wizard)d" name="%(mail.action_email_compose_message_wizard)d"
icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/> icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
@ -407,9 +475,9 @@
</notebook> </notebook>
</sheet> </sheet>
<div class="oe_sheet_width"> <footer>
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/> <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</div> </footer>
</form> </form>
</field> </field>
</record> </record>
@ -449,6 +517,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Event Registration"> <search string="Event Registration">
<group> <group>
<filter icon="terp-mail-message-new"
string="Inbox" help="Unread messages"
name="needaction_pending"
domain="[('needaction_pending','=',True)]"/>
<separator orientation="vertical"/>
<field name="name" string="Participant" <field name="name" string="Participant"
filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/> filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>

2
addons/event/security/event_security.xml
View File

@ -8,7 +8,7 @@
<field name="sequence">3</field> <field name="sequence">3</field>
</record> </record>
<record id="group_event_user" model="res.groups"> <record id="group_event_user" model="res.groups">
<field name="name">User</field> <field name="name">User</field>
<field name="category_id" ref="module_category_event_management"/> <field name="category_id" ref="module_category_event_management"/>
</record> </record>

12
addons/fetchmail/fetchmail.py
View File

@ -151,7 +151,7 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
connection = server.connect() connection = server.connect()
server.write({'state':'done'}) server.write({'state':'done'})
except Exception, e: except Exception, e:
logger.exception("Failed to connect to %s server %s", server.type, server.name) _logger.exception("Failed to connect to %s server %s", server.type, server.name)
raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e)) raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e))
finally: finally:
try: try:
@ -177,7 +177,7 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
mail_thread = self.pool.get('mail.thread') mail_thread = self.pool.get('mail.thread')
action_pool = self.pool.get('ir.actions.server') action_pool = self.pool.get('ir.actions.server')
for server in self.browse(cr, uid, ids, context=context): for server in self.browse(cr, uid, ids, context=context):
logger.info('start checking for new emails on %s server %s', server.type, server.name) _logger.info('start checking for new emails on %s server %s', server.type, server.name)
context.update({'fetchmail_server_id': server.id, 'server_type': server.type}) context.update({'fetchmail_server_id': server.id, 'server_type': server.type})
count = 0 count = 0
imap_server = False imap_server = False
@ -198,9 +198,9 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
imap_server.store(num, '+FLAGS', '\\Seen') imap_server.store(num, '+FLAGS', '\\Seen')
cr.commit() cr.commit()
count += 1 count += 1
logger.info("fetched/processed %s email(s) on %s server %s", count, server.type, server.name) _logger.info("fetched/processed %s email(s) on %s server %s", count, server.type, server.name)
except Exception, e: except Exception, e:
logger.exception("Failed to fetch mail from %s server %s", server.type, server.name) _logger.exception("Failed to fetch mail from %s server %s", server.type, server.name)
finally: finally:
if imap_server: if imap_server:
imap_server.close() imap_server.close()
@ -222,9 +222,9 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]}) action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
pop_server.dele(num) pop_server.dele(num)
cr.commit() cr.commit()
logger.info("fetched/processed %s email(s) on %s server %s", numMsgs, server.type, server.name) _logger.info("fetched/processed %s email(s) on %s server %s", numMsgs, server.type, server.name)
except Exception, e: except Exception, e:
logger.exception("Failed to fetch mail from %s server %s", server.type, server.name) _logger.exception("Failed to fetch mail from %s server %s", server.type, server.name)
finally: finally:
if pop_server: if pop_server:
pop_server.quit() pop_server.quit()

1
addons/fetchmail/res_config.py
View File

@ -85,6 +85,7 @@ class fetchmail_config_settings(osv.osv_memory):
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'res_model': 'fetchmail.server', 'res_model': 'fetchmail.server',
'view_mode': 'form', 'view_mode': 'form',
'target': 'current',
} }
model_name = self._columns[field].fetchmail_model model_name = self._columns[field].fetchmail_model
model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', model_name)])[0] model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', model_name)])[0]

6
addons/google_map/i18n/ar.po
View File

@ -13,12 +13,11 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n" "X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 14763)\n" "X-Generator: Launchpad (build 15520)\n"
#. module: google_map #. module: google_map
#: view:res.partner:0 #: view:res.partner:0
#: view:res.partner.address:0
msgid "Map" msgid "Map"
msgstr "خريطة جوجل" msgstr "خريطة جوجل"
@ -29,7 +28,6 @@ msgstr "عناوين الشريك"
#. module: google_map #. module: google_map
#: view:res.partner:0 #: view:res.partner:0
#: view:res.partner.address:0
msgid "Street2 : " msgid "Street2 : "
msgstr "شارع 2: " msgstr "شارع 2: "

6
addons/google_map/i18n/bg.po
View File

@ -13,12 +13,11 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n" "X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 14763)\n" "X-Generator: Launchpad (build 15520)\n"
#. module: google_map #. module: google_map
#: view:res.partner:0 #: view:res.partner:0
#: view:res.partner.address:0
msgid "Map" msgid "Map"
msgstr "Карта" msgstr "Карта"
@ -29,7 +28,6 @@ msgstr "Адрес на партньора"
#. module: google_map #. module: google_map
#: view:res.partner:0 #: view:res.partner:0
#: view:res.partner.address:0
msgid "Street2 : " msgid "Street2 : "
msgstr "Улица2 : " msgstr "Улица2 : "

6
addons/google_map/i18n/br.po
View File

@ -14,12 +14,11 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n" "X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 14763)\n" "X-Generator: Launchpad (build 15520)\n"
#. module: google_map #. module: google_map
#: view:res.partner:0 #: view:res.partner:0
#: view:res.partner.address:0
msgid "Map" msgid "Map"
msgstr "Kartenn" msgstr "Kartenn"
@ -30,7 +29,6 @@ msgstr ""
#. module: google_map #. module: google_map
#: view:res.partner:0 #: view:res.partner:0
#: view:res.partner.address:0
msgid "Street2 : " msgid "Street2 : "
msgstr "Straed2 : " msgstr "Straed2 : "

10
addons/google_map/i18n/bs.po
View File

@ -13,23 +13,21 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n" "X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 14763)\n" "X-Generator: Launchpad (build 15520)\n"
#. module: google_map #. module: google_map
#: view:res.partner:0 #: view:res.partner:0
#: view:res.partner.address:0
msgid "Map" msgid "Map"
msgstr "" msgstr "Mapa"
#. module: google_map #. module: google_map
#: model:ir.model,name:google_map.model_res_partner_address #: model:ir.model,name:google_map.model_res_partner_address
msgid "Partner Addresses" msgid "Partner Addresses"
msgstr "" msgstr "Adrese partnera"
#. module: google_map #. module: google_map
#: view:res.partner:0 #: view:res.partner:0
#: view:res.partner.address:0
msgid "Street2 : " msgid "Street2 : "
msgstr "" msgstr ""

Some files were not shown because too many files have changed in this diff Show More