[MERGE] new menu structure

bzr revid: hmo@tinyerp.com-20100117055734-gyzsham0dpza2dck
This commit is contained in:
Harry (Open ERP) 2010-01-17 11:27:34 +05:30
commit 9e2b2cf239
97 changed files with 939 additions and 751 deletions

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# #
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################

View File

@ -349,6 +349,18 @@
<field name="context">{'type':'out_invoice'}</field> <field name="context">{'type':'out_invoice'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/> <field name="search_view_id" ref="view_account_invoice_filter"/>
</record> </record>
<record id="action_invoice_tree_panding_invoice" model="ir.actions.act_window">
<field name="name">Panding Invoice</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="view_id" ref="invoice_tree"/>
<field name="context">{'type':'out_invoice'}</field>
<field name="domain">[('state','=','draft')]</field>
<!-- <field name="search_view_id" ref="view_account_invoice_filter"/>-->
</record>
<record id="action_invoice_tree_view1" model="ir.actions.act_window.view"> <record id="action_invoice_tree_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/> <field eval="1" name="sequence"/>
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
@ -360,7 +372,7 @@
<field name="view_id" ref="invoice_form"/> <field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree"/> <field name="act_window_id" ref="action_invoice_tree"/>
</record> </record>
<menuitem action="action_invoice_tree" id="menu_finance_invoice" parent="account.menu_finance"/> <menuitem action="action_invoice_tree" id="menu_finance_invoice" parent="account.menu_finance" sequence="2"/>
<record id="action_invoice_tree1" model="ir.actions.act_window"> <record id="action_invoice_tree1" model="ir.actions.act_window">
<field name="name">Customer Invoices</field> <field name="name">Customer Invoices</field>

View File

@ -3,16 +3,17 @@
<data> <data>
<menuitem icon="terp-account" id="menu_finance" name="Financial Management"/> <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="1"/> <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="8"/>
<menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/> <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>
<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/> <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/> <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="8"/> <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="7"/>
<menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance" sequence="8"/> <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="account.menu_finance_reporting" sequence="1"/>
<menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance_reporting" sequence="2"/>
<menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/> <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>
<menuitem id="menu_finance_entries" name="Making Entries" parent="account.menu_finance" sequence="2" <menuitem id="menu_finance_entries" name="Accounting" parent="account.menu_finance" sequence="1"
groups="group_account_user"/> groups="group_account_user"/>
<menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="account.menu_finance_entries" sequence="15"/> <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="account.menu_finance_entries" sequence="15"/>

View File

@ -28,8 +28,8 @@
<menuitem <menuitem
id="menu_tax_report" id="menu_tax_report"
name="Taxes Reports" name="Taxes"
parent="account.menu_finance_reporting"/> parent="account.menu_finance_generic_reporting" sequence="3"/>
<wizard <wizard
id="wizard_vat_declaration" id="wizard_vat_declaration"

View File

@ -955,7 +955,7 @@
<field name="view_id" ref="view_move_tree"/> <field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_account_move_filter"/> <field name="search_view_id" ref="view_account_move_filter"/>
</record> </record>
<menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_reporting"/> <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>
<menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/> <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
<record id="action_move_line_form_encode_by_move" model="ir.actions.act_window"> <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
@ -991,7 +991,7 @@
</record> </record>
<menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/> <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>
<menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="7"/> <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
<wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/> <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
<menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/> <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
@ -1111,7 +1111,7 @@
<field name="res_model">account.journal.period</field> <field name="res_model">account.journal.period</field>
<field name="view_type">tree</field> <field name="view_type">tree</field>
</record> </record>
<menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_reporting"/> <menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_generic_reporting" sequence="2"/>
<!-- <!--

View File

@ -67,7 +67,7 @@
<!-- Aged partner balance --> <!-- Aged partner balance -->
<wizard id="wizard_aged_trial_balance" menu="False" model="res.partner" name="account.aged.trial.balance" string="Aged Partner Balance"/> <wizard id="wizard_aged_trial_balance" menu="False" model="res.partner" name="account.aged.trial.balance" string="Aged Partner Balance"/>
<menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_reporting"/> <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
<menuitem icon="STOCK_PRINT" action="wizard_aged_trial_balance" id="menu_aged_trial_balance" parent="next_id_22" type="wizard"/> <menuitem icon="STOCK_PRINT" action="wizard_aged_trial_balance" id="menu_aged_trial_balance" parent="next_id_22" type="wizard"/>
<!-- report-related wizards --> <!-- report-related wizards -->
@ -114,7 +114,7 @@
<wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General Journal" /> <wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General Journal" />
<menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" /> <menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />
<wizard id="wizard_invoice_currency_change" model="account.invoice" name="account.invoice.currency_change" string="Change Currency" groups="base.group_user"/> <wizard id="wizard_invoice_currency_change" model="account.invoice" name="account.invoice.currency_change" string="Change Currency" groups="base.group_user"/>
</data> </data>
</openerp> </openerp>

View File

@ -129,7 +129,7 @@
<wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/> <wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
<menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/> <menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
<menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/> <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
<menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/> <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>
<record id="view_account_analytic_line_form" model="ir.ui.view"> <record id="view_account_analytic_line_form" model="ir.ui.view">

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# #
@ -16,7 +16,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
@ -47,15 +47,15 @@ def _record_to_report_line(record):
} }
class account_tax_code_report(rml_parse.rml_parse): class account_tax_code_report(rml_parse.rml_parse):
#_name = 'report.account.tax.code.entries' _name = 'report.account.tax.code.entries'
def __init__(self, cr, uid, name, context): def __init__(self, cr, uid, name, context):
super(account_tax_code_report, self).__init__(cr, uid, name, context=context) super(account_tax_code_report, self).__init__(cr, uid, name, context=context)
self.localcontext.update({ self.localcontext.update({
'time': time, 'time': time,
'get_line':self.get_line, 'get_line':self.get_line,
}) })
def get_line(self, obj): def get_line(self, obj):
line_ids = self.pool.get('account.move.line').search(self.cr, self.uid, [('tax_code_id','=',obj.id)]) line_ids = self.pool.get('account.move.line').search(self.cr, self.uid, [('tax_code_id','=',obj.id)])
if not line_ids: return [] if not line_ids: return []

View File

@ -7,7 +7,7 @@
<field name="res_model">account.budget.post</field> <field name="res_model">account.budget.post</field>
<field name="view_type">tree</field> <field name="view_type">tree</field>
</record> </record>
<menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_reporting"/> <menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
<!-- <!--
Budgets Budgets
@ -57,8 +57,8 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="view_budget_post_tree"/> <field name="view_id" ref="view_budget_post_tree"/>
</record> </record>
<menuitem id="next_id_31" name="Budgets" parent="account.menu_finance"/> <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="5"/>
<menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31"/> <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31" sequence="2"/>
<record model="ir.ui.view" id="view_budget_post_form"> <record model="ir.ui.view" id="view_budget_post_form">
@ -70,7 +70,7 @@
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="code" select="1"/> <field name="code" select="1"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="sequence" select="2"/> <field name="sequence" select="2"/>
<notebook colspan="4"> <notebook colspan="4">
<page string="Accounts"> <page string="Accounts">
<field name="account_ids" colspan="4" nolabel="1"/> <field name="account_ids" colspan="4" nolabel="1"/>
@ -187,7 +187,7 @@
</record> </record>
<menuitem parent="next_id_31" <menuitem parent="next_id_31"
id="menu_act_crossovered_budget_view" id="menu_act_crossovered_budget_view"
action="act_crossovered_budget_view" /> action="act_crossovered_budget_view" sequence="1" />
<record model="ir.ui.view" id="view_crossovered_budget_line_tree"> <record model="ir.ui.view" id="view_crossovered_budget_line_tree">
<field name="name">crossovered.budget.line.tree</field> <field name="name">crossovered.budget.line.tree</field>

View File

@ -36,7 +36,7 @@
</field> </field>
</record> </record>
<menuitem id="menu_main" name="Payment" parent="account.menu_finance"/> <menuitem id="menu_main" name="Payment" parent="account.menu_finance" sequence="6"/>
<record id="view_payment_type_form" model="ir.ui.view"> <record id="view_payment_type_form" model="ir.ui.view">
<field name="name">payment.type.form</field> <field name="name">payment.type.form</field>
@ -51,7 +51,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="action_payment_type_tree" model="ir.actions.act_window"> <record id="action_payment_type_tree" model="ir.actions.act_window">
<field name="name">Payment Type</field> <field name="name">Payment Type</field>
<field name="res_model">payment.type</field> <field name="res_model">payment.type</field>
@ -91,11 +91,11 @@
</record> </record>
<menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration"/> <menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration"/>
<menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="next_id_44"/> <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="next_id_44"/>
<menuitem action="action_payment_type_tree" id="menu_action_paymen_type" parent="next_id_44"/> <menuitem action="action_payment_type_tree" id="menu_action_paymen_type" parent="next_id_44"/>
<record id="view_payment_order_form" model="ir.ui.view"> <record id="view_payment_order_form" model="ir.ui.view">
<field name="name">payment.order.form</field> <field name="name">payment.order.form</field>
<field name="model">payment.order</field> <field name="model">payment.order</field>
@ -144,7 +144,7 @@
</page> </page>
</notebook> </notebook>
</form> </form>
<tree string="Payment Line"> <tree string="Payment Line">
<field name="ml_inv_ref" /> <field name="ml_inv_ref" />
<field name="partner_id" select="1"/> <field name="partner_id" select="1"/>
<field name="bank_id" domain="[('partner_id', '=', partner_id)]"/> <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
@ -201,7 +201,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft')]</field> <field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/> <field name="filter" eval="True"/>
</record> </record>
<record id="action_payment_order_open" model="ir.actions.act_window"> <record id="action_payment_order_open" model="ir.actions.act_window">
@ -210,7 +210,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="domain">[('state','=','open')]</field> <field name="domain">[('state','=','open')]</field>
<field name="filter" eval="True"/> <field name="filter" eval="True"/>
</record> </record>
<record id="action_payment_order_tree_new" model="ir.actions.act_window"> <record id="action_payment_order_tree_new" model="ir.actions.act_window">
<field name="name">New Payment Order</field> <field name="name">New Payment Order</field>
@ -269,7 +269,7 @@
<field name="type">tree</field> <field name="type">tree</field>
<field eval="4" name="priority"/> <field eval="4" name="priority"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Payment Line"> <tree string="Payment Line">
<field name="order_id"/> <field name="order_id"/>
<field name="ml_inv_ref" /> <field name="ml_inv_ref" />
<field name="ml_maturity_date"/> <field name="ml_maturity_date"/>

View File

@ -91,7 +91,7 @@
<field name="view_id" ref="view_account_report_tree_simple"/> <field name="view_id" ref="view_account_report_tree_simple"/>
</record> </record>
<menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="account.menu_finance_configuration"/> <menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="account.menu_finance_configuration" sequence="20"/>
<record id="view_account_report_tree" model="ir.ui.view"> <record id="view_account_report_tree" model="ir.ui.view">
<field name="name">account.report.report.tree</field> <field name="name">account.report.report.tree</field>
@ -116,7 +116,7 @@
<field name="view_id" ref="view_account_report_tree"/> <field name="view_id" ref="view_account_report_tree"/>
<field name="domain">[('parent_id','=',False)]</field> <field name="domain">[('parent_id','=',False)]</field>
</record> </record>
<menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="account.menu_finance_reporting"/> <menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="account.menu_finance_generic_reporting" sequence="5"/>
<record id="action_account_report_tree_view_fiscal" model="ir.actions.act_window"> <record id="action_account_report_tree_view_fiscal" model="ir.actions.act_window">

View File

@ -16,7 +16,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record model="ir.ui.view" id="view_voucher_form"> <record model="ir.ui.view" id="view_voucher_form">
<field name="name">account.voucher.form</field> <field name="name">account.voucher.form</field>
<field name="model">account.voucher</field> <field name="model">account.voucher</field>
@ -69,7 +69,7 @@
</form> </form>
</field> </field>
</record> </record>
<record model="ir.actions.act_window" id="action_voucher_list"> <record model="ir.actions.act_window" id="action_voucher_list">
<field name="name">Vouchers</field> <field name="name">Vouchers</field>
<field name="res_model">account.voucher</field> <field name="res_model">account.voucher</field>
@ -77,9 +77,9 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" eval="view_voucher_tree"/> <field name="view_id" eval="view_voucher_tree"/>
</record> </record>
<menuitem action="action_voucher_list" id="menu_action_voucher_list" <menuitem action="action_voucher_list" id="menu_action_voucher_list"
name="Voucher Entries" parent="account.menu_finance"/> name="Voucher Entries" parent="account.menu_finance_entries" sequence="60"/>
<!-- Receipt Vouchers --> <!-- Receipt Vouchers -->
<record model="ir.actions.act_window" id="action_receipt_vou_voucher_list"> <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
<field name="name">Receipt Vouchers</field> <field name="name">Receipt Vouchers</field>
@ -90,9 +90,9 @@
<field name="domain">[('type','like','rec_voucher')]</field> <field name="domain">[('type','like','rec_voucher')]</field>
<field name="context">{'type':'rec_voucher'}</field> <field name="context">{'type':'rec_voucher'}</field>
</record> </record>
<menuitem name="Receipt Vouchers" id="menu_action_receipt_vou_voucher_list" <menuitem name="Receipt Vouchers" id="menu_action_receipt_vou_voucher_list"
action="action_receipt_vou_voucher_list" parent="menu_action_voucher_list"/> action="action_receipt_vou_voucher_list" parent="menu_action_voucher_list"/>
<record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list"> <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">
<field name="name">Cash Receipt</field> <field name="name">Cash Receipt</field>
<field name="res_model">account.voucher</field> <field name="res_model">account.voucher</field>
@ -102,9 +102,9 @@
<field name="domain">[('type','=','rec_voucher')]</field> <field name="domain">[('type','=','rec_voucher')]</field>
<field name="context">{'type':'rec_voucher'}</field> <field name="context">{'type':'rec_voucher'}</field>
</record> </record>
<menuitem name="Cash Receipts" id="menu_action_receipt_cashreceipt_voucher_list" <menuitem name="Cash Receipts" id="menu_action_receipt_cashreceipt_voucher_list"
action="action_receipt_cashreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/> action="action_receipt_cashreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>
<record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list"> <record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">
<field name="name">Bank Receipt</field> <field name="name">Bank Receipt</field>
<field name="res_model">account.voucher</field> <field name="res_model">account.voucher</field>
@ -114,12 +114,12 @@
<field name="domain">[('type','=','bank_rec_voucher')]</field> <field name="domain">[('type','=','bank_rec_voucher')]</field>
<field name="context">{'type':'bank_rec_voucher'}</field> <field name="context">{'type':'bank_rec_voucher'}</field>
</record> </record>
<menuitem name="Bank Receipts" id="menu_action_receipt_bakreceipt_voucher_list" <menuitem name="Bank Receipts" id="menu_action_receipt_bakreceipt_voucher_list"
action="action_receipt_bakreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/> action="action_receipt_bakreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>
<!-- End Receipt Vouchers --> <!-- End Receipt Vouchers -->
<!-- Payment Vouchers --> <!-- Payment Vouchers -->
<record model="ir.actions.act_window" id="action_payments_voucher_list"> <record model="ir.actions.act_window" id="action_payments_voucher_list">
<field name="name">Payment Vouchers</field> <field name="name">Payment Vouchers</field>
@ -130,9 +130,9 @@
<field name="domain">[('type','like','pay_voucher')]</field> <field name="domain">[('type','like','pay_voucher')]</field>
<field name="context">{'type':'pay_voucher'}</field> <field name="context">{'type':'pay_voucher'}</field>
</record> </record>
<menuitem name="Payment Vouchers" id="menu_action_payments_voucher_list" <menuitem name="Payment Vouchers" id="menu_action_payments_voucher_list"
action="action_payments_voucher_list" parent="menu_action_voucher_list"/> action="action_payments_voucher_list" parent="menu_action_voucher_list"/>
<record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list"> <record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">
<field name="name">Payment Vouchers</field> <field name="name">Payment Vouchers</field>
<field name="res_model">account.voucher</field> <field name="res_model">account.voucher</field>
@ -142,9 +142,9 @@
<field name="domain">[('type','=','pay_voucher')]</field> <field name="domain">[('type','=','pay_voucher')]</field>
<field name="context">{'type':'pay_voucher'}</field> <field name="context">{'type':'pay_voucher'}</field>
</record> </record>
<menuitem name="Cash Payments" id="menu_action_payments_cashpay_voucher_list" <menuitem name="Cash Payments" id="menu_action_payments_cashpay_voucher_list"
action="action_payments_cashpay_voucher_list" parent="menu_action_payments_voucher_list"/> action="action_payments_cashpay_voucher_list" parent="menu_action_payments_voucher_list"/>
<record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list"> <record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">
<field name="name">Payment Vouchers</field> <field name="name">Payment Vouchers</field>
<field name="res_model">account.voucher</field> <field name="res_model">account.voucher</field>
@ -154,11 +154,11 @@
<field name="domain">[('type','=','bank_pay_voucher')]</field> <field name="domain">[('type','=','bank_pay_voucher')]</field>
<field name="context">{'type':'bank_pay_voucher'}</field> <field name="context">{'type':'bank_pay_voucher'}</field>
</record> </record>
<menuitem name="Bank Payments" id="menu_action_payments_bankpay_voucher_list" <menuitem name="Bank Payments" id="menu_action_payments_bankpay_voucher_list"
action="action_payments_bankpay_voucher_list" parent="menu_action_payments_voucher_list"/> action="action_payments_bankpay_voucher_list" parent="menu_action_payments_voucher_list"/>
<!-- End Payment Vouchers --> <!-- End Payment Vouchers -->
<!-- Other Voucher Enries --> <!-- Other Voucher Enries -->
<record model="ir.actions.act_window" id="action_other_voucher_list"> <record model="ir.actions.act_window" id="action_other_voucher_list">
<field name="name">Other Vouchers</field> <field name="name">Other Vouchers</field>
@ -167,9 +167,9 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" eval="view_voucher_tree"/> <field name="view_id" eval="view_voucher_tree"/>
</record> </record>
<menuitem name="Other Vouchers" id="menu_action_other_voucher_list" <menuitem name="Other Vouchers" id="menu_action_other_voucher_list"
action="action_other_voucher_list" parent="menu_action_voucher_list"/> action="action_other_voucher_list" parent="menu_action_voucher_list"/>
<record model="ir.actions.act_window" id="action_view_cont_voucher_form"> <record model="ir.actions.act_window" id="action_view_cont_voucher_form">
<field name="name">Contra Voucher</field> <field name="name">Contra Voucher</field>
<field name="res_model">account.voucher</field> <field name="res_model">account.voucher</field>
@ -179,9 +179,9 @@
<field name="domain">[('type','=','cont_voucher')]</field> <field name="domain">[('type','=','cont_voucher')]</field>
<field name="context">{'type':'cont_voucher'}</field> <field name="context">{'type':'cont_voucher'}</field>
</record> </record>
<menuitem name="Contra Voucher" id="menu_action_view_cont_voucher_form" <menuitem name="Contra Voucher" id="menu_action_view_cont_voucher_form"
action="action_view_cont_voucher_form" parent="menu_action_other_voucher_list"/> action="action_view_cont_voucher_form" parent="menu_action_other_voucher_list"/>
<record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form"> <record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form">
<field name="name">Journal Sale Voucher</field> <field name="name">Journal Sale Voucher</field>
<field name="res_model">account.voucher</field> <field name="res_model">account.voucher</field>
@ -191,9 +191,9 @@
<field name="domain">[('type','=','journal_sale_vou')]</field> <field name="domain">[('type','=','journal_sale_vou')]</field>
<field name="context">{'type':'journal_sale_vou'}</field> <field name="context">{'type':'journal_sale_vou'}</field>
</record> </record>
<menuitem name="Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form" <menuitem name="Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form"
action="action_view_jour_sale_voucher_form" parent="menu_action_other_voucher_list"/> action="action_view_jour_sale_voucher_form" parent="menu_action_other_voucher_list"/>
<record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form"> <record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">
<field name="name">Journal Purchase Voucher</field> <field name="name">Journal Purchase Voucher</field>
<field name="res_model">account.voucher</field> <field name="res_model">account.voucher</field>
@ -203,9 +203,9 @@
<field name="domain">[('type','=','journal_pur_voucher')]</field> <field name="domain">[('type','=','journal_pur_voucher')]</field>
<field name="context">{'type':'journal_pur_voucher'}</field> <field name="context">{'type':'journal_pur_voucher'}</field>
</record> </record>
<menuitem name="Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form" <menuitem name="Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form"
action="action_view_jour_pur_voucher_form" parent="menu_action_other_voucher_list"/> action="action_view_jour_pur_voucher_form" parent="menu_action_other_voucher_list"/>
<record model="ir.actions.act_window" id="action_view_jour_voucher_form"> <record model="ir.actions.act_window" id="action_view_jour_voucher_form">
<field name="name">Journal Voucher</field> <field name="name">Journal Voucher</field>
<field name="res_model">account.voucher</field> <field name="res_model">account.voucher</field>
@ -215,8 +215,8 @@
<field name="domain">[('type','=','journal_voucher')]</field> <field name="domain">[('type','=','journal_voucher')]</field>
<field name="context">{'type':'journal_voucher'}</field> <field name="context">{'type':'journal_voucher'}</field>
</record> </record>
<menuitem <menuitem
name="Journal Voucher" id="menu_action_view_jour_voucher_form" name="Journal Voucher" id="menu_action_view_jour_voucher_form"
action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/> action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/>
</data> </data>

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# #
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
@ -40,7 +40,7 @@
""", """,
'author': 'Tiny', 'author': 'Tiny',
'website': 'http://www.openerp.com', 'website': 'http://www.openerp.com',
'depends': ['base', 'process'], 'depends': ['base','process','sale'],
'init_xml': [], 'init_xml': [],
'update_xml': [ 'update_xml': [
'security/ir.model.access.csv', 'security/ir.model.access.csv',

View File

@ -65,7 +65,7 @@
<field name="email" widget="email"/> <field name="email" widget="email"/>
<field name="extension"/> <field name="extension"/>
<field name="other"/> <field name="other"/>
</group> </group>
</form> </form>
<tree string="Functions and Addresses"> <tree string="Functions and Addresses">
<field name="sequence_contact" string="Seq."/> <field name="sequence_contact" string="Seq."/>
@ -90,7 +90,7 @@
</page> </page>
<page string="Picture"> <page string="Picture">
<field name="photo" nolabel="1" colspan="2" widget="image"/> <field name="photo" nolabel="1" colspan="2" widget="image"/>
</page> </page>
</notebook> </notebook>
</form> </form>
</field> </field>
@ -108,7 +108,7 @@
</search> </search>
</field> </field>
</record> </record>
<record model="ir.actions.act_window" id="action_partner_contact_form"> <record model="ir.actions.act_window" id="action_partner_contact_form">
<field name="name">Contacts</field> <field name="name">Contacts</field>
<field name="res_model">res.partner.contact</field> <field name="res_model">res.partner.contact</field>
@ -117,8 +117,8 @@
<field name="view_id" ref="view_partner_contact_tree"/> <field name="view_id" ref="view_partner_contact_tree"/>
<field name="search_view_id" ref="view_partner_contact_search"/> <field name="search_view_id" ref="view_partner_contact_search"/>
</record> </record>
<menuitem name="Partners/" id="menu_partner_contact_form" action="action_partner_contact_form"/> <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
<menuitem name="Partners/Addresses" id="base.menu_partner_address_form"/> <menuitem name="Addresses" id="base.menu_partner_address_form" parent = "base.menu_address_book" sequence="3"/>
<!-- Views for Partners --> <!-- Views for Partners -->
@ -141,7 +141,7 @@
<field name="country_id" select="2" completion="1"/> <field name="country_id" select="2" completion="1"/>
<field name="state_id" select="2"/> <field name="state_id" select="2"/>
</group> </group>
<group string="Communication" colspan="2" col="2"> <group string="Communication" colspan="2" col="2">
<field name="phone"/> <field name="phone"/>
<field name="fax"/> <field name="fax"/>
<field name="email" widget="email"/> <field name="email" widget="email"/>
@ -159,17 +159,17 @@
</tree> </tree>
<form string="Contacts"> <form string="Contacts">
<group string="Partner" colspan="2" col="2"> <group string="Partner" colspan="2" col="2">
<field name="sequence_partner"/> <field name="sequence_partner"/>
<field name="name"/> <field name="name"/>
<field name="contact_id"/> <field name="contact_id"/>
<field name="function_id"/> <field name="function_id"/>
</group> </group>
<group string="Communication" colspan="2" col="2"> <group string="Communication" colspan="2" col="2">
<field name="phone"/> <field name="phone"/>
<field name="fax"/> <field name="fax"/>
<field name="extension"/> <field name="extension"/>
<field name="other"/> <field name="other"/>
<field name="email" widget="email"/> <field name="email" widget="email"/>
<field name="extension"/> <field name="extension"/>
<field name="other"/> <field name="other"/>
</group> </group>
@ -188,8 +188,8 @@
</field> </field>
</field> </field>
</record> </record>
<!-- don't display the categories, since it is displayed in an other tab--> <!-- don't display the categories, since it is displayed in an other tab-->
<record model="ir.ui.view" id="view_partner_form_inherit2"> <record model="ir.ui.view" id="view_partner_form_inherit2">
<field name="name">res.partner.form</field> <field name="name">res.partner.form</field>
@ -341,7 +341,7 @@
</group> </group>
</field> </field>
</record> </record>
<record id="view_res_partner_address_filter" model="ir.ui.view"> <record id="view_res_partner_address_filter" model="ir.ui.view">
<field name="name">res.partner.address.select</field> <field name="name">res.partner.address.select</field>
<field name="model">res.partner.address</field> <field name="model">res.partner.address</field>
@ -353,7 +353,7 @@
</search> </search>
</field> </field>
</record> </record>
<!-- Views for res.partner.job --> <!-- Views for res.partner.job -->
<record model="ir.ui.view" id="view_partner_job_tree"> <record model="ir.ui.view" id="view_partner_job_tree">
<field name="name">res.partner.job.tree</field> <field name="name">res.partner.job.tree</field>
@ -408,11 +408,11 @@
<field name="res_model">res.partner.job</field> <field name="res_model">res.partner.job</field>
<field name="view_type">form</field> <field name="view_type">form</field>
</record> </record>
<menuitem <!-- <menuitem-->
name="Partners/Contact's Jobs" <!-- name="Partners/Contact's Jobs"-->
action="action_res_partner_job" <!-- action="action_res_partner_job"-->
id="menu_action_res_partner_job" <!-- id="menu_action_res_partner_job"-->
groups="base.group_extended"/> <!-- groups="base.group_extended"/>-->
<!-- Act window defining a shorcut on partners to open all his contacts --> <!-- Act window defining a shorcut on partners to open all his contacts -->
<act_window domain="[('name', '=', active_id)]" <act_window domain="[('name', '=', active_id)]"
@ -420,6 +420,7 @@
res_model="res.partner.job" res_model="res.partner.job"
src_model="res.partner" src_model="res.partner"
/> />
<menuitem name="Contacts" id="menu_procurement_mgt_partner_contact_form" action="action_partner_contact_form"
parent="purchase.menu_procurement_management_supplier"/>
</data> </data>
</openerp> </openerp>

View File

@ -5,13 +5,13 @@
<!-- <!--
Process Process
--> -->
<record id="process_process_basecontactprocess0" model="process.process"> <record id="process_process_basecontactprocess0" model="process.process">
<field eval="&quot;&quot;&quot;Base Contact&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Base Contact&quot;&quot;&quot;" name="name"/>
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field name="model_id" ref="base_contact.model_res_partner_contact"/> <field name="model_id" ref="base_contact.model_res_partner_contact"/>
</record> </record>
<!-- <!--
Process node Process node
--> -->
@ -37,7 +37,7 @@
</record> </record>
<record id="process_node_function0" model="process.node"> <record id="process_node_function0" model="process.node">
<field name="menu_id" ref="base_contact.menu_action_res_partner_job"/> <!-- <field name="menu_id" ref="base_contact.menu_action_res_partner_job"/>-->
<field name="model_id" ref="base_contact.model_res_partner_job"/> <field name="model_id" ref="base_contact.model_res_partner_job"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Jobs at a same partner address.&quot;&quot;&quot;" name="note"/> <field eval="&quot;&quot;&quot;Jobs at a same partner address.&quot;&quot;&quot;" name="note"/>
@ -55,7 +55,7 @@
<field name="process_id" ref="process_process_basecontactprocess0"/> <field name="process_id" ref="process_process_basecontactprocess0"/>
<field eval="0" name="flow_start"/> <field eval="0" name="flow_start"/>
</record> </record>
<!-- <!--
Process Transition Process Transition
--> -->
@ -86,6 +86,6 @@
<field model="process.node" name="target_node_id" ref="process_node_addresses0"/> <field model="process.node" name="target_node_id" ref="process_node_addresses0"/>
<field model="process.node" name="source_node_id" ref="process_node_partners0"/> <field model="process.node" name="source_node_id" ref="process_node_partners0"/>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -14,7 +14,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record model="ir.ui.view" id="base_report_creator_tree"> <record model="ir.ui.view" id="base_report_creator_tree">
<field name="name">base_report_creator.report.tree</field> <field name="name">base_report_creator.report.tree</field>
<field name="model">base_report_creator.report</field> <field name="model">base_report_creator.report</field>
@ -104,9 +104,12 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem <menuitem
name="Custom Reports" id="menu_custom_reports"
action="base_report_creator_action" parent="board.dashboard_menu" sequence="1"/>
<menuitem
name="Custom Reports" parent="board.next_id_50" name="Custom Reports" parent="board.next_id_50"
id="menu_base_report_creator_action_config" id="menu_base_report_creator_action_config"
action="base_report_creator_action"/> action="base_report_creator_action"/>
<record model="ir.ui.view" id="base_report_creator_tree_simple"> <record model="ir.ui.view" id="base_report_creator_tree_simple">
@ -123,9 +126,9 @@
<field name="res_model">base_report_creator.report</field> <field name="res_model">base_report_creator.report</field>
<field name="view_type">tree</field> <field name="view_type">tree</field>
</record> </record>
<menuitem <menuitem
name="Custom Reports" parent="board.dashboard_menu" name="Custom Reports" parent="menu_custom_reports"
id="menu_base_report_creator_action" id="menu_base_report_creator_action"
action="base_report_creator_action_tree"/> action="base_report_creator_action_tree"/>
<wizard <wizard

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem icon="terp-graph" id="dashboard_menu" name="Dashboards"/> <menuitem icon="terp-graph" id="dashboard_menu" name="Reporting"/>
<menuitem icon="terp-graph" id="dashboard" name="Dashboards" sequence="2" parent="dashboard_menu"/>
<record id="view_board_note_tree" model="ir.ui.view"> <record id="view_board_note_tree" model="ir.ui.view">
<field name="name">board.note.tree</field> <field name="name">board.note.tree</field>
<field name="model">board.note</field> <field name="model">board.note</field>
@ -34,13 +34,8 @@
<field name="view_mode">form,tree</field> <field name="view_mode">form,tree</field>
</record> </record>
<menuitem action="action_view_board_note_form" id="menu_view_board_note_form" parent="board.dashboard_menu"
sequence="100"
groups="base.group_system" />
<wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu"/> <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu"/>
<record id="view_board_tree" model="ir.ui.view"> <record id="view_board_tree" model="ir.ui.view">
<field name="name">board.board.tree</field> <field name="name">board.board.tree</field>
<field name="model">board.board</field> <field name="model">board.board</field>
@ -90,11 +85,14 @@
name="Configuration" name="Configuration"
parent="board.dashboard_menu" parent="board.dashboard_menu"
groups="base.group_system" groups="base.group_system"
sequence="0"/> sequence="3"/>
<menuitem <menuitem
action="action_view_board_list_form" action="action_view_board_list_form"
id="menu_view_board_form" id="menu_view_board_form"
parent="next_id_50"/> parent="next_id_50"/>
<menuitem action="action_view_board_note_form" id="menu_view_board_note_form" parent="next_id_50"
sequence="100"
groups="base.group_system" />
<act_window context="{'view': active_id}" id="dashboard_open" multi="True" name="Open Dashboard" res_model="board.board" src_model="board.board"/> <act_window context="{'view': active_id}" id="dashboard_open" multi="True" name="Open Dashboard" res_model="board.board" src_model="board.board"/>
</data> </data>

View File

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<record id="note_account_type" model="board.note.type"> <record id="note_account_type" model="board.note.type">
<field name="name">Accountants</field> <field name="name">Accountants</field>
</record> </record>
<record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window"> <record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window">
<field name="name">Costs to invoice</field> <field name="name">Costs to invoice</field>
<field name="res_model">report.account.analytic.line.to.invoice</field> <field name="res_model">report.account.analytic.line.to.invoice</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">graph,tree</field> <field name="view_mode">graph,tree</field>
</record> </record>
<record id="action_aged_receivable" model="ir.actions.act_window"> <record id="action_aged_receivable" model="ir.actions.act_window">
<field name="name">Receivable Accounts</field> <field name="name">Receivable Accounts</field>
<field name="res_model">report.account.receivable</field> <field name="res_model">report.account.receivable</field>
@ -27,10 +27,10 @@
<field name="view_mode">graph,tree</field> <field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','income')]</field> <field name="domain">[('type','=','income')]</field>
</record> </record>
<act_window domain="[('state','&lt;&gt;','close'),('partner_id','&lt;&gt;',False),('to_invoice', '&lt;&gt;', False)]" id="act_my_account" name="Accounts to invoice" res_model="account.analytic.account" src_model="res.users" view_mode="tree,form" view_type="form"/> <act_window domain="[('state','&lt;&gt;','close'),('partner_id','&lt;&gt;',False),('to_invoice', '&lt;&gt;', False)]" id="act_my_account" name="Accounts to invoice" res_model="account.analytic.account" src_model="res.users" view_mode="tree,form" view_type="form"/>
<record id="board_account_form" model="ir.ui.view"> <record id="board_account_form" model="ir.ui.view">
<field name="name">board.account.form</field> <field name="name">board.account.form</field>
<field name="model">board.board</field> <field name="model">board.board</field>
@ -38,31 +38,31 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Account Board"> <form string="Account Board">
<hpaned> <hpaned>
<child1> <child1>
<action colspan="4" height="160" name="%(report_analytic.action_analytic_account_tree)d" string="Analytic accounts to close" width="510"/> <action colspan="4" height="160" name="%(report_analytic.action_analytic_account_tree)d" string="Analytic accounts to close" width="510"/>
<action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/> <action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
<action colspan="4" height="160" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/> <action colspan="4" height="160" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
</child1> </child1>
<child2> <child2>
<button colspan="4" icon="terp-purchase" name="%(account_report.action_account_report_tree_view_indicator)d" string="My indicators" type="action"/> <button colspan="4" icon="terp-purchase" name="%(account_report.action_account_report_tree_view_indicator)d" string="My indicators" type="action"/>
<action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/> <action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
<action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/> <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
<action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/>
</child2> </child2>
</hpaned> </hpaned>
</form> </form>
</field> </field>
</record> </record>
<record id="open_board_account" model="ir.actions.act_window"> <record id="open_board_account" model="ir.actions.act_window">
<field name="name">Accounting Dashboard</field> <field name="name">Accounting Dashboard</field>
<field name="res_model">board.board</field> <field name="res_model">board.board</field>
@ -71,8 +71,8 @@
<field name="usage">menu</field> <field name="usage">menu</field>
<field name="view_id" ref="board_account_form"/> <field name="view_id" ref="board_account_form"/>
</record> </record>
<menuitem id="next_id_68" name="Accounting" parent="board.dashboard_menu" <menuitem id="next_id_68" name="Accounting" parent="board.dashboard"
groups="account.group_account_manager"/> groups="account.group_account_manager"/>
<menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/> <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/>
</data> </data>

View File

@ -35,7 +35,7 @@
string="New members" string="New members"
name="%(membership.action_report_partner_member_year_tree)d" name="%(membership.action_report_partner_member_year_tree)d"
view_mode="graph,tree" colspan="4"/> view_mode="graph,tree" colspan="4"/>
<action <action
string="Registrations by Events" string="Registrations by Events"
name="%(event.action_event_type_registration)d" name="%(event.action_event_type_registration)d"
view_mode="graph,tree" view_mode="graph,tree"
@ -54,8 +54,9 @@
<field name="view_id" ref="board_associations_manager_form"/> <field name="view_id" ref="board_associations_manager_form"/>
</record> </record>
<menuitem id="board_associations" name="Associations" parent="board.dashboard" />
<menuitem <menuitem
name="Associations" parent="board.dashboard_menu" name="Associations" parent="board_associations"
action="open_board_associations_manager" action="open_board_associations_manager"
sequence="1" sequence="1"
id="menu_board_associations_manager" id="menu_board_associations_manager"

View File

@ -14,7 +14,7 @@
<hpaned position="100"> <hpaned position="100">
<child1> <child1>
<action <action
string="Latest objects" string="Latest objects"
name="%(auction.action_report_latest_objects_manager_tree)d" name="%(auction.action_report_latest_objects_manager_tree)d"
@ -49,12 +49,12 @@
string="Min/Adj/Max" string="Min/Adj/Max"
name="%(auction.action_report_auction_estimation_adj_category_manager_tree)d" name="%(auction.action_report_auction_estimation_adj_category_manager_tree)d"
view_mode="graph,tree" colspan="4" /> view_mode="graph,tree" colspan="4" />
<action <action
string="Objects by day" string="Objects by day"
name="%(auction.action_report_auction_object_date_tree)d" name="%(auction.action_report_auction_object_date_tree)d"
view_mode="graph,tree" colspan="4" /> view_mode="graph,tree" colspan="4" />
</child2> </child2>
</hpaned> </hpaned>
</form> </form>
@ -70,11 +70,12 @@
<field name="view_id" ref="board_auction_manager_form1"/> <field name="view_id" ref="board_auction_manager_form1"/>
</record> </record>
<menuitem name="Auction Manager" id="board_menu_auction_manager" parent="board.dashboard" />
<menuitem <menuitem
name="Dashboards/Auction/Auction Manager" name="Auction Manager"
action="open_board_auction_manager" action="open_board_auction_manager"
sequence="1" sequence="1"
id="menu_board_auction_manager"/> id="menu_board_auction_manager" parent="board_menu_auction_manager"/>
</data> </data>
</openerp> </openerp>

View File

@ -59,11 +59,12 @@
<field name="view_id" ref="board_auction_manager_form"/> <field name="view_id" ref="board_auction_manager_form"/>
</record> </record>
<menuitem name="Auction Member" id="board_menu_auction_member" parent="board.dashboard" />
<menuitem <menuitem
name="Dashboards/Auction/Auction Member" name="Auction Member"
action="open_board_auction" action="open_board_auction"
sequence="1" sequence="1"
id="menu_board_auction"/> id="menu_board_auction" parent="board_menu_auction_member" />
</data> </data>
</openerp> </openerp>

View File

@ -111,7 +111,7 @@
</record> </record>
<menuitem <menuitem
name="CRM Configuration" parent="board.dashboard_menu" name="CRM Configuration" parent="board.dashboard"
id="menu_board_crm_config" id="menu_board_crm_config"
groups="crm.group_crm_manager"/> groups="crm.group_crm_manager"/>
<menuitem <menuitem

View File

@ -15,7 +15,7 @@
<field name="nbr" operator="+"/> <field name="nbr" operator="+"/>
</graph> </graph>
</field> </field>
</record> </record>
<record model="ir.actions.act_window" id="act_my_leads"> <record model="ir.actions.act_window" id="act_my_leads">
<field name="res_model">crm.case</field> <field name="res_model">crm.case</field>

View File

@ -18,7 +18,7 @@
name="%(report_document.action_view_all_document_tree1)d" name="%(report_document.action_view_all_document_tree1)d"
view_mode="tree" view_mode="tree"
domain="[('name','=',time.strftime('%%Y-%%m-01'))]"/> domain="[('name','=',time.strftime('%%Y-%%m-01'))]"/>
<action <action
string="File Size by Month" string="File Size by Month"
name="%(report_document.action_view_size_month)d" name="%(report_document.action_view_size_month)d"
@ -28,8 +28,8 @@
<action <action
string="Files by Resource Type" string="Files by Resource Type"
name="%(report_document.action_view_document_by_resourcetype_graph)d" name="%(report_document.action_view_document_by_resourcetype_graph)d"
view_mode="graph,tree"/> view_mode="graph,tree"/>
<action <action
string="Files by Partner" string="Files by Partner"
name="%(report_document.action_view_files_by_partner)d" name="%(report_document.action_view_files_by_partner)d"
@ -53,7 +53,7 @@
<menuitem <menuitem
name="Document" name="Document"
id="menu_board_document" id="menu_board_document"
parent="board.dashboard_menu" parent="board.dashboard"
groups="document.group_document_manager"/> groups="document.group_document_manager"/>
@ -76,7 +76,7 @@
string="Wall of Shame" string="Wall of Shame"
name="%(report_document.action_view_wall)d" name="%(report_document.action_view_wall)d"
view_mode="tree"/> view_mode="tree"/>
</child1> </child1>
<child2> <child2>
<action <action

View File

@ -39,7 +39,7 @@
<menuitem <menuitem
id="next_id_87" id="next_id_87"
name="Production" name="Production"
parent="board.dashboard_menu" parent="board.dashboard"
groups="mrp.group_mrp_manager"/> groups="mrp.group_mrp_manager"/>
<menuitem <menuitem
action="open_board_manufacturing" action="open_board_manufacturing"

View File

@ -80,7 +80,7 @@
<menuitem <menuitem
id="next_id_86" id="next_id_86"
name="Project" name="Project"
parent="board.dashboard_menu"/> parent="board.dashboard"/>
<menuitem <menuitem
action="open_board_project" action="open_board_project"
icon="terp-graph" icon="terp-graph"

View File

@ -4,7 +4,7 @@
<record id="note_sale_type" model="board.note.type"> <record id="note_sale_type" model="board.note.type">
<field name="name">Sales</field> <field name="name">Sales</field>
</record> </record>
<record id="board_sales_manager_form" model="ir.ui.view"> <record id="board_sales_manager_form" model="ir.ui.view">
<field name="name">board.sales.manager.form</field> <field name="name">board.sales.manager.form</field>
<field name="model">board.board</field> <field name="model">board.board</field>
@ -17,7 +17,7 @@
<action colspan="4" name="%(report_sale.action_order_sale_list)d" string="Top ten sales of the month"/> <action colspan="4" name="%(report_sale.action_order_sale_list)d" string="Top ten sales of the month"/>
<action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases statistics"/> <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases statistics"/>
</child1> </child1>
<child2> <child2>
<action colspan="4" name="%(report_sale.action_order_category_tree_all)d" string="Average Sales by Category of Products(this month)" view_mode="graph,tree"/> <action colspan="4" name="%(report_sale.action_order_category_tree_all)d" string="Average Sales by Category of Products(this month)" view_mode="graph,tree"/>
<action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases of the month" view_mode="graph,tree"/> <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases of the month" view_mode="graph,tree"/>
@ -26,7 +26,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="open_board_sales_manager" model="ir.actions.act_window"> <record id="open_board_sales_manager" model="ir.actions.act_window">
<field name="name">Sale Dashboard</field> <field name="name">Sale Dashboard</field>
<field name="res_model">board.board</field> <field name="res_model">board.board</field>
@ -34,8 +34,8 @@
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="board_sales_manager_form"/> <field name="view_id" ref="board_sales_manager_form"/>
</record> </record>
<menuitem id="next_id_88" name="Sales" parent="board.dashboard_menu"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/> <menuitem id="next_id_88" name="Sales" parent="board.dashboard"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/>
</data> </data>
</openerp> </openerp>

View File

@ -21,9 +21,9 @@
{ {
'name': 'Customer & Supplier Relationship Management', 'name': 'Customer & Supplier Relationship Management',
'version': '1.0', 'version': '1.0',
'category': 'Generic Modules/CRM & SRM', 'category': 'Generic Modules/CRM & SRM',
'description': """The generic Open ERP Customer Relationship Management 'description': """The generic Open ERP Customer Relationship Management
system enables a group of people to intelligently and efficiently manage system enables a group of people to intelligently and efficiently manage
leads, opportunities, tasks, issues, requests, bugs, campaign, claims, etc. leads, opportunities, tasks, issues, requests, bugs, campaign, claims, etc.
@ -59,6 +59,7 @@ between mails and Open ERP.""",
'crm_opportunity_data.xml', 'crm_opportunity_data.xml',
'crm_phonecall_data.xml', 'crm_phonecall_data.xml',
], ],
'update_xml': [ 'update_xml': [
'crm_wizard.xml', 'crm_wizard.xml',
'crm_view.xml', 'crm_view.xml',
@ -85,8 +86,9 @@ between mails and Open ERP.""",
#'crm_report.xml', #'crm_report.xml',
'security/crm_security.xml', 'security/crm_security.xml',
#'security/ir.model.access.csv', #'security/ir.model.access.csv',
'process/crm_configuration_process.xml' 'process/crm_configuration_process.xml'
], ],
'demo_xml': [ 'demo_xml': [
'crm_demo.xml', 'crm_demo.xml',
'crm_claims_demo.xml', 'crm_claims_demo.xml',

View File

@ -1,8 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<menuitem id="menu_aftersale" name="After-Sale Services" parent="crm.menu_crm"/> <!-- <menuitem id="menu_aftersale" name="After-Sale Services" parent="crm.menu_crm"/>-->
######################## CLAIMS (menu) ########################### ######################## CLAIMS (menu) ###########################
<record model="ir.actions.act_window" id="crm_case_categ_claim0"> <record model="ir.actions.act_window" id="crm_case_categ_claim0">
<field name="name">All Claims</field> <field name="name">All Claims</field>
@ -11,14 +11,14 @@
<field name="view_mode">tree,calendar,form,graph</field> <field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_claims_tree_view"/> <field name="view_id" ref="crm_case_claims_tree_view"/>
<field name="context" eval="{'default_state':'open'}"/> <field name="context" eval="{'default_state':'open'}"/>
<field name="search_view_id" ref="crm.view_crm_case_claims_filter"/> <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0"> <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
<field name="sequence" eval="1"/> <field name="sequence" eval="1"/>
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_claims_tree_view"/> <field name="view_id" ref="crm_case_claims_tree_view"/>
<field name="act_window_id" ref="crm_case_categ_claim0"/> <field name="act_window_id" ref="crm_case_categ_claim0"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0"> <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
<field name="sequence" eval="2"/> <field name="sequence" eval="2"/>
<field name="view_mode">calendar</field> <field name="view_mode">calendar</field>
@ -36,8 +36,10 @@
<field name="view_mode">graph</field> <field name="view_mode">graph</field>
<field name="view_id" ref="crm_case_graph_view_stage_cost"/> <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
<field name="act_window_id" ref="crm_case_categ_claim0"/> <field name="act_window_id" ref="crm_case_categ_claim0"/>
</record> </record>
<menuitem name="Claims" id="menu_crm_case_claims" parent="menu_aftersale" action="crm_case_categ_claim0"/>
<!-- <menuitem name="Claims" id="menu_crm_case_claims" parent="menu_aftersale" action="crm_case_categ_claim0"/>-->
</data> </data>
</openerp> </openerp>

View File

@ -1,14 +1,14 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<!-- MENU --> <!-- MENU -->
<record model="ir.actions.act_window" id="crm_case_category_act_fund_all1"> <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
<field name="name">All Funds</field> <field name="name">All Funds</field>
<field name="res_model">crm.fundraising</field> <field name="res_model">crm.fundraising</field>
<field name="view_mode">tree,form,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="crm.crm_case_tree_view_fund"/> <field name="view_id" ref="crm.crm_case_tree_view_fund"/>
<field name="context" eval="{'default_state':'open'}"/> <field name="context" eval="{'default_state':'open'}"/>
<field name="search_view_id" ref="crm.view_crm_case_fund_filter"/> <field name="search_view_id" ref="crm.view_crm_case_fund_filter"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1"> <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
<field name="sequence" eval="1"/> <field name="sequence" eval="1"/>
@ -29,7 +29,7 @@
<field name="act_window_id" ref="crm_case_category_act_fund_all1"/> <field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
</record> </record>
<menuitem name="Fund Raising" id="menu_crm_case_fund_raise" parent="crm.menu_crm" action="crm_case_category_act_fund_all1"/> <!-- <menuitem name="Fund Raising" id="menu_crm_case_fund_raise" parent="crm.menu_crm" action="crm_case_category_act_fund_all1"/>-->
</data> </data>
</openerp> </openerp>

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">
<menuitem id="menu_aftersale" name="After-Sale Services" parent="crm.menu_crm"/> <!-- <menuitem id="menu_aftersale" name="After-Sale Services" parent="crm.menu_crm"/>-->
######################## Help Desk (menu) ########################### ######################## Help Desk (menu) ###########################
<record model="ir.actions.act_window" id="crm_case_helpdesk_act111"> <record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
@ -11,7 +11,7 @@
<field name="view_id" ref="crm_case_tree_view_helpdesk"/> <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+')]'"/> <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+')]'"/>
<field name="context" eval="{'default_state':'open'}"/> <field name="context" eval="{'default_state':'open'}"/>
<field name="search_view_id" ref="crm.view_crm_case_filter"/> <field name="search_view_id" ref="crm.view_crm_case_filter"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111"> <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
<field name="sequence" eval="1"/> <field name="sequence" eval="1"/>
@ -31,8 +31,8 @@
<field name="view_id" ref="crm_case_form_view_helpdesk"/> <field name="view_id" ref="crm_case_form_view_helpdesk"/>
<field name="act_window_id" ref="crm_case_helpdesk_act111"/> <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
</record> </record>
<menuitem name="Helpdesk and Support" id="menu_help_support_main" parent="menu_aftersale" action="crm_case_helpdesk_act111"/> <!-- <menuitem name="Helpdesk and Support" id="menu_help_support_main" parent="menu_aftersale" action="crm_case_helpdesk_act111"/> -->
</data> </data>
</openerp> </openerp>

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/> <!-- <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>-->
<!-- MENU --> <!-- MENU -->
@ -25,7 +25,8 @@
<field name="view_id" ref="crm_case_form_view_leads"/> <field name="view_id" ref="crm_case_form_view_leads"/>
<field name="act_window_id" ref="crm_case_category_act_leads_all"/> <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
</record> </record>
<menuitem parent="menu_presale" name="Leads" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all"/> <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
<menuitem parent="base.menu_sales" name="Leads" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all" sequence="1"/>
<!-- REPORTS --> <!-- REPORTS -->

View File

@ -12,7 +12,7 @@
/> />
<record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner"> <record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">
<field name="context" eval="{'default_state':'open'}"/> <field name="context" eval="{'default_state':'open'}"/>
</record> </record>
@ -55,11 +55,11 @@
src_model="crm.case" src_model="crm.case"
view_mode="calendar,tree,form,gantt" view_mode="calendar,tree,form,gantt"
context="{'default_case_id': active_id, 'default_duration': 4.0}" context="{'default_case_id': active_id, 'default_duration': 4.0}"
/> />
<record model="ir.actions.act_window" id="crm_case_categ_meet_case"> <record model="ir.actions.act_window" id="crm_case_categ_meet_case">
<field name="context" eval="{'default_state':'open'}"/> <field name="context" eval="{'default_state':'open'}"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_case"> <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_case">
<field name="sequence" eval="1"/> <field name="sequence" eval="1"/>
@ -91,7 +91,7 @@
<field name="view_mode">calendar,tree,form,gantt</field> <field name="view_mode">calendar,tree,form,gantt</field>
<field name="view_id" ref="crm_case_calendar_view_meet"/> <field name="view_id" ref="crm_case_calendar_view_meet"/>
<field name="context" eval="{'default_state':'open'}"/> <field name="context" eval="{'default_state':'open'}"/>
<field name="search_view_id" ref="view_crm_case_meetings_filter"/> <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet"> <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
<field name="sequence" eval="1"/> <field name="sequence" eval="1"/>
@ -104,7 +104,7 @@
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_tree_view_meet"/> <field name="view_id" ref="crm_case_tree_view_meet"/>
<field name="act_window_id" ref="crm_case_categ_meet"/> <field name="act_window_id" ref="crm_case_categ_meet"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form__meet"> <record model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
<field name="sequence" eval="3"/> <field name="sequence" eval="3"/>
<field name="view_mode">form</field> <field name="view_mode">form</field>
@ -117,16 +117,13 @@
<field name="view_id" ref="crm_case_gantt_view_meet"/> <field name="view_id" ref="crm_case_gantt_view_meet"/>
<field name="act_window_id" ref="crm_case_categ_meet"/> <field name="act_window_id" ref="crm_case_categ_meet"/>
</record> </record>
<menuitem parent="crm.menu_crm" name="Calendar" id="menu_crm_case_category_act_meetings"/> <!-- <menuitem parent="crm.menu_crm" name="Calendar" id="menu_crm_case_category_act_meetings"/>-->
<menuitem parent="crm.menu_crm_case_category_act_meetings"
name="My Invitations" id="menu_crm_meetings_invitation"
action="caldav.action_view_attendee_form" />
<!-- <!--
ALL MEETINGS ALL MEETINGS
--> -->
<menuitem name="All Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_crm_case_category_act_meetings"/> <menuitem name="Meetings" id="menu_meeting_sale" parent="base.menu_base_partner" sequence="3"/>
<menuitem name="Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1"/>
<record model="ir.actions.act_window" id="crm_case_category_act_meetall3"> <record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
<field name="name">Next Meetings</field> <field name="name">Next Meetings</field>

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/> <!-- <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>-->
<record model="ir.actions.act_window" id="crm_case_category_act_oppor11"> <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
<field name="name">All Opportunities</field> <field name="name">All Opportunities</field>
@ -29,8 +29,8 @@
<field name="view_id" ref="crm_case_graph_view_opportunity"/> <field name="view_id" ref="crm_case_graph_view_opportunity"/>
<field name="act_window_id" ref="crm_case_category_act_oppor11"/> <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
</record> </record>
<menuitem name="Opportunities" id="menu_crm_case_opp" parent="menu_presale" action="crm_case_category_act_oppor11"/><!-- <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
<menuitem name="Opportunities" id="menu_crm_case_opp" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="2"/><!--
MENU MENU

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<act_window <act_window
id="crm_case_categ_phone_create_partner" id="crm_case_categ_phone_create_partner"
name="Schedule Phone Call" name="Schedule Phone Call"
@ -11,14 +11,14 @@
context="{'default_partner_id': active_id, 'default_duration': 1.0}" context="{'default_partner_id': active_id, 'default_duration': 1.0}"
/> />
######################## PHONE CALLS (menu) ########################### ######################## PHONE CALLS (menu) ###########################
<record model="ir.actions.act_window" id="crm_case_categ_phone0"> <record model="ir.actions.act_window" id="crm_case_categ_phone0">
<field name="name">Phone Calls</field> <field name="name">Phone Calls</field>
<field name="res_model">crm.phonecall</field> <field name="res_model">crm.phonecall</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,calendar</field> <field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_phone_tree_view"/> <field name="view_id" ref="crm_case_phone_tree_view"/>
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/> <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone0"> <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone0">
@ -26,7 +26,7 @@
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_phone_tree_view"/> <field name="view_id" ref="crm_case_phone_tree_view"/>
<field name="act_window_id" ref="crm_case_categ_phone0"/> <field name="act_window_id" ref="crm_case_categ_phone0"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone0"> <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone0">
<field name="sequence" eval="2"/> <field name="sequence" eval="2"/>
<field name="view_mode">calendar</field> <field name="view_mode">calendar</field>
@ -39,8 +39,8 @@
<field name="view_id" ref="crm_case_phone_form_view"/> <field name="view_id" ref="crm_case_phone_form_view"/>
<field name="act_window_id" ref="crm_case_categ_phone0"/> <field name="act_window_id" ref="crm_case_categ_phone0"/>
</record> </record>
<menuitem name="Phone Calls" id="menu_crm_case_phone" parent="crm.menu_crm"/> <menuitem name="Phone Calls" id="menu_crm_case_phone" parent="base.menu_base_partner" sequence="5"/>
<record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0"> <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
<field name="name">Inbound</field> <field name="name">Inbound</field>
@ -57,7 +57,7 @@
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_phone_incomming_tree_view"/> <field name="view_id" ref="crm_case_phone_incomming_tree_view"/>
<field name="act_window_id" ref="crm_case_categ_phone_incoming0"/> <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming0"> <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming0">
<field name="sequence" eval="2"/> <field name="sequence" eval="2"/>
<field name="view_mode">calendar</field> <field name="view_mode">calendar</field>
@ -86,7 +86,7 @@
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_phone_tree_view"/> <field name="view_id" ref="crm_case_phone_tree_view"/>
<field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/> <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing0"> <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing0">
<field name="sequence" eval="2"/> <field name="sequence" eval="2"/>
<field name="view_mode">calendar</field> <field name="view_mode">calendar</field>
@ -98,7 +98,7 @@
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="crm_case_phone_form_view"/> <field name="view_id" ref="crm_case_phone_form_view"/>
<field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/> <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
</record> </record>
<menuitem name="Outbound" id="menu_crm_case_phone_outbound" parent="crm.menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/> <menuitem name="Outbound" id="menu_crm_case_phone_outbound" parent="crm.menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/>

View File

@ -4,8 +4,8 @@
# #
# Cases by section and category2 of case # Cases by section and category2 of case
# #
<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" <!-- <menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm"-->
sequence="50"/> <!-- sequence="50"/>-->
<record model="ir.ui.view" id="view_crm_case_section_categ_tree"> <record model="ir.ui.view" id="view_crm_case_section_categ_tree">
<field name="name">CRM Report - Sections and Type(Tree)</field> <field name="name">CRM Report - Sections and Type(Tree)</field>
@ -57,7 +57,7 @@
</graph> </graph>
</field> </field>
</record> </record>
<record id="view_crm_case_section_categ_filter" model="ir.ui.view"> <record id="view_crm_case_section_categ_filter" model="ir.ui.view">
<field name="name">CRM Report - Sections and Type(Select)</field> <field name="name">CRM Report - Sections and Type(Select)</field>
<field name="model">report.crm.case.section.categ2</field> <field name="model">report.crm.case.section.categ2</field>
@ -83,7 +83,7 @@
<field name="view_mode">graph,tree</field> <field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_crm_case_section_categ_filter"/> <field name="search_view_id" ref="view_crm_case_section_categ_filter"/>
</record> </record>
<menuitem parent="next_id_64" name="Cases by Section and Type" action="action_report_crm_case_section_categ_tree" id="menu_crm_case_section_categ_tree"/> <!-- <menuitem parent="next_id_64" name="Cases by Section and Type" action="action_report_crm_case_section_categ_tree" id="menu_crm_case_section_categ_tree"/>-->
# #
# Cases by section and stage # Cases by section and stage
@ -161,7 +161,7 @@
<field name="view_mode">graph,tree</field> <field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_crm_case_section_stage_filter"/> <field name="search_view_id" ref="view_crm_case_section_stage_filter"/>
</record> </record>
<menuitem parent="next_id_64" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree" id="menu_crm_case_section_stage_tree"/> <!-- <menuitem parent="next_id_64" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree" id="menu_crm_case_section_stage_tree"/>-->
# #
# Cases by section, category and stage # Cases by section, category and stage
@ -240,7 +240,7 @@
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_crm_case_section_categ_stage_filter"/> <field name="search_view_id" ref="view_crm_case_section_categ_stage_filter"/>
</record> </record>
<menuitem parent="next_id_64" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree" id="menu_crm_case_section_categ_stage_tree"/> <!-- <menuitem parent="next_id_64" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree" id="menu_crm_case_section_categ_stage_tree"/>-->
# #
# Cases by section, category and category2 # Cases by section, category and category2
@ -321,6 +321,6 @@
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_crm_case_section_categ_categ2_filter"/> <field name="search_view_id" ref="view_crm_case_section_categ_categ2_filter"/>
</record> </record>
<menuitem parent="next_id_64" name="Cases by Section, Category and Type" action="action_report_crm_case_section_categ_categ2_tree" id="menu_crm_case_section_categ_categ2_tree"/> <!-- <menuitem parent="next_id_64" name="Cases by Section, Category and Type" action="action_report_crm_case_section_categ_categ2_tree" id="menu_crm_case_section_categ_categ2_tree"/>-->
</data> </data>
</openerp> </openerp>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/> <!-- <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>-->
<menuitem id="menu_crm_configuration" name="Configuration" parent="crm.menu_crm" sequence="0"/> <menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/>
<wizard id="wizard_crm_send_mail" model="crm.case.history" name="crm.send.mail" string="Send Mail" menu="False"/> <wizard id="wizard_crm_send_mail" model="crm.case.history" name="crm.send.mail" string="Send Mail" menu="False"/>
<wizard id="wizard_crm_new_send_mail" model="crm.case" name="crm.new.send.mail" string="Send New Mail" menu="False"/> <wizard id="wizard_crm_new_send_mail" model="crm.case" name="crm.new.send.mail" string="Send New Mail" menu="False"/>
@ -47,12 +47,12 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="crm_case_section_view_tree"/> <field name="view_id" ref="crm_case_section_view_tree"/>
</record> </record>
<menuitem id="next_id_51" name="Cases" parent="crm.menu_crm_configuration"/> <menuitem id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration"/>
<menuitem action="crm_case_section_act" id="menu_crm_case_section_act" parent="next_id_51"/> <menuitem id="menu_crm_case_categ" name="Categories" parent="crm.menu_crm_configuration"/>
<menuitem id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration"/>
<menuitem id="menu_crm_case_categ" name="Categories" parent="crm.menu_crm_configuration"/>
<menuitem id="next_id_52" name="All Cases" parent="crm.menu_crm" sequence="1"/> <menuitem action="crm_case_section_act" id="menu_crm_case_section_act" parent="crm.menu_crm_configuration"/>
<!-- <menuitem id="next_id_52" name="All Cases" parent="crm.menu_crm" sequence="1"/>-->
<record id="crm_case_section_act_tree" model="ir.actions.act_window"> <record id="crm_case_section_act_tree" model="ir.actions.act_window">
<field name="name">Cases by section</field> <field name="name">Cases by section</field>
<field name="res_model">crm.case.section</field> <field name="res_model">crm.case.section</field>
@ -60,7 +60,8 @@
<field name="view_type">tree</field> <field name="view_type">tree</field>
<field name="view_id" ref="crm_case_section_view_tree"/> <field name="view_id" ref="crm_case_section_view_tree"/>
</record> </record>
<menuitem action="crm_case_section_act_tree" id="menu_crm_case_section_act_tree" parent="next_id_52"/> <!-- <menuitem action="crm_case_section_act_tree" id="menu_crm_case_section_act_tree" parent="next_id_52"/>-->
<!-- Case rules --> <!-- Case rules -->
@ -161,7 +162,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="crm_case_rule_tree-view"/> <field name="view_id" ref="crm_case_rule_tree-view"/>
</record> </record>
<menuitem action="crm_case_rule-act" id="menu_crm_case_rule-act" parent="crm.next_id_51"/> <menuitem action="crm_case_rule-act" id="menu_crm_case_rule-act" parent="crm.menu_crm_configuration"/>
<record id="view_crm_email_add_cc_wizard" model="ir.ui.view"> <record id="view_crm_email_add_cc_wizard" model="ir.ui.view">
<field name="name">Add CC</field> <field name="name">Add CC</field>
@ -385,7 +386,7 @@
<field name="view_id" ref="crm_case_tree-view"/> <field name="view_id" ref="crm_case_tree-view"/>
<field name="search_view_id" ref="view_crm_case_filter"/> <field name="search_view_id" ref="view_crm_case_filter"/>
</record> </record>
<menuitem action="crm_case_categ0-act" id="menu_crm_case_categ0-act" parent="crm.next_id_52"/> <!-- <menuitem action="crm_case_categ0-act" id="menu_crm_case_categ0-act" parent="crm.next_id_52"/>-->
<record id="crm_case_categ0-act_open" model="ir.actions.act_window"> <record id="crm_case_categ0-act_open" model="ir.actions.act_window">
<field name="name">Open Cases</field> <field name="name">Open Cases</field>
@ -453,7 +454,7 @@
<field name="view_id" ref="crm_case_history_tree-view"/> <field name="view_id" ref="crm_case_history_tree-view"/>
<field name="search_view_id" ref="crm_case_history_search"/> <field name="search_view_id" ref="crm_case_history_search"/>
</record> </record>
<menuitem action="crm_case_history-act" id="menu_crm_case_history-act_main" name="Cases Histories" parent="crm.next_id_52"/> <!-- <menuitem action="crm_case_history-act" id="menu_crm_case_history-act_main" name="Cases Histories" parent="crm.next_id_52"/>-->
<record id="crm_segmentation_line_tree-view" model="ir.ui.view"> <record id="crm_segmentation_line_tree-view" model="ir.ui.view">
<field name="name">crm.segmentation.line.tree</field> <field name="name">crm.segmentation.line.tree</field>
@ -552,17 +553,17 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem id="next_id_53" name="Segmentations" parent="crm.menu_crm_configuration"/><menuitem action="crm_segmentation_tree-act" id="menu_crm_segmentation-act" parent="next_id_53"/> <menuitem action="crm_segmentation_tree-act" id="menu_crm_segmentation-act" parent="crm.menu_crm_configuration"/>
<!---->
<act_window domain="[('section_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_section_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.section" view_mode="tree,form,calendar" view_type="form"/> <!-- <act_window domain="[('section_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_section_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.section" view_mode="tree,form,calendar" view_type="form"/>-->
<!---->
<!-- <act_window domain="[('categ_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_categ_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.categ" view_mode="tree,form,calendar" view_type="form"/> <!-- <act_window domain="[('categ_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_categ_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.categ" view_mode="tree,form,calendar" view_type="form"/>-->
--> <!---->
<act_window domain="[('partner_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner" view_mode="tree,form,calendar" view_type="form"/> <!-- <act_window domain="[('partner_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner" view_mode="tree,form,calendar" view_type="form"/>-->
<!---->
<act_window domain="[('canal_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_canal_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner.canal" view_mode="tree,form,calendar" view_type="form"/> <!-- <act_window domain="[('canal_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_canal_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner.canal" view_mode="tree,form,calendar" view_type="form"/>-->
<!---->
<act_window domain="[('user_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_users_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.users" view_mode="tree,form,calendar" view_type="form"/> <!-- <act_window domain="[('user_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_users_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.users" view_mode="tree,form,calendar" view_type="form"/>-->
<record model="ir.ui.view" id="view_users_form_simple_modif_inherited1"> <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">

View File

@ -9,14 +9,14 @@
<record id="group_crm_user" model="res.groups"> <record id="group_crm_user" model="res.groups">
<field name="name">CRM / User</field> <field name="name">CRM / User</field>
</record> </record>
<!---->
<!-- <record model='ir.ui.menu' id='menu_crm'>-->
<!-- <field name="groups_id" eval="[(6,0,[ref('group_crm_manager'),ref('group_crm_user')])]"/>-->
<!-- </record>-->
<record model='ir.ui.menu' id='menu_crm'> <!-- <record model='ir.ui.menu' id='menu_crm_configuration'>-->
<field name="groups_id" eval="[(6,0,[ref('group_crm_manager'),ref('group_crm_user')])]"/> <!-- <field name="groups_id" eval="[(6,0,[ref('group_crm_manager')])]"/>-->
</record> <!-- </record>-->
<record model='ir.ui.menu' id='menu_crm_configuration'>
<field name="groups_id" eval="[(6,0,[ref('group_crm_manager')])]"/>
</record>
<!--rule for meeting--> <!--rule for meeting-->
<record model="ir.rule.group" id="crm_meeting_rule_group"> <record model="ir.rule.group" id="crm_meeting_rule_group">

View File

@ -8,9 +8,10 @@
<field name="name">All Jobs Requests</field> <field name="name">All Jobs Requests</field>
<field name="res_model">crm.job</field> <field name="res_model">crm.job</field>
<field name="view_mode">tree,calendar,form,graph</field> <field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_tree_view_job"/> <field name="view_id" ref="crm_case_tree_view_job"/>
<field name="context" eval="{'default_state':'open'}"/> <field name="context" eval="{'default_state':'open'}"/>
<field name="search_view_id" ref="view_crm_case_jobs_filter"/> <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act_job"> <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act_job">
<field name="sequence" eval="1"/> <field name="sequence" eval="1"/>
@ -36,15 +37,19 @@
<field name="view_id" ref="crm_case_graph_view_job"/> <field name="view_id" ref="crm_case_graph_view_job"/>
<field name="act_window_id" ref="crm_case_categ0_act_job"/> <field name="act_window_id" ref="crm_case_categ0_act_job"/>
</record> </record>
<menuitem <!--<menuitem
name="Jobs - Hiring Process" name="Jobs - Hiring Process"
id="menu_crm_case_job_req_main" id="menu_crm_case_job_req_main"
parent="menu_hr"/>-->
<menuitem
name="Recruitment"
id="menu_crm_case_job_req_main"
parent="menu_hr"/> parent="menu_hr"/>
<!-- <!--
ALL JOBS REQUESTS ALL JOBS REQUESTS
--> -->
<menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job"/> <menuitem name="Applicants" parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job"/>
</data> </data>
</openerp> </openerp>

View File

@ -22,8 +22,8 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem parent="crm.next_id_53" id="menu_segm_questionnaire" <!-- <menuitem parent="crm.next_id_53" id="menu_segm_questionnaire" -->
action="open_questionnaires" /> <!-- action="open_questionnaires" />-->
<record model="ir.actions.act_window" id="open_questions"> <record model="ir.actions.act_window" id="open_questions">
@ -32,8 +32,8 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem parent="crm.next_id_53" id="menu_segm_answer" <!-- <menuitem parent="crm.next_id_53" id="menu_segm_answer" -->
action="open_questions" /> <!-- action="open_questions" />-->
<!-- <record model="ir.actions.act_window" id="open_crm_segmentations"> <!-- <record model="ir.actions.act_window" id="open_crm_segmentations">
<field name="name">Profiles</field> <field name="name">Profiles</field>
@ -203,7 +203,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Partner Profiles"> <tree string="Partner Profiles">
<field name="name"/> <field name="name"/>
</tree> </tree>
</field> </field>
--> <field name="name">crm.segmentation.tree</field> --> <field name="name">crm.segmentation.tree</field>
@ -228,9 +228,9 @@
</record> </record>
--> -->
<!-- <menuitem <!-- <menuitem
name="Partners/Partners by Profile" name="Partners/Partners by Profile"
sequence="1" sequence="1"
action="action_partner_crm_segmentation" action="action_partner_crm_segmentation"
id="menu_partner_crm_segmentation_main"/> id="menu_partner_crm_segmentation_main"/>
--> -->
<!-- <record model="ir.values" id="ir_action_partner_by_crm_segmentation"> <!-- <record model="ir.values" id="ir_action_partner_by_crm_segmentation">

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<record model="crm.bug.categ" id="categ1"> <record model="crm.bug.categ" id="categ1">
<field name="name">Bugs</field> <field name="name">Bugs</field>
@ -26,11 +26,11 @@
<record model="crm.bug.stage" id="stage7"> <record model="crm.bug.stage" id="stage7">
<field name="name">Future</field> <field name="name">Future</field>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
</record> </record>
######################## BUG TRACKING (menu) ########################### ######################## BUG TRACKING (menu) ###########################
<!-- <!--
ALL BUGS ALL BUGS
--> -->
<record model="ir.actions.act_window" id="crm_case_categ_act0"> <record model="ir.actions.act_window" id="crm_case_categ_act0">
@ -40,14 +40,14 @@
<field name="view_mode">tree,calendar</field> <field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_tree_view"/> <field name="view_id" ref="crm_case_tree_view"/>
<field name="context" eval="{'default_state':'open'}"/> <field name="context" eval="{'default_state':'open'}"/>
<field name="search_view_id" ref="view_crm_case_bugs_filter"/> <field name="search_view_id" ref="view_crm_case_bugs_filter"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0"> <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
<field name="sequence" eval="1"/> <field name="sequence" eval="1"/>
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_tree_view"/> <field name="view_id" ref="crm_case_tree_view"/>
<field name="act_window_id" ref="crm_case_categ_act0"/> <field name="act_window_id" ref="crm_case_categ_act0"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0"> <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0">
<field name="sequence" eval="2"/> <field name="sequence" eval="2"/>
<field name="view_mode">calendar</field> <field name="view_mode">calendar</field>
@ -60,8 +60,8 @@
<field name="view_id" ref="crm_case_form_view"/> <field name="view_id" ref="crm_case_form_view"/>
<field name="act_window_id" ref="crm_case_categ_act0"/> <field name="act_window_id" ref="crm_case_categ_act0"/>
</record> </record>
<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main"/> <!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>-->
<menuitem name="Bug Tracking" id="menu_crm_case_bug_track" parent="menu_aftertask" action="crm_case_categ_act0"/> <menuitem name="Issues" id="menu_crm_case_bug_track" parent="project.menu_project_management" action="crm_case_categ_act0"/>
</data> </data>
</openerp> </openerp>

View File

@ -14,11 +14,12 @@
<record model="crm.bug.stage" id="future_awaiting_categ"> <record model="crm.bug.stage" id="future_awaiting_categ">
<field name="name">Awaiting Response</field> <field name="name">Awaiting Response</field>
<field name="section_id" ref="crm.section_sales_department"/> <field name="section_id" ref="crm.section_sales_department"/>
</record> </record>
######################## Future Request (menu) ########################### ######################## Future Request (menu) ###########################
<!-- <!--
ALL BUGS ALL BUGS
--> -->
<record model="ir.actions.act_window" id="action_crm_case_future"> <record model="ir.actions.act_window" id="action_crm_case_future">
@ -28,14 +29,14 @@
<field name="view_mode">tree,calendar</field> <field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_future_tree_view"/> <field name="view_id" ref="crm_case_future_tree_view"/>
<field name="context" eval="{'default_state':'open'}"/> <field name="context" eval="{'default_state':'open'}"/>
<field name="search_view_id" ref="view_crm_case_future_filter"/> <field name="search_view_id" ref="view_crm_case_future_filter"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_future_tree_view0"> <record model="ir.actions.act_window.view" id="action_crm_future_tree_view0">
<field name="sequence" eval="1"/> <field name="sequence" eval="1"/>
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_future_tree_view"/> <field name="view_id" ref="crm_case_future_tree_view"/>
<field name="act_window_id" ref="action_crm_case_future"/> <field name="act_window_id" ref="action_crm_case_future"/>
</record> </record>
<record model="ir.actions.act_window.view" id="action_crm_future_calendar_view0"> <record model="ir.actions.act_window.view" id="action_crm_future_calendar_view0">
<field name="sequence" eval="2"/> <field name="sequence" eval="2"/>
<field name="view_mode">calendar</field> <field name="view_mode">calendar</field>
@ -47,8 +48,8 @@
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="crm_case_future_form_view"/> <field name="view_id" ref="crm_case_future_form_view"/>
<field name="act_window_id" ref="action_crm_case_future"/> <field name="act_window_id" ref="action_crm_case_future"/>
</record> </record>
<menuitem name="Future Requests" id="menu_crm_case_future_request" parent="menu_aftertask" action="action_crm_case_future"/> <menuitem name="Feature Requests" id="menu_crm_case_future_request" parent="project.menu_project_management" action="action_crm_case_future"/>
</data> </data>
</openerp> </openerp>

View File

@ -1,7 +1,11 @@
<openerp> <openerp>
<data> <data>
<menuitem name="Document Management" icon="terp-stock" id="menu_document"/> <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
<menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/> <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
<menuitem name="Knowledge Management" icon="terp-stock" id="menu_document"/>
<menuitem name="Configuration" id="menu_document_configuration" parent="menu_document" sequence="50"/>
<menuitem name="Document Management" id="menu_document_management_configuration" parent="menu_document_configuration" />
<record model="ir.ui.view" id="view_document_storage_form"> <record model="ir.ui.view" id="view_document_storage_form">
<field name="name">document.storage</field> <field name="name">document.storage</field>
@ -39,11 +43,11 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem <!-- <menuitem
name="Storage Media" name="Storage Media"
action="action_document_storage_form" action="action_document_storage_form"
id="menu_document_storage_media" id="menu_document_storage_media"
parent="menu_document_configuration"/> parent="menu_document_configuration"/>-->
<record model="ir.ui.view" id="view_document_directory_form"> <record model="ir.ui.view" id="view_document_directory_form">
<field name="name">document.directory</field> <field name="name">document.directory</field>
@ -133,7 +137,7 @@
name="Directories" name="Directories"
action="action_document_directory_form" action="action_document_directory_form"
id="menu_document_directories" id="menu_document_directories"
parent="menu_document_configuration"/> parent="menu_document_management_configuration"/>
<record model="ir.actions.act_window" id="action_document_directory_tree"> <record model="ir.actions.act_window" id="action_document_directory_tree">
@ -146,7 +150,7 @@
<menuitem <menuitem
action="action_document_directory_tree" action="action_document_directory_tree"
id="menu_document_directories_tree" id="menu_document_directories_tree"
parent="menu_document_configuration"/> parent="menu_document_management_configuration" sequence="5"/>
<record model="ir.ui.view" id="view_document_file_form"> <record model="ir.ui.view" id="view_document_file_form">
<field name="name">ir.attachment</field> <field name="name">ir.attachment</field>
@ -230,11 +234,12 @@
<field name="res_model">ir.attachment</field> <field name="res_model">ir.attachment</field>
<field name="view_type">form</field> <field name="view_type">form</field>
</record> </record>
<menuitem name="Documents" id="menu_document_doc" parent="menu_document" sequence="5"/>
<menuitem <menuitem
name="Search a File" name="Search a File"
action="action_document_file_form" action="action_document_file_form"
id="menu_document_files" id="menu_document_files"
parent="menu_document"/> parent="menu_document_doc"/>
<record model="ir.actions.act_window" id="action_document_file_directory_form"> <record model="ir.actions.act_window" id="action_document_file_directory_form">
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
@ -289,7 +294,7 @@
</field> </field>
</field> </field>
</record> </record>
<act_window domain="[('partner_id', '=', active_id)]" <act_window domain="[('partner_id', '=', active_id)]"
id="act_res_partner_document" name="Related Documents" id="act_res_partner_document" name="Related Documents"
res_model="ir.attachment" res_model="ir.attachment"

View File

@ -5,12 +5,14 @@
<field name="url">ftp://localhost:8021/</field> <field name="url">ftp://localhost:8021/</field>
</record> </record>
<menuitem <menuitem
name="Browse Files Using FTP" name="Shared Repository (FTP)"
action="action_document_browse" action="action_document_browse"
id="menu_document_browse" id="menu_document_browse"
type="url" type="url"
icon="STOCK_EXECUTE" icon="STOCK_EXECUTE"
parent="document.menu_document"/> parent="document.menu_document_doc" sequence="1"/>
<record id="view_auto_config_form" model="ir.ui.view"> <record id="view_auto_config_form" model="ir.ui.view">
<field name="name">Auto Configure Directory</field> <field name="name">Auto Configure Directory</field>

View File

@ -1,9 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
<menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" />
<menuitem name="Events Organisation" id="menu_event_main" parent="menu_marketing_event_main" />
<!-- EVENTS --> <!-- EVENTS -->
<menuitem name="Events Organisation" id="menu_event_main" icon="terp-calendar" /> <!--<menuitem name="Events Organisation" id="menu_event_main" icon="terp-calendar" />-->
<!-- EVENTS/CONFIGURATION/TYPE OF EVENTS --> <!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
<record model="ir.ui.view" id="view_event_type_form"> <record model="ir.ui.view" id="view_event_type_form">
@ -32,7 +33,7 @@
<field name="res_model">event.type</field> <field name="res_model">event.type</field>
<field name="view_type">form</field> <field name="view_type">form</field>
</record> </record>
<menuitem name="Configuration" id="menu_event_config" parent="menu_event_main" /> <menuitem name="Configuration" id="menu_event_config" parent="menu_marketing_event_main" sequence="30"/>
<menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config"/> <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config"/>
<!-- The base section for all events --> <!-- The base section for all events -->
@ -44,7 +45,7 @@
<field name="domain" eval="[('parent_id','=',False)]" /> <field name="domain" eval="[('parent_id','=',False)]" />
<field name="view_type">tree</field> <field name="view_type">tree</field>
</record> </record>
<menuitem name="Events by Categories" id="menu_action_event_categories" action="action_event_categories" parent="menu_event_main"/> <!--<menuitem name="Events by Categories" id="menu_action_event_categories" action="action_event_categories" parent="menu_event_main"/>-->
<!-- Events Organisation/CONFIGURATION/EVENTS --> <!-- Events Organisation/CONFIGURATION/EVENTS -->
@ -337,8 +338,9 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,graph</field>
</record> </record>
<menuitem name="Reporting" id="menu_report_event" parent="menu_event_main"/> <menuitem name="Reporting" id="menu_report_event" parent="menu_marketing_event_main" sequence="20"/>
<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/> <!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
<menuitem parent="menu_event_main" action="action_event_registration" id="menu_report_event_registration" name="Registrations Per Event"/>
<!-- end... --> <!-- end... -->

View File

@ -47,10 +47,7 @@
<field name="view_type">tree</field> <field name="view_type">tree</field>
<field name="domain">[('parent_id','=',False)]</field> <field name="domain">[('parent_id','=',False)]</field>
</record> </record>
<menuitem <menuitem action="open_module_tree_department_tree" id="menu_department_tree" parent="base.menu_users"/>
action="open_module_tree_department_tree"
id="menu_department_tree"
parent="hr.menu_hr_employee"/>
<record id="open_module_tree_department" model="ir.actions.act_window"> <record id="open_module_tree_department" model="ir.actions.act_window">
<field name="name">Departments</field> <field name="name">Departments</field>
@ -58,11 +55,8 @@
<field name="view_type">form</field> <field name="view_type">form</field>
</record> </record>
<menuitem <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
action="open_module_tree_department" <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_human_resources"/>
id="menu_department_def"
parent="hr.menu_hr_employee"/>
<!-- res.users inherit --> <!-- res.users inherit -->
<record model="ir.ui.view" id="view_users_form_inherit"> <record model="ir.ui.view" id="view_users_form_inherit">
<field name="name">res.users.form</field> <field name="name">res.users.form</field>

View File

@ -1,33 +1,23 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
icon="terp-hr" <menuitem id="menu_hr_human_resources" sequence="1" name="Human Resources" parent="menu_hr_root"/>
id="menu_hr_root" <menuitem
name="Human Resources"/> id="menu_hr_reporting"
<menuitem name="Reporting"
id="menu_hr_reporting" parent="hr.menu_hr_root"
name="Reporting"
parent="hr.menu_hr_root"
sequence="40" /> sequence="40" />
<menuitem <menuitem
id="menu_hr_configuration" id="menu_hr_configuration"
name="Configuration" name="Configuration"
parent="hr.menu_hr_root" parent="hr.menu_hr_root"
sequence="50" groups="group_hr_manager"/> sequence="50" groups="group_hr_manager"/>
<menuitem
id="menu_hr_employee"
sequence="1"
name="Human Resources"
parent="hr.menu_hr_root"/>
<menuitem
id="menu_hr_time"
name="Time Tracking"
parent="hr.menu_hr_root"/>
<menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_configuration" name="Employees" sequence="1"/>
<!-- <!--
========== ==========
Employee Employee
========== ==========
--> -->
<record id="view_employee_form" model="ir.ui.view"> <record id="view_employee_form" model="ir.ui.view">
@ -105,7 +95,7 @@
<field name="view_id" ref="view_employee_tree"/> <field name="view_id" ref="view_employee_tree"/>
<field name="domain">[('parent_id','=',False)]</field> <field name="domain">[('parent_id','=',False)]</field>
</record> </record>
<record id="open_view_employee_list" model="ir.actions.act_window"> <record id="open_view_employee_list" model="ir.actions.act_window">
<field name="name">Employees</field> <field name="name">Employees</field>
<field name="res_model">hr.employee</field> <field name="res_model">hr.employee</field>
@ -113,11 +103,32 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" eval="False"/> <field name="view_id" eval="False"/>
</record> </record>
<menuitem <!-- <menuitem
id="menu_open_view_employee_list" id="menu_open_view_employee_list"
action="open_view_employee_list" action="open_view_employee_list"
groups="group_hr_manager" groups="group_hr_manager"
parent="hr.menu_hr_employee"/> parent="menu_hr_human_resources"/>
<menuitem
action="open_view_employee_tree"
id="menu_open_view_employee_tree"
parent="menu_open_view_employee_list"/>-->
<record id="open_view_employee_list_my" model="ir.actions.act_window">
<field name="name">All Employees</field>
<field name="res_model">hr.employee</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[]</field>
</record>
<!--<menuitem
action="open_view_employee_list_my"
id="menu_open_view_employee_list_my"
parent="menu_open_view_employee_list"/>-->
<menuitem
name="Employees"
action="open_view_employee_list_my"
id="menu_open_view_employee_list_my"
parent="menu_hr_human_resources"/>
<!-- <!--
======================= =======================
@ -155,9 +166,9 @@
<field eval="True" name="isobject"/> <field eval="True" name="isobject"/>
<field eval="True" name="replace"/> <field eval="True" name="replace"/>
</ir_set> </ir_set>
<!-- <!--
============ ============
Working Time Working Time
============ ============
@ -181,16 +192,9 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" eval="False"/> <field name="view_id" eval="False"/>
</record> </record>
<menuitem
name="Employees"
id="menu_hr_configuration_employee"
parent="hr.menu_hr_configuration"/>
<menuitem <menuitem action="edit_workgroup" id="menu_edit_workgroup" name="Work Schedules" parent="menu_view_employee_category_configuration_form" sequence="4"/>
action="edit_workgroup"
id="menu_edit_workgroup"
parent="hr.menu_hr_configuration"/>
<record id="view_timesheet_tree" model="ir.ui.view"> <record id="view_timesheet_tree" model="ir.ui.view">
<field name="name">hr.timesheet.tree</field> <field name="name">hr.timesheet.tree</field>
<field name="model">hr.timesheet</field> <field name="model">hr.timesheet</field>
@ -218,13 +222,13 @@
</form> </form>
</field> </field>
</record> </record>
<!-- <!--
============ ============
Employee Category Employee Category
============ ============
--> -->
<record id="view_employee_category_form" model="ir.ui.view"> <record id="view_employee_category_form" model="ir.ui.view">
<field name="name">hr.employee.category.form</field> <field name="name">hr.employee.category.form</field>
<field name="model">hr.employee.category</field> <field name="model">hr.employee.category</field>
@ -265,11 +269,10 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem
action="open_view_categ_form" <menuitem action="open_view_categ_form" id="menu_view_employee_category_form" parent="menu_view_employee_category_configuration_form" sequence="1"/>
id="menu_view_employee_category_form"
parent="hr.menu_hr_configuration_employee"/>
<record id="open_view_categ_tree" model="ir.actions.act_window"> <record id="open_view_categ_tree" model="ir.actions.act_window">
<field name="name">Categories structure</field> <field name="name">Categories structure</field>
<field name="res_model">hr.employee.category</field> <field name="res_model">hr.employee.category</field>
@ -277,7 +280,7 @@
<field name="view_id" ref="view_employee_category_tree"/> <field name="view_id" ref="view_employee_category_tree"/>
<field name="domain">[('parent_id','=',False)]</field> <field name="domain">[('parent_id','=',False)]</field>
</record> </record>
<record id="hr_employee_normal_action_tree" model="ir.actions.act_window"> <record id="hr_employee_normal_action_tree" model="ir.actions.act_window">
<field name="name">Employees</field> <field name="name">Employees</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
@ -287,7 +290,7 @@
<field name="domain">[('category_id','child_of',[active_id])]</field> <field name="domain">[('category_id','child_of',[active_id])]</field>
<field name="context">{'category_id':active_id}</field> <field name="context">{'category_id':active_id}</field>
</record> </record>
<record id="hr_employee_category_open" model="ir.values"> <record id="hr_employee_category_open" model="ir.values">
<field eval="'tree_but_open'" name="key2"/> <field eval="'tree_but_open'" name="key2"/>
<field eval="'hr.employee.category'" name="model"/> <field eval="'hr.employee.category'" name="model"/>
@ -295,5 +298,8 @@
<field eval="'ir.actions.act_window,%d'%hr_employee_normal_action_tree" name="value"/> <field eval="'ir.actions.act_window,%d'%hr_employee_normal_action_tree" name="value"/>
<field eval="True" name="object"/> <field eval="True" name="object"/>
</record> </record>
<menuitem action="open_view_categ_tree" id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
</data> </data>
</openerp> </openerp>

View File

@ -1,23 +1,23 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data> <data>
<!-- <!--
Process Process
--> -->
<record id="process_process_employeecontractprocess0" model="process.process"> <record id="process_process_employeecontractprocess0" model="process.process">
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field name="model_id" ref="hr.model_hr_employee"/> <field name="model_id" ref="hr.model_hr_employee"/>
<field eval="&quot;&quot;&quot;Employee Contract&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Employee Contract&quot;&quot;&quot;" name="name"/>
</record> </record>
<!-- <!--
Process Node Process Node
--> -->
<record id="process_node_employee0" model="process.node"> <record id="process_node_employee0" model="process.node">
<field name="menu_id" ref="hr.menu_open_view_employee_list"/> <field name="menu_id" ref="hr.menu_open_view_employee_list_my"/>
<field name="model_id" ref="hr.model_hr_employee"/> <field name="model_id" ref="hr.model_hr_employee"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Employee&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Employee&quot;&quot;&quot;" name="name"/>
@ -25,9 +25,9 @@
<field name="process_id" ref="process_process_employeecontractprocess0"/> <field name="process_id" ref="process_process_employeecontractprocess0"/>
<field eval="0" name="flow_start"/> <field eval="0" name="flow_start"/>
</record> </record>
<record id="process_node_employeecontact0" model="process.node"> <record id="process_node_employeecontact0" model="process.node">
<field name="menu_id" ref="hr.menu_open_view_employee_list"/> <field name="menu_id" ref="hr.menu_open_view_employee_list_my"/>
<field name="model_id" ref="hr.model_hr_employee"/> <field name="model_id" ref="hr.model_hr_employee"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Employee Contact&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Employee Contact&quot;&quot;&quot;" name="name"/>
@ -35,7 +35,7 @@
<field name="process_id" ref="process_process_employeecontractprocess0"/> <field name="process_id" ref="process_process_employeecontractprocess0"/>
<field eval="0" name="flow_start"/> <field eval="0" name="flow_start"/>
</record> </record>
<record id="process_node_openerpuser0" model="process.node"> <record id="process_node_openerpuser0" model="process.node">
<field name="menu_id" ref="base.menu_users"/> <field name="menu_id" ref="base.menu_users"/>
<field name="model_id" ref="base.model_res_users"/> <field name="model_id" ref="base.model_res_users"/>
@ -45,11 +45,11 @@
<field name="process_id" ref="process_process_employeecontractprocess0"/> <field name="process_id" ref="process_process_employeecontractprocess0"/>
<field eval="0" name="flow_start"/> <field eval="0" name="flow_start"/>
</record> </record>
<!-- <!--
Process Transition Process Transition
--> -->
<record id="process_transition_employeeuser0" model="process.transition"> <record id="process_transition_employeeuser0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/>
@ -58,7 +58,7 @@
<field model="process.node" name="target_node_id" ref="process_node_openerpuser0"/> <field model="process.node" name="target_node_id" ref="process_node_openerpuser0"/>
<field model="process.node" name="source_node_id" ref="process_node_employee0"/> <field model="process.node" name="source_node_id" ref="process_node_employee0"/>
</record> </record>
<record id="process_transition_contactofemployee0" model="process.transition"> <record id="process_transition_contactofemployee0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/>
@ -67,6 +67,6 @@
<field model="process.node" name="target_node_id" ref="process_node_employeecontact0"/> <field model="process.node" name="target_node_id" ref="process_node_employeecontact0"/>
<field model="process.node" name="source_node_id" ref="process_node_employee0"/> <field model="process.node" name="source_node_id" ref="process_node_employee0"/>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -27,7 +27,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="view_attendance_who" model="ir.ui.view"> <record id="view_attendance_who" model="ir.ui.view">
<field name="name">hr.attendance.tree</field> <field name="name">hr.attendance.tree</field>
<field name="model">hr.attendance</field> <field name="model">hr.attendance</field>
@ -48,12 +48,16 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_time"
groups="group_hr_attendance"/>
<!--<menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"
groups="group_hr_attendance"/>-->
<menuitem
id="menu_hr_time_tracking"
name="Time Tracking"
parent="hr.menu_hr_root" sequence="5"/>
<menuitem action="open_view_attendance" id="menu_open_view_attendance" <menuitem action="open_view_attendance" id="menu_open_view_attendance"
parent="menu_hr_attendance" groups="hr.group_hr_manager"/> parent="menu_hr_time_tracking" groups="hr.group_hr_manager"/>
<record id="edit_attendance_reason" model="ir.ui.view"> <record id="edit_attendance_reason" model="ir.ui.view">
<field name="name">hr.action.reason.form</field> <field name="name">hr.action.reason.form</field>
<field name="model">hr.action.reason</field> <field name="model">hr.action.reason</field>
@ -84,8 +88,9 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" ref="view_attendance_reason"/> <field name="view_id" ref="view_attendance_reason"/>
</record> </record>
<menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_hr_configuration"/> <menuitem sequence="9" id="menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
<menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="menu_open_view_attendance_reason_config"/>
<record id="hr_attendance_employee" model="ir.ui.view"> <record id="hr_attendance_employee" model="ir.ui.view">
<field name="name">hr.employee.form1</field> <field name="name">hr.employee.form1</field>
<field name="model">hr.employee</field> <field name="model">hr.employee</field>
@ -99,6 +104,6 @@
</field> </field>
</field> </field>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<wizard id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/> <wizard id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>
<wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.attendance.report" string="Print Attendance Error Report"/> <wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.attendance.report" string="Print Attendance Error Report"/>
<wizard id="print_week" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_week" string="Print Timesheet by week"/> <wizard id="print_week" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_week" string="Print Timesheet by week"/>
<wizard id="print_month" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_month" string="Print Timesheet by month"/> <wizard id="print_month" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_month" string="Print Timesheet by month"/>
<menuitem action="si_so" id="menu_si_so" parent="hr.menu_hr_time" type="wizard"
<menuitem action="si_so" id="menu_si_so" parent="menu_hr_time_tracking" type="wizard" sequence="1"
groups="group_hr_attendance"/> groups="group_hr_attendance"/>
</data> </data>
</openerp> </openerp>

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="hr_contract_wage_type_period_view_form" model="ir.ui.view"> <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
<field name="name">hr.contract.wage.type.period.view.form</field> <field name="name">hr.contract.wage.type.period.view.form</field>
<field name="model">hr.contract.wage.type.period</field> <field name="model">hr.contract.wage.type.period</field>
@ -13,8 +13,8 @@
</form> </form>
</field> </field>
</record> </record>
<record id="hr_hr_employee_marital_status_form" model="ir.ui.view"> <record id="hr_hr_employee_marital_status_form" model="ir.ui.view">
<field name="name">hr.hr.employee.marital.status</field> <field name="name">hr.hr.employee.marital.status</field>
<field name="model">hr.employee.marital.status</field> <field name="model">hr.employee.marital.status</field>
@ -26,7 +26,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="hr_contract_wage_type_view_form" model="ir.ui.view"> <record id="hr_contract_wage_type_view_form" model="ir.ui.view">
<field name="name">hr.contract.wage.type.view.form</field> <field name="name">hr.contract.wage.type.view.form</field>
<field name="model">hr.contract.wage.type</field> <field name="model">hr.contract.wage.type</field>
@ -41,7 +41,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="hr_contract_wage_type_view_tree" model="ir.ui.view"> <record id="hr_contract_wage_type_view_tree" model="ir.ui.view">
<field name="name">hr.contract.wage.type.view.tree</field> <field name="name">hr.contract.wage.type.view.tree</field>
<field name="model">hr.contract.wage.type</field> <field name="model">hr.contract.wage.type</field>
@ -60,10 +60,9 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="domain">[]</field> <field name="domain">[]</field>
</record> </record>
<menuitem
id="next_id_56" <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="5"/>
name="Contracts"
parent="hr.menu_hr_configuration"/>
<menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/> <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
<record id="action_hr_contract_wage_type_period" model="ir.actions.act_window"> <record id="action_hr_contract_wage_type_period" model="ir.actions.act_window">
@ -71,10 +70,11 @@
<field name="res_model">hr.contract.wage.type.period</field> <field name="res_model">hr.contract.wage.type.period</field>
<field name="view_type">form</field> <field name="view_type">form</field>
</record> </record>
<menuitem <menuitem
action="action_hr_contract_wage_type_period" action="action_hr_contract_wage_type_period"
id="hr_menu_contract_wage_type_period" id="hr_menu_contract_wage_type_period"
parent="hr_contract.next_id_56"/> parent="hr_contract.next_id_56"/>
<record id="hr_hr_employee_view_form2" model="ir.ui.view"> <record id="hr_hr_employee_view_form2" model="ir.ui.view">
<field name="name">hr.hr.employee.view.form2</field> <field name="name">hr.hr.employee.view.form2</field>
@ -93,7 +93,7 @@
<field name="wage_type_id"/> <field name="wage_type_id"/>
<field name="wage"/> <field name="wage"/>
</tree> </tree>
<form string="Contract"> <form string="Contract">
<separator colspan="4" string="Generalities"/> <separator colspan="4" string="Generalities"/>
<field colspan="4" name="name" select="1"/> <field colspan="4" name="name" select="1"/>
@ -103,11 +103,11 @@
<field name="working_hours_per_day_id"/> <field name="working_hours_per_day_id"/>
<field name="date_start" select="1"/> <field name="date_start" select="1"/>
<field name="date_end" select="1"/> <field name="date_end" select="1"/>
<separator colspan="4" string="Salary"/> <separator colspan="4" string="Salary"/>
<field name="wage_type_id"/> <field name="wage_type_id"/>
<field name="wage"/> <field name="wage"/>
<separator colspan="4" string="Notes"/> <separator colspan="4" string="Notes"/>
<field colspan="4" name="notes" nolabel="1"/> <field colspan="4" name="notes" nolabel="1"/>
</form> </form>
@ -124,7 +124,7 @@
</notebook> </notebook>
</field> </field>
</record> </record>
<record id="hr_contract_type_view_form" model="ir.ui.view"> <record id="hr_contract_type_view_form" model="ir.ui.view">
<field name="name">hr.contract.type.view.form</field> <field name="name">hr.contract.type.view.form</field>
<field name="model">hr.contract.type</field> <field name="model">hr.contract.type</field>
@ -136,18 +136,19 @@
</form> </form>
</field> </field>
</record> </record>
<record id="action_hr_marital_status" model="ir.actions.act_window"> <record id="action_hr_marital_status" model="ir.actions.act_window">
<field name="name">Marital Status</field> <field name="name">Marital Status</field>
<field name="res_model">hr.employee.marital.status</field> <field name="res_model">hr.employee.marital.status</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem <menuitem
action="action_hr_marital_status" action="action_hr_marital_status"
id="hr_menu_marital_status" id="hr_menu_marital_status"
parent="hr.menu_hr_configuration_employee"/> parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
<record id="hr_contract_view_form" model="ir.ui.view"> <record id="hr_contract_view_form" model="ir.ui.view">
<field name="name">hr.contract.view.form</field> <field name="name">hr.contract.view.form</field>
<field name="model">hr.contract</field> <field name="model">hr.contract</field>
@ -159,13 +160,13 @@
<field name="employee_id" select="1"/> <field name="employee_id" select="1"/>
<field name="function"/> <field name="function"/>
<newline/> <newline/>
<separator colspan="4" string="Contract Duration"/> <separator colspan="4" string="Contract Duration"/>
<field name="date_start" select="1"/> <field name="date_start" select="1"/>
<field name="date_end" select="1"/> <field name="date_end" select="1"/>
<field name="working_hours_per_day_id"/> <field name="working_hours_per_day_id"/>
<newline/> <newline/>
<separator colspan="4" string="Remuneration"/> <separator colspan="4" string="Remuneration"/>
<field name="wage_type_id"/> <field name="wage_type_id"/>
<field name="wage"/> <field name="wage"/>
@ -174,7 +175,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="hr_contract_type_view_tree" model="ir.ui.view"> <record id="hr_contract_type_view_tree" model="ir.ui.view">
<field name="name">hr.contract.type.view.tree</field> <field name="name">hr.contract.type.view.tree</field>
<field name="model">hr.contract.type</field> <field name="model">hr.contract.type</field>
@ -185,7 +186,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="hr_contract_view_tree" model="ir.ui.view"> <record id="hr_contract_view_tree" model="ir.ui.view">
<field name="name">hr.contract.view.tree</field> <field name="name">hr.contract.view.tree</field>
<field name="model">hr.contract</field> <field name="model">hr.contract</field>
@ -203,7 +204,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="action_hr_contract" model="ir.actions.act_window"> <record id="action_hr_contract" model="ir.actions.act_window">
<field name="name">Contract</field> <field name="name">Contract</field>
<field name="res_model">hr.contract</field> <field name="res_model">hr.contract</field>
@ -212,7 +213,10 @@
<field name="domain">[]</field> <field name="domain">[]</field>
</record> </record>
<menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_employee"/>
<!-- <menuitem name="Contract" id="menu_hr_contract" parent="hr.menu_hr_human_resources"/>-->
<!-- <menuitem action="action_hr_contract" id="hr_menu_contract" parent="menu_hr_contract"/>-->
<menuitem id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/>
<menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr_menu_contract_main" name="Contracts"/>
</data> </data>
</openerp> </openerp>

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<!-- Expenses --> <!-- Expenses -->
<record id="view_expenses_line_tree" model="ir.ui.view"> <record id="view_expenses_line_tree" model="ir.ui.view">
<field name="name">hr.expense.line.tree</field> <field name="name">hr.expense.line.tree</field>
<field name="type">tree</field> <field name="type">tree</field>
@ -20,7 +20,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="view_expenses_tree" model="ir.ui.view"> <record id="view_expenses_tree" model="ir.ui.view">
<field name="name">hr.expense.expense.tree</field> <field name="name">hr.expense.expense.tree</field>
<field name="model">hr.expense.expense</field> <field name="model">hr.expense.expense</field>
@ -36,8 +36,8 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="view_expenses_form" model="ir.ui.view"> <record id="view_expenses_form" model="ir.ui.view">
<field name="name">hr.expense.form</field> <field name="name">hr.expense.form</field>
<field name="type">form</field> <field name="type">form</field>
@ -96,8 +96,8 @@
</form> </form>
</field> </field>
</record> </record>
<record id="view_hr_expense_filter" model="ir.ui.view"> <record id="view_hr_expense_filter" model="ir.ui.view">
<field name="name">hr.expense.expense.filter</field> <field name="name">hr.expense.expense.filter</field>
<field name="model">hr.expense.expense</field> <field name="model">hr.expense.expense</field>
@ -118,29 +118,31 @@
</search> </search>
</field> </field>
</record> </record>
<record id="expense_all" model="ir.actions.act_window"> <record id="expense_all" model="ir.actions.act_window">
<field name="name">All expenses</field> <field name="name">All expenses</field>
<field name="res_model">hr.expense.expense</field> <field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="search_view_id" ref="view_hr_expense_filter"/> <field name="search_view_id" ref="view_hr_expense_filter"/>
</record> </record>
<menuitem id="menu_expenses" name="Expenses" <menuitem id="next_id_49" name="Expenses" sequence="6"
parent="hr.menu_hr_root"/> parent="hr.menu_hr_root"/>
<menuitem action="expense_all" id="menu_expense_all"
parent="menu_expenses" groups="hr.group_hr_manager"/> <menuitem action="expense_all" id="menu_expense_all" name="Expenses"
parent="next_id_49" groups="hr.group_hr_manager"/>
<record id="view_product_hr_expense_form" model="ir.ui.view"> <record id="view_product_hr_expense_form" model="ir.ui.view">
<field name="name">product.product.expense.form</field> <field name="name">product.product.expense.form</field>
<field name="model">product.product</field> <field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view"/> <field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field groups="base.group_extended" name="rental" position="after"> <field groups="base.group_extended" name="rental" position="after">
<field name="hr_expense_ok"/> <field name="hr_expense_ok"/>
</field> </field>
</field> </field>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# #
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################

View File

@ -1,23 +1,21 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data> <data>
<wizard string="Print Summary of Holidays" <wizard string="Print Summary of Holidays"
name="hr.holidays.summary" name="hr.holidays.summary"
id="holidays_summary"/> id="holidays_summary"/>
<menuitem name="Print Summary of Holidays" parent="hr.menu_hr_reporting"
action="holidays_summary"
type="wizard"
id="menu_holidays_summary" sequence="20"/>
<menuitem name="Print Summary of Holidays" <!-- restrict menu access to HR Manager -->
parent="hr.menu_hr_reporting" <record model='ir.ui.menu' id="menu_holidays_summary">
action="holidays_summary" <field eval="[(6,0,[ref('hr.group_hr_manager')])]" name="groups_id"/>
type="wizard" </record>
id="menu_holidays_summary"/>
<!-- restrict menu access to HR Manager --> <wizard string="Print Summary of Employee's Holidays"
<record model='ir.ui.menu' id="menu_holidays_summary"> model="hr.employee" name="hr.holidays.summary.employee"
<field eval="[(6,0,[ref('hr.group_hr_manager')])]" name="groups_id"/> keyword="client_print_multi" id="wizard_holidays_summary" />
</record> </data>
<wizard string="Print Summary of Employee's Holidays"
model="hr.employee" name="hr.holidays.summary.employee"
keyword="client_print_multi" id="wizard_holidays_summary" />
</data>
</openerp> </openerp>

View File

@ -1,7 +1,11 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data> <data>
<menuitem
id="menu_hr_reporting"
name="Reporting"
parent="hr.menu_hr_root"
sequence="40" />
<!-- Menu Items --> <!-- Menu Items -->
<record id="view_hr_holidays_filter" model="ir.ui.view"> <record id="view_hr_holidays_filter" model="ir.ui.view">
@ -145,11 +149,15 @@
</record> </record>
<menuitem
name="Leaves" <!-- <menuitem
name="Holidays Management"
parent="hr.menu_hr_root"
id="menu_open_ask_holidays"/>-->
<menuitem
name="Leaves" sequence="7"
parent="hr.menu_hr_root" parent="hr.menu_hr_root"
id="menu_open_ask_holidays"/> id="menu_open_ask_holidays"/>
<record model="ir.actions.act_window" id="open_ask_holidays"> <record model="ir.actions.act_window" id="open_ask_holidays">
<field name="name">Leave Request(s)</field> <field name="name">Leave Request(s)</field>
<field name="res_model">hr.holidays</field> <field name="res_model">hr.holidays</field>
@ -173,22 +181,28 @@
<field name="act_window_id" ref="open_ask_holidays"/> <field name="act_window_id" ref="open_ask_holidays"/>
</record> </record>
<menuitem
<!-- <menuitem
name="Holidays Requests"
parent="menu_open_ask_holidays"
id="menu_open_ask_holidays_new"
action="open_ask_holidays"/>-->
<menuitem
name="Leaves Requests" name="Leaves Requests"
parent="menu_open_ask_holidays" parent="menu_open_ask_holidays"
id="menu_open_ask_holidays_new" id="menu_open_ask_holidays_new"
action="open_ask_holidays"/> action="open_ask_holidays"/>
<record model="ir.actions.act_window" id="open_allocation_holidays"> <record model="ir.actions.act_window" id="open_allocation_holidays">
<field name="name">Allocation Request(s)</field> <field name="name">Allocation Request(s)</field>
<field name="res_model">hr.holidays</field> <field name="res_model">hr.holidays</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="context">{'type':'add'}</field> <field name="context">{'type':'add'}</field>
<field name="domain">[('type','=','add')]</field> <field name="domain">[('type','=','add')]</field>
<field name="view_id" ref="allocation_leave_new" /> <field name="view_id" ref="allocation_leave_new" />
</record> </record>
<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree"> <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
<field name="sequence" eval="1"/> <field name="sequence" eval="1"/>
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="view_holiday"/> <field name="view_id" ref="view_holiday"/>
@ -202,11 +216,12 @@
<field name="act_window_id" ref="open_allocation_holidays"/> <field name="act_window_id" ref="open_allocation_holidays"/>
</record> </record>
<menuitem
name="Recuperation Days Requests" <!-- <menuitem
parent="menu_open_ask_holidays" name="Allocation Requests"
id="menu_open_allocation_holidays" parent="menu_open_ask_holidays"
action="open_allocation_holidays"/> id="menu_open_allocation_holidays"
action="open_allocation_holidays"/>-->
<!-- holidays status --> <!-- holidays status -->
<record model="ir.ui.view" id="edit_holiday_status_form"> <record model="ir.ui.view" id="edit_holiday_status_form">
@ -243,15 +258,14 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem <!--<menuitem
name="Leaves"
id="menu_leaves_config"
parent="hr.menu_hr_configuration"/>
<menuitem
action="open_view_holiday_status" action="open_view_holiday_status"
id="menu_open_view_holiday_status" id="menu_open_view_holiday_status"
parent="menu_leaves_config"/> parent="hr.menu_hr_configuration"/>-->
<menuitem name="Leaves Statuses"
action="open_view_holiday_status"
id="menu_open_view_holiday_status"
parent="hr_attendance.menu_open_view_attendance_reason_config"/>
<!-- Shortcuts --> <!-- Shortcuts -->
<act_window name="My Holiday Requests" <act_window name="My Holiday Requests"

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# #
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################

View File

@ -2,30 +2,33 @@
<openerp> <openerp>
<data> <data>
<report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/> <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
<wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/> <wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
<menuitem id="next_id_48" name="Timesheet" parent="hr.menu_hr_reporting"/>
<menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="next_id_48" type="wizard" <!--<menuitem id="next_id_48" name="Timesheet" parent="hr.menu_hr_reporting"/>-->
<!-- <menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="next_id_48" type="wizard"
groups="hr.group_hr_manager"/>-->
<menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="hr.menu_hr_reporting" type="wizard"
groups="hr.group_hr_manager" groups="hr.group_hr_manager"
/> />
<wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print My Timesheet"/> <wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print My Timesheet"/>
<menuitem <menuitem
action="wizard_hr_timesheet_my" action="wizard_hr_timesheet_my"
id="menu_wizard_hr_timesheet_my" id="menu_wizard_hr_timesheet_my"
parent="hr_timesheet.next_id_48" parent="hr.menu_hr_reporting"
type="wizard" type="wizard"
groups="hr.group_hr_user" groups="hr.group_hr_user"
/> />
<report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/> <report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
<wizard id="wizard_hr_timesheet_users" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet"/> <wizard id="wizard_hr_timesheet_users" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet"/>
<menuitem <menuitem
action="wizard_hr_timesheet_users" action="wizard_hr_timesheet_users"
id="menu_wizard_hr_timesheet_users" id="menu_wizard_hr_timesheet_users"
groups="hr.group_hr_manager" groups="hr.group_hr_manager"
parent="hr_timesheet.next_id_48" type="wizard"/> parent="hr.menu_hr_reporting" type="wizard"/>
</data> </data>
</openerp> </openerp>

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<record id="hr_timesheet_line_tree" model="ir.ui.view"> <record id="hr_timesheet_line_tree" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.tree</field> <field name="name">hr.analytic.timesheet.tree</field>
@ -33,7 +34,7 @@
<newline/> <newline/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/> <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/> <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/> <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/>
<field name="amount" select="2"/> <field name="amount" select="2"/>
<field name="general_account_id" select="2"/> <field name="general_account_id" select="2"/>
@ -41,7 +42,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="hr_timesheet_line_search" model="ir.ui.view"> <record id="hr_timesheet_line_search" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.search</field> <field name="name">hr.analytic.timesheet.search</field>
<field name="model">hr.analytic.timesheet</field> <field name="model">hr.analytic.timesheet</field>
@ -51,30 +52,42 @@
<group col='8' colspan='4'> <group col='8' colspan='4'>
<filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/> <filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
<filter icon="terp-hr" domain="[('user_id','=',uid)]" string="My Work" help="My Work"/> <filter icon="terp-hr" domain="[('user_id','=',uid)]" string="My Work" help="My Work"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="user_id" select="1" widget="selection"/> <field name="user_id" select="1" widget="selection"/>
<field name="account_id" select="1" widget="selection"/> <field name="account_id" select="1" widget="selection"/>
<field name="date" select="1"/> <field name="date" select="1"/>
</group> </group>
</search> </search>
</field> </field>
</record>
<menuitem id="menu_act_hr_timesheet_line_today_form" parent="hr.menu_hr_time" name="Working Hours" /> </record>
<!-- <menuitem id="menu_act_hr_timesheet_line_today_form" parent="hr.menu_hr_root" name="Working Hours" />-->
<record id="act_hr_timesheet_line_me_all_form" model="ir.actions.act_window">
<field name="name">My Working Hours</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.analytic.timesheet</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
</record>
<record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window"> <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
<field name="name">Working Hours</field> <field name="name">Working Hours</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">hr.analytic.timesheet</field> <field name="res_model">hr.analytic.timesheet</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="search_view_id" ref="hr_timesheet_line_search"/> <field name="search_view_id" ref="hr_timesheet_line_search"/>
</record> </record>
<menuitem <!-- <menuitem
action="act_hr_timesheet_line_evry1_all_form" action="act_hr_timesheet_line_evry1_all_form"
id="menu_act_hr_timesheet_line_evry1_all_form" id="menu_act_hr_timesheet_line_evry1_all_form"
parent="hr_timesheet.menu_act_hr_timesheet_line_today_form" parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"
groups="hr.group_hr_manager"/> groups="hr.group_hr_manager"/>-->
<record id="hr_timesheet_employee_extd_form" model="ir.ui.view"> <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
<field name="name">hr.timesheet.employee.extd_form</field> <field name="name">hr.timesheet.employee.extd_form</field>
@ -89,5 +102,7 @@
</notebook> </notebook>
</field> </field>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -2,7 +2,7 @@
<openerp> <openerp>
<data> <data>
<wizard id="si_so" model="hr.employee" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/> <wizard id="si_so" model="hr.employee" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>
<menuitem action="si_so" id="menu_si_so" parent="hr.menu_hr_time" type="wizard"/> <!-- <menuitem action="si_so" id="menu_si_so" parent="hr_attendance.menu_hr_attendance" type="wizard"/>-->
</data> </data>
</openerp> </openerp>

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# #
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
@ -45,7 +45,7 @@ The validation can be configured in te company:
""", """,
'author': 'Tiny', 'author': 'Tiny',
'website': 'http://www.openerp.com', 'website': 'http://www.openerp.com',
'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process'], 'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process','hr_attendance'],
'init_xml': [], 'init_xml': [],
'update_xml': [ 'update_xml': [
'security/ir.model.access.csv', 'security/ir.model.access.csv',

View File

@ -200,9 +200,9 @@
<field name="view_id" eval="False"/> <field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/> <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record> </record>
<menuitem <!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
action="act_hr_timesheet_sheet_form" <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
id="menu_act_hr_timesheet_sheet_form" parent="hr.menu_hr_time"/> groups="hr.group_hr_manager"/>
<!-- <!--
Company inheritancy Company inheritancy

View File

@ -4,8 +4,14 @@
<menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing" <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"
groups="group_mrp_user,group_mrp_manager"/> groups="group_mrp_user,group_mrp_manager"/>
<menuitem id="menu_mrp_reordering" name="Automatic Requisitions" parent="stock.menu_stock_root" sequence="4"/> <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="menu_mrp_root" sequence="1"/>
<menuitem name="Control" id="menu_mrp_control" parent="menu_mrp_root" sequence="3" />
<menuitem name="Master Data"
id="menu_mrp_bom"
parent="menu_mrp_root"
sequence="5" />
<!-- <!--
Property / Property Group Property / Property Group
--> -->
@ -34,7 +40,7 @@
name="Configuration" name="Configuration"
parent="menu_mrp_root" parent="menu_mrp_root"
groups="group_mrp_manager" groups="group_mrp_manager"
sequence="-50" /> sequence="50" />
<record id="mrp_property_tree_view" model="ir.ui.view"> <record id="mrp_property_tree_view" model="ir.ui.view">
<field name="name">mrp.property.tree</field> <field name="name">mrp.property.tree</field>
@ -74,7 +80,7 @@
id="menu_mrp_property" id="menu_mrp_property"
parent="menu_mrp_configuration" parent="menu_mrp_configuration"
groups="base.group_extended" groups="base.group_extended"
sequence="10" /> sequence="20" />
<menuitem <menuitem
action="mrp_property_action" action="mrp_property_action"
id="menu_mrp_property_action" id="menu_mrp_property_action"
@ -220,10 +226,10 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="mrp_routing_tree_view"/> <field name="view_id" ref="mrp_routing_tree_view"/>
</record> </record>
<menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="menu_mrp_configuration" groups="base.group_extended" <!-- <menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="mrp.menu_mrp_bom" groups="base.group_extended"
sequence="100" /> sequence="100" />-->
<menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_routing_and_workcenters" groups="base.group_extended" /> <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="40" />
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_routing_and_workcenters" groups="base.group_extended"/> <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="30"/>
<!-- <!--
Bill of Materials Bill of Materials
@ -309,10 +315,11 @@
</record> </record>
<!-- BOM menus --> <!-- BOM menus -->
<menuitem name="Bill of Materials"
<!-- <menuitem name="Bill of Materials"
id="menu_mrp_bom" id="menu_mrp_bom"
parent="menu_mrp_configuration" parent="menu_mrp_bom"
sequence="50" /> sequence="50" />-->
<menuitem action="mrp_bom_form_action" <menuitem action="mrp_bom_form_action"
id="menu_mrp_bom_form_action" id="menu_mrp_bom_form_action"
parent="menu_mrp_bom" parent="menu_mrp_bom"
@ -375,7 +382,7 @@
<field name="model">mrp.production</field> <field name="model">mrp.production</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree colors="red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date and state in ('done','cancel') " string="Production orders"> <tree colors="red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date and state in ('done','cancel') " string="Manufacturing Orders">
<field name="name"/> <field name="name"/>
<field name="product_id"/> <field name="product_id"/>
<field name="product_qty" sum="Total Qty"/> <field name="product_qty" sum="Total Qty"/>
@ -395,7 +402,7 @@
<field name="type">calendar</field> <field name="type">calendar</field>
<field eval="2" name="priority"/> <field eval="2" name="priority"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<calendar color="routing_id" date_start="date_planned" string="Production Orders"> <calendar color="routing_id" date_start="date_planned" string="Manufacturing Orders">
<field name="origin"/> <field name="origin"/>
<field name="product_id"/> <field name="product_id"/>
<field name="product_qty"/> <field name="product_qty"/>
@ -424,7 +431,7 @@
<field name="model">mrp.production</field> <field name="model">mrp.production</field>
<field name="type">graph</field> <field name="type">graph</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<graph string="Production orders" type="bar"> <graph string="Manufacturing Orders" type="bar">
<field name="date_planned_date"/> <field name="date_planned_date"/>
<field name="hour_total" operator="+"/> <field name="hour_total" operator="+"/>
<field name="cycle_total" operator="+"/> <field name="cycle_total" operator="+"/>
@ -444,7 +451,7 @@
<field name="model">mrp.production</field> <field name="model">mrp.production</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Production orders"> <form string="Manufacturing Orders">
<group colspan="4" col="7"> <group colspan="4" col="7">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="date_planned" select="1"/> <field name="date_planned" select="1"/>
@ -525,8 +532,8 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Production"> <search string="Search Production">
<group col='8' colspan='4'> <group col='8' colspan='4'>
<filter icon="terp-mrp" string="Ready" domain="[('state','=','ready')]" help="Production orders which are ready to produce"/> <filter icon="terp-mrp" string="Ready" domain="[('state','=','ready')]" help="Manufacturing Orders which are ready to produce"/>
<filter icon="terp-mrp" string="In Production" domain="[('state','=','in_production')]" help="Production orders which are in production"/> <filter icon="terp-mrp" string="In Production" domain="[('state','=','in_production')]" help="Manufacturing Orders which are in production"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="name" select='1'/> <field name="name" select='1'/>
<field name="product_id" select='1'/> <field name="product_id" select='1'/>
@ -538,7 +545,7 @@
</record> </record>
<record id="mrp_production_action" model="ir.actions.act_window"> <record id="mrp_production_action" model="ir.actions.act_window">
<field name="name">Production Orders</field> <field name="name">Manufacturing Orders</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.production</field> <field name="res_model">mrp.production</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -546,10 +553,10 @@
<field name="view_id" eval="False"/> <field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_mrp_production_filter"/> <field name="search_view_id" ref="view_mrp_production_filter"/>
</record> </record>
<menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root" sequence="-30"/> <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" sequence="1"/>
<record id="mrp_production_action2_gantt" model="ir.actions.act_window"> <record id="mrp_production_action2_gantt" model="ir.actions.act_window">
<field name="name">Production Orders Planning</field> <field name="name">Manufacturing Orders Planning</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.production</field> <field name="res_model">mrp.production</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -558,7 +565,7 @@
</record> </record>
<record id="mrp_production_action2" model="ir.actions.act_window"> <record id="mrp_production_action2" model="ir.actions.act_window">
<field name="name">Production Orders To Start</field> <field name="name">Manufacturing Orders To Start</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.production</field> <field name="res_model">mrp.production</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -569,7 +576,7 @@
</record> </record>
<record id="mrp_production_action3" model="ir.actions.act_window"> <record id="mrp_production_action3" model="ir.actions.act_window">
<field name="name">Production Orders in Progress</field> <field name="name">Manufacturing Orders in Progress</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.production</field> <field name="res_model">mrp.production</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -580,7 +587,7 @@
</record> </record>
<record id="mrp_production_action4" model="ir.actions.act_window"> <record id="mrp_production_action4" model="ir.actions.act_window">
<field name="name">Production Orders Waiting Products</field> <field name="name">Manufacturing Orders Waiting Products</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.production</field> <field name="res_model">mrp.production</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -654,7 +661,7 @@
</record> </record>
<!-- <!--
Requisition Procurement
--> -->
<record id="mrp_procurement_tree_view" model="ir.ui.view"> <record id="mrp_procurement_tree_view" model="ir.ui.view">
@ -662,7 +669,7 @@
<field name="model">mrp.procurement</field> <field name="model">mrp.procurement</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Requisition Lines"> <tree string="Procurement Lines">
<field name="name"/> <field name="name"/>
<field name="product_id"/> <field name="product_id"/>
<field name="product_qty"/> <field name="product_qty"/>
@ -680,10 +687,10 @@
<field name="model">mrp.procurement</field> <field name="model">mrp.procurement</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Requisition"> <form string="Procurement">
<group col="2" colspan="2"> <group col="2" colspan="2">
<separator colspan="2" string="References"/> <separator colspan="2" string="References"/>
<field name="name" select="1" string="Requisition Reason"/> <field name="name" select="1" string="Procurement Reason"/>
<field name="origin" select="2"/> <field name="origin" select="2"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/> <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
</group> </group>
@ -694,7 +701,7 @@
<field name="priority" groups="base.group_extended"/> <field name="priority" groups="base.group_extended"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Requisition Details"> <page string="Procurement Details">
<separator colspan="4" string="Product &amp; Location"/> <separator colspan="4" string="Product &amp; Location"/>
<field name="product_id" select="1" on_change="onchange_product_id(product_id)"/> <field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
<field name="location_id" select="2"/> <field name="location_id" select="2"/>
@ -711,7 +718,7 @@
<button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/> <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
<button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/> <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
<button name="button_cancel" states="exception,waiting" string="Cancel" icon="gtk-cancel"/> <button name="button_cancel" states="exception,waiting" string="Cancel" icon="gtk-cancel"/>
<button name="button_check" states="confirmed" string="Run Requisition" icon="gtk-media-play"/> <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
<button name="button_cancel" states="draft,running" string="Cancel" icon="gtk-cancel"/> <button name="button_cancel" states="draft,running" string="Cancel" icon="gtk-cancel"/>
</group> </group>
</page> </page>
@ -728,7 +735,7 @@
<page string="Notes"> <page string="Notes">
<separator colspan="4" string="Note" /> <separator colspan="4" string="Note" />
<field name="note" colspan="4" nolabel="1"/> <field name="note" colspan="4" nolabel="1"/>
</page> </page>
</notebook> </notebook>
</form> </form>
</field> </field>
@ -738,9 +745,9 @@
<field name="model">mrp.procurement</field> <field name="model">mrp.procurement</field>
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Requisition"> <search string="Search Procurement">
<group col='8' colspan='4'> <group col='8' colspan='4'>
<filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Requisition orders with exceptions"/> <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="name" select='1'/> <field name="name" select='1'/>
<field name="product_id" select='1'/> <field name="product_id" select='1'/>
@ -751,18 +758,18 @@
</field> </field>
</record> </record>
<record id="mrp_procurement_action" model="ir.actions.act_window"> <record id="mrp_procurement_action" model="ir.actions.act_window">
<field name="name">Requisition Orders</field> <field name="name">Procurement Orders</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field> <field name="res_model">mrp.procurement</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" eval="False"/> <field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_mrp_procurement_filter"/> <field name="search_view_id" ref="view_mrp_procurement_filter"/>
</record> </record>
<menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root" <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_manufacturing"
sequence="-40" /> sequence="2" />
<record id="mrp_procurement_action3" model="ir.actions.act_window"> <record id="mrp_procurement_action3" model="ir.actions.act_window">
<field name="name">Unscheduled Requisitions</field> <field name="name">Requisitions</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field> <field name="res_model">mrp.procurement</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -770,8 +777,23 @@
<field name="domain">[('state','=','confirmed')]</field> <field name="domain">[('state','=','confirmed')]</field>
</record> </record>
<menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management"
name="Requisitions" sequence="5" />
<record id="mrp_procurement_action_quotation" model="ir.actions.act_window">
<field name="name">Quotation Request</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft')]</field>
</record>
<menuitem action="mrp_procurement_action_quotation" id="menu_procurement_request_quotation" parent="purchase.menu_procurement_management"
name="Request for Quotations" sequence="6" />
<record id="mrp_procurement_action5" model="ir.actions.act_window"> <record id="mrp_procurement_action5" model="ir.actions.act_window">
<field name="name">Requisition Exceptions</field> <field name="name">Procurement Exceptions</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field> <field name="res_model">mrp.procurement</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -779,8 +801,10 @@
<field name="domain">[('state','=','exception')]</field> <field name="domain">[('state','=','exception')]</field>
</record> </record>
<menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_exception_action" parent="mrp.menu_mrp_control"
sequence="1" />
<record id="mrp_procurement_action4" model="ir.actions.act_window"> <record id="mrp_procurement_action4" model="ir.actions.act_window">
<field name="name">Requisition Exceptions to Fix</field> <field name="name">Procurement Exceptions to Fix</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field> <field name="res_model">mrp.procurement</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -790,7 +814,7 @@
</record> </record>
<record id="mrp_procurement_action11" model="ir.actions.act_window"> <record id="mrp_procurement_action11" model="ir.actions.act_window">
<field name="name">Temporary Requisition Exceptions</field> <field name="name">Temporary Procurement Exceptions</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field> <field name="res_model">mrp.procurement</field>
<field name="view_type">form</field> <field name="view_type">form</field>

View File

@ -2,7 +2,8 @@
<openerp> <openerp>
<data> <data>
<wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute Schedulers" name="mrp.procurement.compute.all"/> <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute Schedulers" name="mrp.procurement.compute.all"/>
<menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="90"/> <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="menu_mrp_root" sequence="4"/>
<menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" type="wizard" sequence="90"/>
<wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Requisitions Only" name="mrp.procurement.compute"/> <wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Requisitions Only" name="mrp.procurement.compute"/>
<!-- <!--
<menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/> <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
<menuitem id="menu_mrp_planning" name="Planning" parent="mrp.menu_mrp_root" sequence="2"/>
<record model="ir.ui.view" id="mrp_production_workcenter_tree_view_inherit"> <record model="ir.ui.view" id="mrp_production_workcenter_tree_view_inherit">
<field name="name">mrp.production.workcenter.line.tree</field> <field name="name">mrp.production.workcenter.line.tree</field>
<field name="model">mrp.production.workcenter.line</field> <field name="model">mrp.production.workcenter.line</field>
@ -138,7 +138,7 @@
<field name="res_model">mrp.production.workcenter.line</field> <field name="res_model">mrp.production.workcenter.line</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="domain">[('production_state','in',('ready','confirmed','in_production'))]</field> <field name="domain">[('production_state','in',('ready','confirmed','in_production'))]</field>
<field name="view_mode">gantt,tree,form,graph,calendar</field> <field name="view_mode">tree,form,graph,calendar</field>
</record> </record>
@ -151,7 +151,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form,graph,gantt,calendar</field> <field name="view_mode">tree,form,graph,gantt,calendar</field>
<field name="domain">[('production_state','=','ready')]</field> <field name="domain">[('production_state','=','ready')]</field>
<field name="filter" eval="True"/> <field name="filter" eval="True"/>
</record> </record>
<!-- Action for Draft Operations --> <!-- Action for Draft Operations -->
@ -163,7 +163,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="domain">[('state','=','draft')]</field> <field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/> <field name="filter" eval="True"/>
</record> </record>
<record model="ir.values" id="mrp_production_wc_action_open"> <record model="ir.values" id="mrp_production_wc_action_open">
@ -175,7 +175,10 @@
</record> </record>
<menuitem name="All Work Orders" parent="mrp.menu_mrp_root" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/> <menuitem action="mrp.mrp_production_action" id="menu_mrp_production_order_action" parent="menu_mrp_planning" sequence="1"/>
<menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing" id="menu_mrp_production_wc_order" action="mrp_production_wc_action_form"/>
<menuitem name="Work Orders" parent="menu_mrp_planning" id="menu_mrp_production_wc_action_planning" action="mrp_production_wc_action_planning" sequence="2"/>
<!-- <menuitem name="All Work Orders" parent="menu_mrp_planning" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>-->
<!-- Operation codes --> <!-- Operation codes -->
@ -214,7 +217,7 @@
<field name="view_id" ref="mrp_production_code_tree_view"/> <field name="view_id" ref="mrp_production_code_tree_view"/>
</record> </record>
<menuitem name="Start - Stop Codes" parent="mrp.menu_mrp_configuration" id="menu_mrp_production_code_action" action="mrp_production_code_action"/> <!-- <menuitem name="Start - Stop Codes" parent="menu_mrp_planning" id="menu_mrp_production_code_action" action="mrp_production_code_action"/>-->
<!-- Operations --> <!-- Operations -->
@ -271,11 +274,11 @@
<field name="view_id" ref="mrp_production_operation_tree_view"/> <field name="view_id" ref="mrp_production_operation_tree_view"/>
</record> </record>
<menuitem <!-- <menuitem-->
name="Work Order Events Using Bar Codes" <!-- name="Work Order Events Using Bar Codes"-->
parent="mrp.menu_mrp_root" <!-- parent="menu_mrp_planning"-->
id="menu_mrp_production_operation_action" <!-- id="menu_mrp_production_operation_action"-->
action="mrp_production_operation_action"/> <!-- action="mrp_production_operation_action"/>-->
<record id="mrp_production_reorder_form_view" model="ir.ui.view"> <record id="mrp_production_reorder_form_view" model="ir.ui.view">
<field name="name">mrp.production.allow_reorder.form</field> <field name="name">mrp.production.allow_reorder.form</field>

View File

@ -1,21 +1,21 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data> <data>
<!-- <!--
Process Process
--> -->
<record id="process_process_mrpoperationprocess0" model="process.process"> <record id="process_process_mrpoperationprocess0" model="process.process">
<field eval="&quot;&quot;&quot;Mrp Operations&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Mrp Operations&quot;&quot;&quot;" name="name"/>
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/> <field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval="1" name="active"/> <field eval="1" name="active"/>
</record> </record>
<!-- <!--
Process Node Process Node
--> -->
<record id="process_node_productionorder0" model="process.node"> <record id="process_node_productionorder0" model="process.node">
<field name="menu_id" ref="mrp.menu_mrp_production_action"/> <field name="menu_id" ref="mrp.menu_mrp_production_action"/>
<field name="model_id" ref="mrp.model_mrp_production"/> <field name="model_id" ref="mrp.model_mrp_production"/>
@ -26,9 +26,9 @@
<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_workorder0" model="process.node"> <record id="process_node_workorder0" model="process.node">
<field name="menu_id" ref="menu_mrp_production_operation_action"/> <!-- <field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/> <field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Information from the routing definition.&quot;&quot;&quot;" name="note"/> <field eval="&quot;&quot;&quot;Information from the routing definition.&quot;&quot;&quot;" name="note"/>
@ -37,9 +37,9 @@
<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_startoperation0" model="process.node"> <record id="process_node_startoperation0" model="process.node">
<field name="menu_id" ref="menu_mrp_production_operation_action"/> <!-- <field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/> <field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Start the operation.&quot;&quot;&quot;" name="note"/> <field eval="&quot;&quot;&quot;Start the operation.&quot;&quot;&quot;" name="note"/>
@ -48,9 +48,9 @@
<field eval="&quot;&quot;&quot;object.state=='startworking'&quot;&quot;&quot;" name="model_states"/> <field eval="&quot;&quot;&quot;object.state=='startworking'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/> <field eval="0" name="flow_start"/>
</record> </record>
<record id="process_node_doneoperation0" model="process.node"> <record id="process_node_doneoperation0" model="process.node">
<field name="menu_id" ref="menu_mrp_production_operation_action"/> <!-- <field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/> <field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Finish the operation.&quot;&quot;&quot;" name="note"/> <field eval="&quot;&quot;&quot;Finish the operation.&quot;&quot;&quot;" name="note"/>
@ -59,9 +59,9 @@
<field eval="&quot;&quot;&quot;object.state=='done'&quot;&quot;&quot;" name="model_states"/> <field eval="&quot;&quot;&quot;object.state=='done'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/> <field eval="0" name="flow_start"/>
</record> </record>
<record id="process_node_canceloperation0" model="process.node"> <record id="process_node_canceloperation0" model="process.node">
<field name="menu_id" ref="menu_mrp_production_operation_action"/> <!-- <field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/> <field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Cancel the operation.&quot;&quot;&quot;" name="note"/> <field eval="&quot;&quot;&quot;Cancel the operation.&quot;&quot;&quot;" name="note"/>
@ -70,11 +70,11 @@
<field eval="&quot;&quot;&quot;object.state=='cancel'&quot;&quot;&quot;" name="model_states"/> <field eval="&quot;&quot;&quot;object.state=='cancel'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/> <field eval="0" name="flow_start"/>
</record> </record>
<!-- <!--
Process Transition Process Transition
--> -->
<record id="process_transition_productionstart0" model="process.transition"> <record id="process_transition_productionstart0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/>
@ -83,7 +83,7 @@
<field model="process.node" name="target_node_id" ref="process_node_startoperation0"/> <field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
<field model="process.node" name="source_node_id" ref="process_node_productionorder0"/> <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
</record> </record>
<record id="process_transition_workstartoperation0" model="process.transition"> <record id="process_transition_workstartoperation0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/>
@ -92,7 +92,7 @@
<field model="process.node" name="target_node_id" ref="process_node_startoperation0"/> <field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
<field model="process.node" name="source_node_id" ref="process_node_workorder0"/> <field model="process.node" name="source_node_id" ref="process_node_workorder0"/>
</record> </record>
<record id="process_transition_startdoneoperation0" model="process.transition"> <record id="process_transition_startdoneoperation0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/>
@ -101,7 +101,7 @@
<field model="process.node" name="target_node_id" ref="process_node_doneoperation0"/> <field model="process.node" name="target_node_id" ref="process_node_doneoperation0"/>
<field model="process.node" name="source_node_id" ref="process_node_startoperation0"/> <field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
</record> </record>
<record id="process_transition_startcanceloperation0" model="process.transition"> <record id="process_transition_startcanceloperation0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/>
@ -110,7 +110,6 @@
<field model="process.node" name="target_node_id" ref="process_node_canceloperation0"/> <field model="process.node" name="target_node_id" ref="process_node_canceloperation0"/>
<field model="process.node" name="source_node_id" ref="process_node_startoperation0"/> <field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -224,7 +224,7 @@
<field name="filter" eval="True"/> <field name="filter" eval="True"/>
</record> </record>
<menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_root" name="Repairs" sequence="50"/> <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_manufacturing" name="Repairs" sequence="50"/>
</data> </data>
</openerp> </openerp>

View File

@ -2,7 +2,7 @@
<openerp> <openerp>
<data> <data>
<menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="product.menu_config_product" sequence="2"/> <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="base.menu_base_config" sequence="50"/>
<record id="product_pricelist_version_form_view" model="ir.ui.view"> <record id="product_pricelist_version_form_view" model="ir.ui.view">
<field name="name">product.pricelist.version.form</field> <field name="name">product.pricelist.version.form</field>
@ -165,8 +165,8 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem name="Prices Computations" id="menu_price" parent="product.menu_config_product"/> <!-- <menuitem name="Prices Computations" id="menu_price" parent="product.menu_config_product"/>-->
<menuitem action="product_price_type_action" groups="base.group_extended" id="menu_product_price_type_action" parent="menu_price"/> <!-- <menuitem action="product_price_type_action" groups="base.group_extended" id="menu_product_price_type_action" parent="menu_price"/>-->
<record id="product_pricelist_type_view" model="ir.ui.view"> <record id="product_pricelist_type_view" model="ir.ui.view">
<field name="name">product.pricelist.type.form</field> <field name="name">product.pricelist.type.form</field>
@ -186,7 +186,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="product_pricelist_type_action" groups="base.group_extended" id="menu_product_pricelist_type_action" parent="menu_price"/> <!-- <menuitem action="product_pricelist_type_action" groups="base.group_extended" id="menu_product_pricelist_type_action" parent="menu_price"/>-->
</data> </data>
</openerp> </openerp>

View File

@ -1,23 +1,23 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data> <data>
<!-- <!--
Process Process
--> -->
<record id="process_process_productprocess0" model="process.process"> <record id="process_process_productprocess0" model="process.process">
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field name="model_id" ref="product.model_product_product"/> <field name="model_id" ref="product.model_product_product"/>
<field eval="&quot;&quot;&quot;Product&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Product&quot;&quot;&quot;" name="name"/>
</record> </record>
<!-- <!--
Process Node Process Node
--> -->
<record id="process_node_product0" model="process.node"> <record id="process_node_product0" model="process.node">
<field name="menu_id" ref="product.menu_products"/> <!-- <field name="menu_id" ref="product.menu_products"/>-->
<field name="model_id" ref="product.model_product_product"/> <field name="model_id" ref="product.model_product_product"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Product&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Product&quot;&quot;&quot;" name="name"/>
@ -26,9 +26,9 @@
<field eval="&quot;&quot;&quot;object.state in ('', 'sellable', 'draft', 'obsolete', 'end') &quot;&quot;&quot;" name="model_states"/> <field eval="&quot;&quot;&quot;object.state in ('', 'sellable', 'draft', 'obsolete', 'end') &quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/> <field eval="1" name="flow_start"/>
</record> </record>
<record id="process_node_supplier0" model="process.node"> <record id="process_node_supplier0" model="process.node">
<field name="menu_id" ref="product.menu_products"/> <!-- <field name="menu_id" ref="product.menu_products"/>-->
<field name="model_id" ref="product.model_product_supplierinfo"/> <field name="model_id" ref="product.model_product_supplierinfo"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Supplier Information&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Supplier Information&quot;&quot;&quot;" name="name"/>
@ -36,11 +36,11 @@
<field name="process_id" ref="process_process_productprocess0"/> <field name="process_id" ref="process_process_productprocess0"/>
<field eval="0" name="flow_start"/> <field eval="0" name="flow_start"/>
</record> </record>
<!-- <!--
Process Transition Process Transition
--> -->
<record id="process_transition_supplierofproduct0" model="process.transition"> <record id="process_transition_supplierofproduct0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/>
@ -49,6 +49,6 @@
<field model="process.node" name="target_node_id" ref="process_node_supplier0"/> <field model="process.node" name="target_node_id" ref="process_node_supplier0"/>
<field model="process.node" name="source_node_id" ref="process_node_product0"/> <field model="process.node" name="source_node_id" ref="process_node_product0"/>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem icon="terp-product" id="menu_main_product" name="Products"/> <!-- <menuitem icon="terp-product" id="menu_main_product" name="Products"/>-->
<menuitem <!-- <menuitem-->
id="menu_config_product" <!-- id="menu_config_product"-->
name="Configuration" <!-- name="Configuration"-->
parent="product.menu_main_product" <!-- parent="product.menu_main_product"-->
sequence="1" <!-- sequence="1"-->
groups="group_product_manager"/> <!-- groups="group_product_manager"/>-->
<record id="product_search_form_view" model="ir.ui.view"> <record id="product_search_form_view" model="ir.ui.view">
<field name="name">product.search.form</field> <field name="name">product.search.form</field>
@ -188,7 +188,17 @@
<field name="search_view_id" ref="product_search_form_view"/> <field name="search_view_id" ref="product_search_form_view"/>
</record> </record>
<menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="1"/> <!-- <menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="1"/>-->
<record id="product_normal_action_puchased" model="ir.actions.act_window">
<field name="name">Products</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">product.product</field>
<field name="view_type">form</field>
<field name="domain">[('purchase_ok','=',1)]</field>
<field name="view_id" ref="product_product_tree_view"/>
<field name="search_view_id" ref="product_search_form_view"/>
</record>
<record id="product_category_form_view" model="ir.ui.view"> <record id="product_category_form_view" model="ir.ui.view">
<field name="name">product.category.form</field> <field name="name">product.category.form</field>
@ -233,7 +243,7 @@
<field name="view_type">tree</field> <field name="view_type">tree</field>
<field name="view_id" ref="product_category_tree_view"/> <field name="view_id" ref="product_category_tree_view"/>
</record> </record>
<menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product" sequence="3"/> <!-- <menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product" sequence="3"/>-->
<record id="product_category_action_form" model="ir.actions.act_window"> <record id="product_category_action_form" model="ir.actions.act_window">
<field name="name">Products Categories</field> <field name="name">Products Categories</field>
@ -242,7 +252,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="product_category_list_view"/> <field name="view_id" ref="product_category_list_view"/>
</record> </record>
<menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="product.menu_config_product" sequence="1"/> <!-- <menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="product.menu_config_product" sequence="1"/>-->
<record id="product_normal_action_tree" model="ir.actions.act_window"> <record id="product_normal_action_tree" model="ir.actions.act_window">
@ -302,7 +312,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="product_uom_tree_view"/> <field name="view_id" ref="product_uom_tree_view"/>
</record> </record>
<menuitem id="next_id_16" name="Units of Measure" parent="product.menu_config_product"/><menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/> <!-- <menuitem id="next_id_16" name="Units of Measure" parent="product.menu_config_product"/><menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>-->
<record id="product_uom_categ_form_view" model="ir.ui.view"> <record id="product_uom_categ_form_view" model="ir.ui.view">
<field name="name">product.uom.categ.form</field> <field name="name">product.uom.categ.form</field>
@ -321,7 +331,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.next_id_16" sequence="5"/> <!-- <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.next_id_16" sequence="5"/>-->
<record id="product_ul_form_view" model="ir.ui.view"> <record id="product_ul_form_view" model="ir.ui.view">
<field name="name">product.ul.form.view</field> <field name="name">product.ul.form.view</field>
@ -352,7 +362,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="product.menu_config_product" sequence="4"/> <!-- <menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="product.menu_config_product" sequence="4"/>-->
<record id="product_packaging_tree_view" model="ir.ui.view"> <record id="product_packaging_tree_view" model="ir.ui.view">
<field name="name">product.packaging.tree.view</field> <field name="name">product.packaging.tree.view</field>

View File

@ -4,11 +4,11 @@
<wizard id="action_open_margin" menu="False" model="product.product" name="product.margins" string="Product Margins"/> <wizard id="action_open_margin" menu="False" model="product.product" name="product.margins" string="Product Margins"/>
<menuitem id="menu_product_reporting" <!-- <menuitem id="menu_product_reporting"-->
name="Reporting" parent ="product.menu_main_product" <!-- name="Reporting" parent ="product.menu_main_product"-->
groups="product.group_product_manager"/> <!-- groups="product.group_product_manager"/>-->
<!---->
<menuitem icon="STOCK_JUSTIFY_FILL" action="action_open_margin" id="menu_action_product_margin" type="wizard" sequence="5" parent="menu_product_reporting" /> <!-- <menuitem icon="STOCK_JUSTIFY_FILL" action="action_open_margin" id="menu_action_product_margin" type="wizard" sequence="5" parent="menu_product_reporting" />-->
<record model="ir.ui.view" id="view_product_margin_graph"> <record model="ir.ui.view" id="view_product_margin_graph">
<field name="name">product.margin.graph</field> <field name="name">product.margin.graph</field>

View File

@ -26,7 +26,7 @@
"author" : "Tiny", "author" : "Tiny",
"website" : "http://www.openerp.com", "website" : "http://www.openerp.com",
"category" : "Generic Modules/Projects & Services", "category" : "Generic Modules/Projects & Services",
"depends" : ["product", "account", "hr", "process", "mail_gateway"], "depends" : ["product", "account", "hr", "process", "mail_gateway","hr_timesheet_sheet","report_timesheet","account_budget"],
"description": """Project management module that track multi-level projects, tasks, "description": """Project management module that track multi-level projects, tasks,
works done on tasks, eso. It is able to render planning, order tasks, eso. works done on tasks, eso. It is able to render planning, order tasks, eso.
""", """,

View File

@ -2,8 +2,25 @@
<openerp> <openerp>
<data> <data>
<menuitem icon="terp-project" id="menu_main" name="Project Management"/> <menuitem icon="terp-project" id="menu_main" name="Project Management"/>
<menuitem id="menu_tasks" name="Tasks" parent="menu_main"/> <menuitem id="menu_project_management" name="Project Management" parent="menu_main" sequence="1"/>
<menuitem id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="1"/> <!-- <menuitem id="menu_tasks" name="Tasks" parent="menu_main"/>-->
<menuitem id="menu_pm_invoicing" name="Invoicing" parent="menu_main" sequence="7"/>
<menuitem id="menu_pm_budget" name="Budgets" parent="menu_pm_invoicing"/>
<menuitem action="account_budget.open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
<menuitem parent="menu_pm_budget"
id="menu_act_pm_crossovered_budget_view"
action="account_budget.act_crossovered_budget_view" />
<menuitem id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="60"/>
<!--Time Tracking menu-->
<menuitem
id="menu_project_management_time_tracking"
name="Time Tracking"
parent="menu_main" sequence="3"/>
<menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="menu_project_management_time_tracking"
groups="hr.group_hr_manager"/>
<menuitem action="report_timesheet.action_random_timesheet_lines_board" id="menu_project_management_timesheet_lines_board" parent="menu_project_management_time_tracking"/>
<menuitem action="hr_attendance.si_so" id="menu_project_management_si_so" parent="menu_project_management_time_tracking" type="wizard"/>
<!-- Project --> <!-- Project -->
<record id="edit_project" model="ir.ui.view"> <record id="edit_project" model="ir.ui.view">
@ -144,7 +161,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<menuitem id="menu_all_project" parent="project.menu_main" name="Projects"/> <!--<menuitem id="menu_all_project" parent="project.menu_main" name="Projects"/> -->
<record id="open_view_project_all" model="ir.actions.act_window"> <record id="open_view_project_all" model="ir.actions.act_window">
<field name="name">All projects</field> <field name="name">All projects</field>
@ -154,7 +171,7 @@
<field name="view_id" ref="view_project"/> <field name="view_id" ref="view_project"/>
<field name="search_view_id" ref="view_project_project_filter"/> <field name="search_view_id" ref="view_project_project_filter"/>
</record> </record>
<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_all_project"/> <!--<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_all_project"/> -->
<record id="open_view_template_project" model="ir.actions.act_window"> <record id="open_view_template_project" model="ir.actions.act_window">
<field name="name">Templates of Projects</field> <field name="name">Templates of Projects</field>
@ -163,8 +180,9 @@
<field name="domain">[('state','=','template')]</field> <field name="domain">[('state','=','template')]</field>
<field name="view_id" ref="view_project"/> <field name="view_id" ref="view_project"/>
</record> </record>
<menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_definitions"/> <!--<menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_definitions"/>-->
<menuitem id="menu_template_project_specification" parent="project.menu_definitions" name="Specification" sequence="1"/>
<menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_template_project_specification" name="Specification Template"/>
<record id="view_task_work_form" model="ir.ui.view"> <record id="view_task_work_form" model="ir.ui.view">
<field name="name">project.task.work.form</field> <field name="name">project.task.work.form</field>
<field name="model">project.task.work</field> <field name="model">project.task.work</field>
@ -218,10 +236,10 @@
<field name="domain">[('parent_id','=',False)]</field> <field name="domain">[('parent_id','=',False)]</field>
<field name="view_id" ref="view_my_project"/> <field name="view_id" ref="view_my_project"/>
</record> </record>
<menuitem <!--<menuitem
action="open_view_my_project_open" action="open_view_my_project_open"
id="menu_open_view_my_project_open" id="menu_open_view_my_project_open"
parent="project.menu_all_project"/> parent="project.menu_all_project"/>-->
<!-- Wizard for compute remaining hours --> <!-- Wizard for compute remaining hours -->
@ -485,7 +503,8 @@
<field eval="True" name="filter"/> <field eval="True" name="filter"/>
<field name="search_view_id" ref="view_task_search_form"/> <field name="search_view_id" ref="view_task_search_form"/>
</record> </record>
<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_tasks"/> <!--<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_tasks"/> -->
<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" name="Tasks"/>
<record id="action_view_task_department" model="ir.actions.act_window"> <record id="action_view_task_department" model="ir.actions.act_window">
<field name="name">My Department Tasks</field> <field name="name">My Department Tasks</field>
@ -729,8 +748,8 @@ menu_main
<field name="view_id" ref="view_project_message_tree"/> <field name="view_id" ref="view_project_message_tree"/>
</record> </record>
<menuitem id="menu_message_main" name="Message" parent="menu_main"/> <!--<menuitem id="menu_message_main" name="Message" parent="menu_main"/>-->
<menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_message_main"/> <menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_project_management" sequence="11"/>
<act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/> <act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>

View File

@ -123,11 +123,11 @@
<field name="search_view_id" ref="project.view_task_search_form"/> <field name="search_view_id" ref="project.view_task_search_form"/>
</record> </record>
<menuitem name="Todo List" <!-- <menuitem name="Todo List"
groups="group_project_getting" groups="group_project_getting"
id="menu_task_inbox" id="menu_task_inbox"
parent="project.menu_main" parent="project.menu_main"
action="action_prject_task_tree"/> action="action_prject_task_tree"/>-->
<act_window name="My Inbox" <act_window name="My Inbox"
domain="[('user_id', '=', uid),('state','in',('draft','open'))]" domain="[('user_id', '=', uid),('state','in',('draft','open'))]"

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# #
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
@ -31,7 +31,7 @@
""", """,
'author': 'Tiny', 'author': 'Tiny',
'website': 'http://www.openerp.com', 'website': 'http://www.openerp.com',
'depends': ['base', 'project', 'hr_timesheet_sheet'], 'depends': ['base', 'project', 'hr_timesheet_sheet','hr_timesheet'],
'init_xml': [], 'init_xml': [],
'update_xml': ["process/project_timesheet_process.xml"], 'update_xml': ["process/project_timesheet_process.xml"],
'demo_xml': [], 'demo_xml': [],

View File

@ -7,7 +7,7 @@
--> -->
<record id="process_node_timesheettask0" model="process.node"> <record id="process_node_timesheettask0" model="process.node">
<field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form"/> <!-- <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form"/>-->
<field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/> <field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Timesheet task&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Timesheet task&quot;&quot;&quot;" name="name"/>

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# #
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################

View File

@ -17,7 +17,7 @@
--> -->
<record id="process_node_packinginvoice0" model="process.node"> <record id="process_node_packinginvoice0" model="process.node">
<field name="menu_id" ref="stock.menu_action_picking_tree"/> <!-- <field name="menu_id" ref="stock.menu_action_picking_tree"/>-->
<field name="model_id" ref="stock.model_stock_picking"/> <field name="model_id" ref="stock.model_stock_picking"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Outgoing Products&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Outgoing Products&quot;&quot;&quot;" name="name"/>
@ -119,7 +119,7 @@
</record> </record>
<record id="process_node_productrecept0" model="process.node"> <record id="process_node_productrecept0" model="process.node">
<field name="menu_id" ref="stock.menu_action_picking_tree"/> <!-- <field name="menu_id" ref="stock.menu_action_picking_tree"/>-->
<field name="model_id" ref="stock.model_stock_picking"/> <field name="model_id" ref="stock.model_stock_picking"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Incoming Products&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Incoming Products&quot;&quot;&quot;" name="name"/>

View File

@ -1,8 +1,40 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management" <!--<menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"
groups="group_purchase_user"/>-->
<menuitem icon="terp-purchase" id="menu_purchase_root" name="Procurement Management"
groups="group_purchase_user"/> groups="group_purchase_user"/>
<menuitem id="menu_procurement_management" name="Procurement Management"
parent="menu_purchase_root" sequence="1"/>
<!--supplier menu-->
<menuitem id="menu_procurement_management_supplier" name="Suppliers"
parent="menu_purchase_root" sequence="3"/>
<menuitem id="menu_procurement_management_supplier_name" name="Suppliers"
parent="menu_procurement_management_supplier" action="base.action_partner_supplier_form" />
<!--Inventory control-->
<menuitem id="menu_procurement_management_nventory" name="Inventory Control"
parent="menu_purchase_root" sequence="4"/>
<menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_nventory"
name="Incoming shipments" sequence="9"/>
<menuitem action="stock.action_reception_picking_move" id="menu_action_reception_picking_move"
name="Incoming Products" parent="menu_procurement_management_nventory" sequence="10"/>
<!--Invoice control-->
<menuitem id="menu_procurement_management_invoice" name="Invoice Control"
parent="menu_purchase_root" sequence="6"/>
<menuitem name="Pending Invoices" id="menu_procurement_management_panding_invoice" action="account.action_invoice_tree_panding_invoice"
parent="menu_procurement_management_invoice"/>
<!--product menu-->
<menuitem id="menu_procurement_management_product" name="Product"
parent="menu_purchase_root" sequence="8"/>
<menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
parent="menu_procurement_management_product"/>
<record model="ir.ui.view" id="purchase_order_calendar"> <record model="ir.ui.view" id="purchase_order_calendar">
<field name="name">purchase.order.calendar</field> <field name="name">purchase.order.calendar</field>
@ -140,7 +172,7 @@
<field name="view_mode">tree,form,calendar,graph</field> <field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_purchase_order_filter"/> <field name="search_view_id" ref="view_purchase_order_filter"/>
</record> </record>
<menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/> <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
<record id="purchase_form_action4" model="ir.actions.act_window"> <record id="purchase_form_action4" model="ir.actions.act_window">
<field name="name">Purchase Orders in Progress</field> <field name="name">Purchase Orders in Progress</field>

View File

@ -5,7 +5,7 @@
# #
# Define PO Line Views # Define PO Line Views
# #
<record id="purchase_order_form" model="ir.ui.view"> <record id="purchase_order_form" model="ir.ui.view">
<field name="name">purchase.order.form</field> <field name="name">purchase.order.form</field>
<field name="model">purchase.order</field> <field name="model">purchase.order</field>
@ -54,7 +54,7 @@
</field> </field>
</record> </record>
# #
# Inherit PO view to get buttons # Inherit PO view to get buttons
# #
@ -77,7 +77,7 @@
<field name="view_id" ref="purchase_order_line_form"/> <field name="view_id" ref="purchase_order_line_form"/>
<field name="act_window_id" ref="purchase_line_form_action"/> <field name="act_window_id" ref="purchase_line_form_action"/>
</record> </record>
<menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="purchase.menu_purchase_root"/> <!-- <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="purchase.menu_purchase_root"/>-->
<record id="purchase_line_form_action2" model="ir.actions.act_window"> <record id="purchase_line_form_action2" model="ir.actions.act_window">
<field name="name">Uninvoiced Purchase Order Lines</field> <field name="name">Uninvoiced Purchase Order Lines</field>
@ -99,7 +99,7 @@
<field name="view_id" ref="purchase_order_line_form"/> <field name="view_id" ref="purchase_order_line_form"/>
<field name="act_window_id" ref="purchase_line_form_action2"/> <field name="act_window_id" ref="purchase_line_form_action2"/>
</record> </record>
<menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_purchase_line_form_action"/> <!-- <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_purchase_line_form_action"/>-->
</data> </data>
</openerp> </openerp>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<!-- Planning --> <!-- Planning -->
<record id="account_analytic_planning_view_tree" model="ir.ui.view"> <record id="account_analytic_planning_view_tree" model="ir.ui.view">
<field name="name">report.account.analytic.planning.tree</field> <field name="name">report.account.analytic.planning.tree</field>
@ -97,9 +97,9 @@
<page string="Information"> <page string="Information">
<group col="3" colspan="4"> <group col="3" colspan="4">
<field name="effective_hours" widget="float_time" invisible="True" /> <field name="effective_hours" widget="float_time" invisible="True" />
<field name="planned_hours" <field name="planned_hours"
widget="float_time" widget="float_time"
attrs="{'readonly':[('state','!=','draft')]}" attrs="{'readonly':[('state','!=','draft')]}"
on_change="onchange_planned(planned_hours,effective_hours)"/> on_change="onchange_planned(planned_hours,effective_hours)"/>
<field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"/> <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"/>
<button name="%(project.action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/> <button name="%(project.action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
@ -114,7 +114,7 @@
<button groups="base.group_extended" name="%(project.wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/> <button groups="base.group_extended" name="%(project.wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
<button name="%(project.wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/> <button name="%(project.wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/> <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
</group> </group>
</page> </page>
<page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}"> <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
@ -154,7 +154,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="account_analytic_planning_view_search" model="ir.ui.view"> <record id="account_analytic_planning_view_search" model="ir.ui.view">
<field name="name">report.account.analytic.planning.search</field> <field name="name">report.account.analytic.planning.search</field>
<field name="model">report_account_analytic.planning</field> <field name="model">report_account_analytic.planning</field>
@ -217,10 +217,10 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="search_view_id" ref="account_analytic_planning_view_search"/> <field name="search_view_id" ref="account_analytic_planning_view_search"/>
</record> </record>
<menuitem id="menu_pm_planning" name="Planning" parent="project.menu_main" sequence="5"/>
<menuitem id="planning_main" name="Long Term Planning" <menuitem id="planning_main" name="Long Term Planning"
parent="project.menu_main" /> parent="menu_pm_planning" />
<menuitem action="action_account_analytic_planning_form" <menuitem action="action_account_analytic_planning_form"
id="menu_report_account_analytic_planning" parent="planning_main" /> id="menu_report_account_analytic_planning" parent="planning_main" />
@ -338,8 +338,8 @@
</notebook> </notebook>
</field> </field>
</record> </record>
<!-- Task Form --> <!-- Task Form -->
<record id="view_task_planning_form" model="ir.ui.view"> <record id="view_task_planning_form" model="ir.ui.view">
@ -359,8 +359,8 @@
id="act_task_of_lines" name="Planning tasks" res_model="project.task" id="act_task_of_lines" name="Planning tasks" res_model="project.task"
src_model="report_account_analytic.planning" src_model="report_account_analytic.planning"
/> />
<!-- company form --> <!-- company form -->
<record id="planning_company" model="ir.ui.view"> <record id="planning_company" model="ir.ui.view">
<field name="name">res.company.planning.config</field> <field name="name">res.company.planning.config</field>
<field name="model">res.company</field> <field name="model">res.company</field>

View File

@ -78,8 +78,8 @@
</field> </field>
</record> </record>
<menuitem id="crm.next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/> <!-- <menuitem id="crm.next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>-->
<menuitem id="crm.next_id_52" name="All Cases" parent="crm.next_id_64" sequence="0"/> <!-- <menuitem id="crm.next_id_52" name="All Cases" parent="crm.next_id_64" sequence="0"/>-->
<record id="action_report_crm_case_user_tree" model="ir.actions.act_window"> <record id="action_report_crm_case_user_tree" model="ir.actions.act_window">
<field name="name">Cases by User and Section</field> <field name="name">Cases by User and Section</field>
@ -88,7 +88,7 @@
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_crm_case_user_filter"/> <field name="search_view_id" ref="view_crm_case_user_filter"/>
</record> </record>
<menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="crm.next_id_64"/> <!-- <menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="crm.next_id_64"/>-->
<!-- # Cases by section and categoryof case --> <!-- # Cases by section and categoryof case -->
@ -156,7 +156,7 @@
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_crm_case_categ_filter"/> <field name="search_view_id" ref="view_crm_case_categ_filter"/>
</record> </record>
<menuitem action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree" parent="crm.next_id_64"/> <!-- <menuitem action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree" parent="crm.next_id_64"/>-->
<act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_report_crm_case_user" name="Monthly cases" res_model="report.crm.case.user" src_model="res.users"/> <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_report_crm_case_user" name="Monthly cases" res_model="report.crm.case.user" src_model="res.users"/>

View File

@ -57,8 +57,8 @@
</field> </field>
</record> </record>
<menuitem name="Document Management" id="menu_action_view_my_document"/> <!-- <menuitem name="Document Management" id="menu_action_view_my_document"/>
<menuitem name="Reporting" id="menu_action_view_my_document_report" parent="menu_action_view_my_document"/> <menuitem name="Reporting" id="menu_action_view_my_document_report" parent="menu_action_view_my_document"/>-->
<record model="ir.actions.act_window" id="action_view_all_document_tree1"> <record model="ir.actions.act_window" id="action_view_all_document_tree1">
<field name="name">All Users files</field> <field name="name">All Users files</field>
@ -68,7 +68,7 @@
<field name="search_view_id" ref="view_report_document_user_search"/> <field name="search_view_id" ref="view_report_document_user_search"/>
</record> </record>
<menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report" action="action_view_all_document_tree1"/> <!-- <menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report" action="action_view_all_document_tree1"/>-->
<!-- --> <!-- -->
<record model="ir.ui.view" id="view_document_wall_form"> <record model="ir.ui.view" id="view_document_wall_form">
@ -107,7 +107,7 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem name="Wall of Shame" id="menu_action_view_my_document_report_shame" parent="menu_action_view_my_document_report" action="action_view_wall"/> <!--<menuitem name="Wall of Shame" id="menu_action_view_my_document_report_shame" parent="menu_action_view_my_document_report" action="action_view_wall"/>-->
<!--***************************************************************************************--> <!--***************************************************************************************-->

View File

@ -80,7 +80,8 @@
</record> </record>
<menuitem id="next_id_73" name="Reporting" parent="purchase.menu_purchase_root"/> <menuitem id="next_id_73" name="Reporting" parent="purchase.menu_purchase_root"/>
<menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_73"/> <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all"
name="PO by Products" parent="next_id_73"/>
<!-- Purchases by category by month --> <!-- Purchases by category by month -->
@ -159,7 +160,8 @@
<field name="view_mode">tree,graph</field> <field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_order_category_search"/> <field name="search_view_id" ref="view_order_category_search"/>
</record> </record>
<menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_purchase.next_id_73"/> <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all"
name="PO by Products Category" parent="report_purchase.next_id_73"/>
<act_window domain="[('product_id', '=', active_id)]" id="act_product_product_2_report_purchases_order_product" name="Monthly purchases" res_model="report.purchase.order.product" src_model="product.product"/> <act_window domain="[('product_id', '=', active_id)]" id="act_product_product_2_report_purchases_order_product" name="Monthly purchases" res_model="report.purchase.order.product" src_model="product.product"/>

View File

@ -77,7 +77,7 @@
<field name="search_view_id" ref="view_order_product_search"/> <field name="search_view_id" ref="view_order_product_search"/>
</record> </record>
<menuitem id="next_id_80" name="Reporting" parent="sale.menu_sale_root"/> <menuitem id="next_id_80" name="Reporting" parent="base.menu_base_partner" sequence="7"/>
<menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_80"/> <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_80"/>
<!-- Sales by category by month --> <!-- Sales by category by month -->

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# #
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
@ -28,7 +28,7 @@
All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account""", All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account""",
'author': 'Tiny', 'author': 'Tiny',
'website': 'http://www.openerp.com', 'website': 'http://www.openerp.com',
'depends': ['hr_timesheet', 'hr_timesheet_invoice'], 'depends': ['hr_timesheet', 'hr_timesheet_invoice','hr_attendance'],
'init_xml': [], 'init_xml': [],
'update_xml': ['security/ir.model.access.csv', 'report_timesheet_view.xml'], 'update_xml': ['security/ir.model.access.csv', 'report_timesheet_view.xml'],
'demo_xml': [], 'demo_xml': [],

View File

@ -359,12 +359,15 @@
<record model="ir.actions.act_window" id="action_random_timesheet_lines_board"> <record model="ir.actions.act_window" id="action_random_timesheet_lines_board">
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="name">Random Timesheet Lines</field> <field name="name">Timesheet Lines</field>
<field name="res_model">random.timesheet.lines</field> <field name="res_model">random.timesheet.lines</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" ref="view_random_timesheet_lines_tree"/> <field name="view_id" ref="view_random_timesheet_lines_tree"/>
</record> </record>
<!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>-->
<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board" name="Timesheets Lines"
parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>
</data> </data>
</openerp> </openerp>

View File

@ -75,7 +75,7 @@
</record> </record>
<record id="process_node_packinglist0" model="process.node"> <record id="process_node_packinglist0" model="process.node">
<field name="menu_id" ref="stock.menu_action_picking_tree"/> <!-- <field name="menu_id" ref="stock.menu_action_picking_tree"/>-->
<field name="model_id" ref="stock.model_stock_picking"/> <field name="model_id" ref="stock.model_stock_picking"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/> <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Pick List&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Pick List&quot;&quot;&quot;" name="name"/>

View File

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management" <!-- <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"-->
groups="group_sale_user"/> <!-- groups="group_sale_user"/>-->
<menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
<menuitem id="menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
<menuitem action="product.product_normal_action" id="product.menu_products" parent="menu_product" sequence="1"/>
<record id="view_shop_form" model="ir.ui.view"> <record id="view_shop_form" model="ir.ui.view">
<field name="name">sale.shop</field> <field name="name">sale.shop</field>
@ -41,8 +45,7 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" ref="view_shop_tree"/> <field name="view_id" ref="view_shop_tree"/>
</record> </record>
<menuitem id="menu_shop_configuration" name="Configuration" parent="sale.menu_sale_root" sequence="1"/> <menuitem action="action_shop_form" id="menu_action_shop_form" parent="base.menu_base_config" sequence="60"/>
<menuitem action="action_shop_form" id="menu_action_shop_form" parent="sale.menu_shop_configuration"/>
<record id="view_sale_order_calendar" model="ir.ui.view"> <record id="view_sale_order_calendar" model="ir.ui.view">
<field name="name">sale.order.calendar</field> <field name="name">sale.order.calendar</field>
@ -251,7 +254,7 @@
<field name="view_mode">tree,form,calendar,graph</field> <field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_sales_order_filter"/> <field name="search_view_id" ref="view_sales_order_filter"/>
</record> </record>
<menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/> <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>
<record id="action_order_tree2" model="ir.actions.act_window"> <record id="action_order_tree2" model="ir.actions.act_window">
<field name="name">Sales in Exception</field> <field name="name">Sales in Exception</field>
@ -265,7 +268,7 @@
</record> </record>
<record id="action_order_tree3" model="ir.actions.act_window"> <record id="action_order_tree3" model="ir.actions.act_window">
<field name="name">Sales Order To Be Invoiced</field> <field name="name">Sales To Invoice</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field> <field name="res_model">sale.order</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -282,7 +285,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field> <field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('progress','waiting_date','manual'))]</field> <field name="domain">[('state','in',('progress','waiting_date','manual'))]</field>
<field name="search_view_id" ref="view_sales_order_filter"/> <field name="search_view_id" ref="view_sales_order_filter"/>
</record> </record>
@ -293,7 +296,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field> <field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft')]</field> <field name="domain">[('state','=','draft')]</field>
<field name="search_view_id" ref="view_sales_order_filter"/> <field name="search_view_id" ref="view_sales_order_filter"/>
</record> </record>
<record id="action_order_tree" model="ir.actions.act_window"> <record id="action_order_tree" model="ir.actions.act_window">
@ -415,8 +418,8 @@
<field name="view_id" eval="False"/> <field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_sales_order_line_filter"/> <field name="search_view_id" ref="view_sales_order_line_filter"/>
</record> </record>
<menuitem action="action_order_line_tree1" id="menu_action_order_line_tree1" parent="sale.menu_sale_root" <menuitem action="action_order_line_tree1" id="menu_action_order_line_tree1" parent="base.menu_sales"
groups="base.group_extended"/> groups="base.group_extended" sequence="4"/>
<record id="action_order_line_tree2" model="ir.actions.act_window"> <record id="action_order_line_tree2" model="ir.actions.act_window">
<field name="name">Uninvoiced Lines</field> <field name="name">Uninvoiced Lines</field>
@ -442,6 +445,9 @@
<act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/> <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/>
<menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="6"/>
<menuitem action="action_order_tree3" id="menu_invoicing_sales_order" parent="menu_invoiced" sequence="1"/>
<menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
<!-- configartion view --> <!-- configartion view -->
<record id="view_config_picking_policy" model="ir.ui.view"> <record id="view_config_picking_policy" model="ir.ui.view">
@ -487,6 +493,5 @@
<field name="action_id" ref="action_config_picking_policy"/> <field name="action_id" ref="action_config_picking_policy"/>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -10,7 +10,7 @@
</record> </record>
<record model='ir.ui.menu' id='menu_shop_configuration'> <record model='ir.ui.menu' id='menu_action_shop_form'>
<field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/> <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
</record> </record>

View File

@ -87,8 +87,8 @@
</record> </record>
<menuitem name="Picking to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/> <!--<menuitem name="Picking to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>-->
<menuitem name="Picking by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/> <!--<menuitem name="Picking by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>-->
<record model="ir.actions.act_window" id="action_invoice_type_picking_open"> <record model="ir.actions.act_window" id="action_invoice_type_picking_open">
<field name="name">Picking to invoice</field> <field name="name">Picking to invoice</field>

View File

@ -31,7 +31,7 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/> <!-- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>-->
<record model="ir.ui.view" id="view_sale_journal_form"> <record model="ir.ui.view" id="view_sale_journal_form">
<field name="name">sale_journal.sale.journal.form</field> <field name="name">sale_journal.sale.journal.form</field>
@ -118,7 +118,9 @@
<field name="search_view_id" ref="view_sale_journal_search"/> <field name="search_view_id" ref="view_sale_journal_search"/>
</record> </record>
<menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/> <!-- <menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>-->
<menuitem id="menu_sale_journal" name="Journal" parent="base.menu_base_config" sequence="60" />
<menuitem name="Sales Journals" id="menu_definition_journal" parent="menu_sale_journal" action="action_definition_journal"/>
<record model="ir.ui.view" id="sale_journal_sale_order"> <record model="ir.ui.view" id="sale_journal_sale_order">
<field name="name">sale.order.journal.view.form</field> <field name="name">sale.order.journal.view.form</field>
@ -321,7 +323,7 @@
<field name="search_view_id" ref="view_sale_journal_sale_stats_search"/> <field name="search_view_id" ref="view_sale_journal_sale_stats_search"/>
</record> </record>
<menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/> <menuitem name="Reporting" id="menu_definition_report_sales" parent="base.menu_base_partner" sequence="8"/>
<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_all"/> <menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_all"/>
<act_window name="Monthly sales" <act_window name="Monthly sales"

View File

@ -16,7 +16,7 @@
</field> </field>
</record> </record>
<record id="action_stock_report_prodlots_form" model="ir.actions.act_window"> <record id="action_stock_report_prodlots_form" model="ir.actions.act_window">
<field name="name">Stock by Lots</field> <field name="name">Locations</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">stock.report.prodlots</field> <field name="res_model">stock.report.prodlots</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -43,17 +43,17 @@
<menuitem <menuitem
id="next_id_61" id="next_id_61"
name="Reporting" name="Reporting"
parent="stock.menu_stock_root"/> parent="stock.menu_stock_root" sequence="5"/>
<menuitem <!-- <menuitem-->
id="next_id_62" <!-- id="next_id_62"-->
name="Traceability" <!-- name="Traceability"-->
parent="next_id_61"/> <!-- parent="next_id_61"/>-->
<menuitem <menuitem
action="action_stock_report_prodlots_form" action="action_stock_report_prodlots_form"
id="menu_stock_report_prodlots" id="menu_stock_report_prodlots"
parent="next_id_62"/> parent="stock.menu_stock_inventory_control" sequence="1"/>
<act_window <act_window
context="{'product_id': active_id}" context="{'product_id': active_id}"
@ -116,13 +116,13 @@
</record> </record>
<record model="ir.actions.act_window" id="action_stock_line_date"> <record model="ir.actions.act_window" id="action_stock_line_date">
<field name="name">Dates of Inventories</field> <field name="name">Latest Inventory Date by Product</field>
<field name="res_model">report.stock.lines.date</field> <field name="res_model">report.stock.lines.date</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date"/> <menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date" sequence="2"/>
<record id="view_location_tree_3" model="ir.ui.view"> <record id="view_location_tree_3" model="ir.ui.view">
<field name="name">stock.location.tree</field> <field name="name">stock.location.tree</field>
@ -139,13 +139,13 @@
</record> </record>
<record id="action_location_tree_3" model="ir.actions.act_window"> <record id="action_location_tree_3" model="ir.actions.act_window">
<field name="name">Locations' Values</field> <field name="name">Inventory Valuation</field>
<field name="res_model">stock.location</field> <field name="res_model">stock.location</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="view_location_tree_3"/> <field name="view_id" ref="view_location_tree_3"/>
</record> </record>
<menuitem action="action_location_tree_3" id="menu_action_location_tree_3" parent="next_id_61" /> <menuitem action="action_location_tree_3" id="menu_action_location_tree_3" parent="next_id_61" sequence="1"/>
<!-- end... --> <!-- end... -->

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">
<!-- <!--
Resource: stock.location Resource: stock.location
--> -->
@ -51,21 +51,21 @@
<field name="name">Components</field> <field name="name">Components</field>
<field name="location_id" ref="stock_location_workshop"/> <field name="location_id" ref="stock_location_workshop"/>
</record> </record>
<!-- <!--
Resource: stock.inventory Resource: stock.inventory
--> -->
<record id="stock_inventory_0" model="stock.inventory"> <record id="stock_inventory_0" model="stock.inventory">
<field name="name">Starting Inventory</field> <field name="name">Starting Inventory</field>
<field name="date_done">2005-08-02 13:42:43</field> <field name="date_done">2005-08-02 13:42:43</field>
<field name="state">done</field> <field name="state">done</field>
</record> </record>
<!-- <!--
Resource: stock.inventory.line Resource: stock.inventory.line
--> -->
<record id="stock_inventory_line_0" model="stock.inventory.line"> <record id="stock_inventory_line_0" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_pc1"/> <field name="product_id" ref="product.product_product_pc1"/>
<field name="product_uom" ref="product.product_uom_unit"/> <field name="product_uom" ref="product.product_uom_unit"/>
@ -73,7 +73,7 @@
<field name="product_qty">14.0</field> <field name="product_qty">14.0</field>
<field name="location_id" ref="stock_location_14"/> <field name="location_id" ref="stock_location_14"/>
</record> </record>
<record id="stock_inventory_line_1" model="stock.inventory.line"> <record id="stock_inventory_line_1" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_24"/> <field name="product_id" ref="product.product_product_24"/>
<field name="product_uom" ref="product.product_uom_unit"/> <field name="product_uom" ref="product.product_uom_unit"/>
@ -179,13 +179,13 @@
<field name="product_qty">80.0</field> <field name="product_qty">80.0</field>
<field name="location_id" ref="stock_location_components"/> <field name="location_id" ref="stock_location_components"/>
</record> </record>
<function model="stock.inventory" name="action_done"> <function model="stock.inventory" name="action_done">
<function eval="[[]]" model="stock.inventory" name="search"/> <function eval="[[]]" model="stock.inventory" name="search"/>
</function> </function>
<!-- Multi Company --> <!-- Multi Company -->
<record id="res_partner_tinyshop0" model="res.partner"> <record id="res_partner_tinyshop0" model="res.partner">
<field eval="0" name="customer"/> <field eval="0" name="customer"/>
<field eval="0" name="supplier"/> <field eval="0" name="supplier"/>
@ -246,7 +246,7 @@
<field eval="1" name="active"/> <field eval="1" name="active"/>
<field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
</record> </record>
<record id="res_users_shopuser0" model="res.users"> <!--<record id="res_users_shopuser0" model="res.users">
<field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/> <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
<field eval="[(6,0,[ref('base.group_user'),ref('stock.group_stock_user')])]" name="groups_id"/> <field eval="[(6,0,[ref('base.group_user'),ref('stock.group_stock_user')])]" name="groups_id"/>
<field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/> <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
@ -269,7 +269,7 @@
<field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/> <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
<field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/> <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
</record> </record>
<record id="stock_location_intermediatelocation0" model="stock.location"> --><record id="stock_location_intermediatelocation0" model="stock.location">
<field name="address_id" ref="base.main_address"/> <field name="address_id" ref="base.main_address"/>
<field name="location_id" ref="stock.stock_location_company"/> <field name="location_id" ref="stock.stock_location_company"/>
<field eval="&quot;&quot;&quot;procurement&quot;&quot;&quot;" name="usage"/> <field eval="&quot;&quot;&quot;procurement&quot;&quot;&quot;" name="usage"/>
@ -292,7 +292,7 @@
<field name="company_id" ref="res_company_tinyshop0"/> <field name="company_id" ref="res_company_tinyshop0"/>
<field name="lot_input_id" ref="stock_location_shop1"/> <field name="lot_input_id" ref="stock_location_shop1"/>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem icon="terp-stock" id="menu_stock_root" name="Inventory Management"/> <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"/>
<menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="1"/> <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
<menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="3"/>
<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
<menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="6"/>
<menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="2"/>
============================= =============================
Inventory Line Inventory Line
@ -82,7 +86,7 @@
<field name="view_id" ref="view_inventory_tree"/> <field name="view_id" ref="view_inventory_tree"/>
<field name="context">{'full':'1'}</field> <field name="context">{'full':'1'}</field>
</record> </record>
<menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_root"/> <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_inventory_control" sequence="2"/>
<record id="action_inventory_form_draft" model="ir.actions.act_window"> <record id="action_inventory_form_draft" model="ir.actions.act_window">
<field name="name">Draft Periodical Inventories</field> <field name="name">Draft Periodical Inventories</field>
@ -130,7 +134,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="view_tracking_tree"/> <field name="view_id" ref="view_tracking_tree"/>
</record> </record>
<menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="2"/> <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="4"/>
<menuitem action="action_tracking_form" id="menu_action_tracking_form" parent="menu_traceability"/> <menuitem action="action_tracking_form" id="menu_action_tracking_form" parent="menu_traceability"/>
<record id="lot_line_tree" model="ir.ui.view"> <record id="lot_line_tree" model="ir.ui.view">
@ -402,7 +406,7 @@
<field name="view_type">tree</field> <field name="view_type">tree</field>
<field name="view_id" ref="view_location_tree"/> <field name="view_id" ref="view_location_tree"/>
</record> </record>
<menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_root"/> <!-- <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_root"/>-->
============================= =============================
Warehouse Warehouse
@ -563,7 +567,7 @@
<page string="Return Packing History"> <page string="Return Packing History">
<field name="move_stock_return_history" nolabel="1"/> <field name="move_stock_return_history" nolabel="1"/>
</page> </page>
</notebook> </notebook>
</form> </form>
</field> </field>
<group col="7" colspan="4"> <group col="7" colspan="4">
@ -686,7 +690,7 @@
<page string="Return Packing History"> <page string="Return Packing History">
<field name="move_stock_return_history" nolabel="1"/> <field name="move_stock_return_history" nolabel="1"/>
</page> </page>
</notebook> </notebook>
</form> </form>
</field> </field>
<group col="7" colspan="4"> <group col="7" colspan="4">
@ -776,7 +780,7 @@
<field name="context">{'contact_display': 'partner'}</field> <field name="context">{'contact_display': 'partner'}</field>
</record> </record>
<menuitem action="action_picking_tree_delivery" groups="base.group_extended" id="menu_action_picking_tree_delivery" parent="menu_stock_root" sequence="20"/> <menuitem action="action_picking_tree_delivery" groups="base.group_extended" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="20"/>
<menuitem action="action_picking_calendar_delivery" id="menu_action_picking_calendar_delivery" parent="menu_action_picking_tree_delivery"/> <menuitem action="action_picking_calendar_delivery" id="menu_action_picking_calendar_delivery" parent="menu_action_picking_tree_delivery"/>
# #
@ -930,7 +934,7 @@
<field name="view_mode">calendar</field> <field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree"/> <field name="act_window_id" ref="action_picking_tree"/>
</record> </record>
<menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/> <!-- <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/>-->
# #
# Reception of Products # Reception of Products
@ -1015,7 +1019,7 @@
<page string="Return Packing History"> <page string="Return Packing History">
<field name="move_stock_return_history" nolabel="1"/> <field name="move_stock_return_history" nolabel="1"/>
</page> </page>
</notebook> </notebook>
</form> </form>
</field> </field>
<group col="7" colspan="4"> <group col="7" colspan="4">
@ -1060,7 +1064,7 @@
<record id="action_picking_tree4" model="ir.actions.act_window"> <record id="action_picking_tree4" model="ir.actions.act_window">
<field name="name">Incoming Products</field> <field name="name">Incoming shipments</field>
<field name="res_model">stock.picking</field> <field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -1086,7 +1090,7 @@
<field name="view_mode">calendar</field> <field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree4"/> <field name="act_window_id" ref="action_picking_tree4"/>
</record> </record>
<menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_root" sequence="17"/> <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="1"/>
<record id="view_picking_internal_search" model="ir.ui.view"> <record id="view_picking_internal_search" model="ir.ui.view">
<field name="name">stock.picking.internal.search</field> <field name="name">stock.picking.internal.search</field>
@ -1116,8 +1120,7 @@
<field name="context">{'contact_display': 'partner'}</field> <field name="context">{'contact_display': 'partner'}</field>
<field name="search_view_id" ref="view_picking_internal_search"/> <field name="search_view_id" ref="view_picking_internal_search"/>
</record> </record>
<menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_root" sequence="18"/> <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
============================= =============================
Move Tracking Move Tracking
============================= =============================
@ -1148,7 +1151,7 @@
</field> </field>
</record> </record>
<menuitem id="menu_traceability_low" name="Low Level" parent="menu_traceability"/> <!-- <menuitem id="menu_traceability_low" name="Low Level" parent="menu_traceability"/> -->
<record id="view_move_form" model="ir.ui.view"> <record id="view_move_form" model="ir.ui.view">
<field name="name">stock.move.form</field> <field name="name">stock.move.form</field>
@ -1195,7 +1198,7 @@
<page string="Return Packing History"> <page string="Return Packing History">
<field name="move_stock_return_history" nolabel="1"/> <field name="move_stock_return_history" nolabel="1"/>
</page> </page>
</notebook> </notebook>
</form> </form>
</field> </field>
</record> </record>
@ -1220,14 +1223,14 @@
</record> </record>
<record id="action_move_form2" model="ir.actions.act_window"> <record id="action_move_form2" model="ir.actions.act_window">
<field name="name">Stock Moves</field> <field name="name">All Moves</field>
<field name="res_model">stock.move</field> <field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="view_move_tree"/> <field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_move_search"/> <field name="search_view_id" ref="view_move_search"/>
</record> </record>
<menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability_low"/> <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1"/>
<record id="action_picking_all" model="ir.actions.act_window"> <record id="action_picking_all" model="ir.actions.act_window">
<field name="name">Picking</field> <field name="name">Picking</field>
@ -1238,7 +1241,7 @@
<field name="search_view_id" ref="view_stock_picking_filter"/> <field name="search_view_id" ref="view_stock_picking_filter"/>
<field name="context">{'contact_display': 'partner'}</field> <field name="context">{'contact_display': 'partner'}</field>
</record> </record>
<menuitem action="action_picking_all" id="menu_action_picking_all" parent="menu_traceability_low"/> <menuitem action="action_picking_all" id="menu_action_picking_all" parent="menu_stock_warehouse_mgmt" sequence="3"/>
==================================== ====================================
Reception Picking (By Stock Move) Reception Picking (By Stock Move)
@ -1307,7 +1310,7 @@
</record> </record>
<record id="action_reception_picking_move" model="ir.actions.act_window"> <record id="action_reception_picking_move" model="ir.actions.act_window">
<field name="name">Reception Picking Stock Moves</field> <field name="name">Incoming Products</field>
<field name="res_model">stock.move</field> <field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -1316,7 +1319,7 @@
<field name="view_id" ref="view_move_tree_reception_picking"/> <field name="view_id" ref="view_move_tree_reception_picking"/>
<field name="search_view_id" ref="view_move_search_reception_picking"/> <field name="search_view_id" ref="view_move_search_reception_picking"/>
</record> </record>
<menuitem action="action_reception_picking_move" id="menu_action_reception_picking_move" parent="menu_stock_root"/> <!-- <menuitem action="action_reception_picking_move" id="menu_action_reception_picking_move" parent="menu_stock_root"/>-->
# ------------------------------------------------------------- # -------------------------------------------------------------
@ -1352,7 +1355,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/> <!-- <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/>-->
<act_window <act_window
context="{'location': active_id}" context="{'location': active_id}"

View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/> <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>
<menuitem id="next_id_45" name="Subscriptions" parent="subscription.menu_tools"/><menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/> <menuitem id="next_id_45" name="Recurring Events" parent="subscription.menu_tools" sequence="2"/>
<!-- <menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>-->
<!-- <!--
======================================================= =======================================================
Subscription Views Subscription Views
@ -46,7 +47,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="view_subscription_tree" model="ir.ui.view"> <record id="view_subscription_tree" model="ir.ui.view">
<field name="name">subscription.subscription.tree</field> <field name="name">subscription.subscription.tree</field>
<field name="model">subscription.subscription</field> <field name="model">subscription.subscription</field>
@ -61,7 +62,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="action_subscription_form" model="ir.actions.act_window"> <record id="action_subscription_form" model="ir.actions.act_window">
<field name="name">All Subscriptions</field> <field name="name">All Subscriptions</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
@ -70,7 +71,7 @@
<field name="view_id" ref="view_subscription_tree"/> <field name="view_id" ref="view_subscription_tree"/>
</record> </record>
<menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="subscription.next_id_45"/> <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="subscription.next_id_45"/>
<record id="subscription_subscription_history_tree" model="ir.ui.view"> <record id="subscription_subscription_history_tree" model="ir.ui.view">
<field name="name">subscription.subscription.history.tree</field> <field name="name">subscription.subscription.history.tree</field>
<field name="model">subscription.subscription.history</field> <field name="model">subscription.subscription.history</field>
@ -81,7 +82,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="subscription_subscription_history_form" model="ir.ui.view"> <record id="subscription_subscription_history_form" model="ir.ui.view">
<field name="name">subscription.subscription.history.form</field> <field name="name">subscription.subscription.history.form</field>
<field name="model">subscription.subscription.history</field> <field name="model">subscription.subscription.history</field>
@ -93,7 +94,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="document_form" model="ir.ui.view"> <record id="document_form" model="ir.ui.view">
<field name="name">subscription.document.form</field> <field name="name">subscription.document.form</field>
<field name="model">subscription.document</field> <field name="model">subscription.document</field>
@ -107,7 +108,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="document_tree" model="ir.ui.view"> <record id="document_tree" model="ir.ui.view">
<field name="name">subscription.document.tree</field> <field name="name">subscription.document.tree</field>
<field name="model">subscription.document</field> <field name="model">subscription.document</field>
@ -120,7 +121,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="document_fields_form" model="ir.ui.view"> <record id="document_fields_form" model="ir.ui.view">
<field name="name">subscription.document.fields.form</field> <field name="name">subscription.document.fields.form</field>
<field name="model">subscription.document.fields</field> <field name="model">subscription.document.fields</field>
@ -132,7 +133,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="document_fields_tree" model="ir.ui.view"> <record id="document_fields_tree" model="ir.ui.view">
<field name="name">subscription.document.fields.tree</field> <field name="name">subscription.document.fields.tree</field>
<field name="model">subscription.document.fields</field> <field name="model">subscription.document.fields</field>
@ -144,7 +145,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="action_document_form" model="ir.actions.act_window"> <record id="action_document_form" model="ir.actions.act_window">
<field name="name">Document Types</field> <field name="name">Document Types</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
@ -152,6 +153,6 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="document_tree"/> <field name="view_id" ref="document_tree"/>
</record> </record>
<menuitem action="action_document_form" id="menu_action_document_form" parent="subscription.menu_subscription_config"/> <menuitem action="action_document_form" id="menu_action_document_form" parent="subscription.next_id_45"/>
</data> </data>
</openerp> </openerp>

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# #
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
@ -24,13 +24,13 @@
'version': '1.0', 'version': '1.0',
'category': 'Generic Modules/Others', 'category': 'Generic Modules/Others',
'description': """ 'description': """
The base module to manage documents(wiki) The base module to manage documents(wiki)
keep track for the wiki groups, pages, and history keep track for the wiki groups, pages, and history
""", """,
'author': 'Tiny & Axelor', 'author': 'Tiny & Axelor',
'website': 'http://openerp.com', 'website': 'http://openerp.com',
'depends': ['base'], 'depends': ['base','document'],
'init_xml': [], 'init_xml': [],
'update_xml': [ 'update_xml': [
'wiki_view.xml', 'wiki_view.xml',

View File

@ -1,22 +1,24 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
<menuitem name="Document Management" icon="terp-stock" id="menu_document2"/> <!-- <menuitem name="Document Management" icon="terp-stock" id="menu_document2"/>-->
<menuitem name="Wiki Configuration" id="menu_document_configuration" parent="menu_document2"/> <menuitem name="Knowledge Management" icon="terp-stock" id="menu_document2"/>
<menuitem parent="menu_document2" name="Wiki" id="menu_document"/> <!--<menuitem name="Wiki Configuration" id="menu_document_configuration" parent="menu_document2"/>-->
<menuitem name="Wiki" id="menu_document_configuration" parent="document.menu_document_configuration"/>
<!--<menuitem parent="menu_document2" name="Wiki" id="menu_document"/>-->
<menuitem parent="menu_document2" name="Collaborative Content" id="menu_document"/>
<wizard <wizard
id="wizard_group_menu_create" id="wizard_group_menu_create"
string="Create Menu" string="Create Menu"
menu="True" menu="True"
name="wiki.create.menu"/> name="wiki.create.menu"/>
<wizard <wizard
id="wizard_open_page" id="wizard_open_page"
string="Open Page" string="Open Page"
menu="True" menu="True"
name="wiki.wiki.page.open"/> name="wiki.wiki.page.open"/>
<record model="ir.ui.view" id="wiki_group_tree"> <record model="ir.ui.view" id="wiki_group_tree">
<field name="name">wiki.groups.tree</field> <field name="name">wiki.groups.tree</field>
<field name="model">wiki.groups</field> <field name="model">wiki.groups</field>
@ -63,7 +65,11 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem <!-- <menuitem
parent="menu_document_configuration"
id="menu_action_wiki_groups"
action="action_wiki_groups"/>-->
<menuitem name="Wiki Groups"
parent="menu_document_configuration" parent="menu_document_configuration"
id="menu_action_wiki_groups" id="menu_action_wiki_groups"
action="action_wiki_groups"/> action="action_wiki_groups"/>
@ -73,10 +79,10 @@
<field name="res_model">wiki.groups</field> <field name="res_model">wiki.groups</field>
<field name="view_type">tree</field> <field name="view_type">tree</field>
</record> </record>
<menuitem <!-- <menuitem
parent="menu_document" parent="menu_document"
id="menu_action_wiki_groups_browse" id="menu_action_wiki_groups_browse"
action="action_wiki_groups_browse"/> action="action_wiki_groups_browse"/>-->
<record id="view_wiki_tree_childs" model="ir.ui.view"> <record id="view_wiki_tree_childs" model="ir.ui.view">
<field name="name">wiki.wiki.tree.childs</field> <field name="name">wiki.wiki.tree.childs</field>
@ -121,7 +127,7 @@
<field name="name" select="1" colspan="6"/> <field name="name" select="1" colspan="6"/>
<field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/> <field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
<field name="section" select="2" invisible="not context.get('section',False)"/> <field name="section" select="2" invisible="not context.get('section',False)"/>
<field name="parent_id"/> <field name="parent_id"/>
</group> </group>
<field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/> <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
<separator colspan="4" string="Modifications"/> <separator colspan="4" string="Modifications"/>
@ -163,7 +169,7 @@
<field name="context">{'section':'1'}</field> <field name="context">{'section':'1'}</field>
<field name="search_view_id" ref="view_wiki_filter"/> <field name="search_view_id" ref="view_wiki_filter"/>
</record> </record>
<menuitem parent="menu_document" id="menu_action_wiki_wiki" string="Search Pages" action="action_wiki"/> <menuitem parent="menu_document" id="menu_action_wiki_wiki" name="Wiki Pages" action="action_wiki"/>
<!-- Pages Waiting Review --> <!-- Pages Waiting Review -->
<record model="ir.actions.act_window" id="action_wiki_review"> <record model="ir.actions.act_window" id="action_wiki_review">
@ -176,7 +182,7 @@
<field name="domain">[('review','=',True)]</field> <field name="domain">[('review','=',True)]</field>
<field name="filter" eval="True"/> <field name="filter" eval="True"/>
</record> </record>
<record model="ir.ui.view" id="view_wiki_history_tree"> <record model="ir.ui.view" id="view_wiki_history_tree">
<field name="name">wiki.wiki.history.tree</field> <field name="name">wiki.wiki.history.tree</field>
<field name="model">wiki.wiki.history</field> <field name="model">wiki.wiki.history</field>
@ -190,7 +196,7 @@
</tree> </tree>
</field> </field>
</record> </record>
<record model="ir.ui.view" id="wiki_history_form"> <record model="ir.ui.view" id="wiki_history_form">
<field name="name">wiki.wiki.history.form</field> <field name="name">wiki.wiki.history.form</field>
<field name="model">wiki.wiki.history</field> <field name="model">wiki.wiki.history</field>
@ -212,10 +218,10 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem <!-- <menuitem
parent="menu_document_configuration" parent="menu_document_configuration"
id="menu_action_history" id="menu_action_history"
action="action_history"/> action="action_history"/>-->
<act_window domain="[('wiki_id', '=', active_id)]" <act_window domain="[('wiki_id', '=', active_id)]"
id="act_wiki_wiki_history" id="act_wiki_wiki_history"
@ -242,7 +248,7 @@
<field eval="'ir.actions.wizard,%d'%wizard_open_page" name="value"/> <field eval="'ir.actions.wizard,%d'%wizard_open_page" name="value"/>
<field eval="True" name="object"/> <field eval="True" name="object"/>
</record> </record>
<!--record id="ir_open_account_account" model="ir.values"> <!--record id="ir_open_account_account" model="ir.values">
<field eval="'tree_but_open'" name="key2"/> <field eval="'tree_but_open'" name="key2"/>
<field eval="'wiki.groups'" name="model"/> <field eval="'wiki.groups'" name="model"/>