[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20120323052530-l9fsd06fbma1l3gz
This commit is contained in:
Sbh (Openerp) 2012-03-23 10:55:30 +05:30
commit e17dee3a5e
99 changed files with 275 additions and 255 deletions

View File

@ -1652,7 +1652,7 @@ class account_move_reconcile(osv.osv):
'create_date': fields.date('Creation date', readonly=True),
}
_defaults = {
'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
'name': lambda self,cr,uid,ctx=None: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile', context=ctx) or '/',
}
def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):

View File

@ -341,11 +341,11 @@ class account_bank_statement(osv.osv):
if not st.name == '/':
st_number = st.name
else:
c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
if st.journal_id.sequence_id:
c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
st_number = obj_seq.next_by_id(cr, uid, st.journal_id.sequence_id.id, context=c)
else:
st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement')
st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement', context=c)
for line in st.move_line_ids:
if line.state <> 'valid':

View File

@ -279,11 +279,11 @@ class account_cash_statement(osv.osv):
raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
if statement.name and statement.name == '/':
c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
if statement.journal_id.sequence_id:
c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
st_number = obj_seq.next_by_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
else:
st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement')
st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement', context=c)
vals.update({
'name': st_number
})

View File

@ -10,27 +10,28 @@
<menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
<menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
groups="group_account_user,group_account_manager"/>
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="9" groups="group_account_user,group_account_manager"/>
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="13" groups="group_account_user,group_account_manager"/>
<!-- This menu is used in account_code module -->
<menuitem id="menu_account_pp_statements" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
<menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
<menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" groups="account.group_account_user" sequence="6"/>
<menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="13"/>
<menuitem id="menu_finance_reporting" name="Accounting" parent="base.menu_reporting" sequence="35"/>
<menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="14" groups="group_account_user,group_account_manager"/>
<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reports"/>
<menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="14" groups="group_account_manager"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="15" groups="group_account_manager"/>
<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/>
<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
<menuitem id="menu_journals" sequence="9" name="Journals" parent="menu_finance_accounting" groups="group_account_manager"/>
<menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30"/>
<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
<menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
<menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reports" sequence="100"/>
<menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
<menuitem id="menu_account_reports" name="Financial Reports" parent="menu_finance_accounting" sequence="18"/>
<menuitem id="menu_account_reports" name="Accounting" parent="base.menu_reporting_config" sequence="18"/>
<menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries"
parent="menu_finance_periodical_processing" sequence="15"

View File

@ -740,7 +740,7 @@
</record>
<menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/>
<menuitem name="Statements Reconciliation" action="action_bank_statement_periodic_tree" id="menu_menu_Bank_process" parent="account.menu_account_pp_statements" sequence="7"/>
<menuitem name="Statements Reconciliation" action="action_bank_statement_periodic_tree" id="menu_menu_Bank_process" parent="account.periodical_processing_reconciliation" sequence="15"/>
<record id="action_bank_statement_draft_tree" model="ir.actions.act_window">

View File

@ -61,7 +61,7 @@
<field name="view_id" ref="board_account_form"/>
</record>
<menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager"/>
<menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_dasboard" groups="group_account_user,group_account_manager"/>
<menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
<menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>

View File

@ -48,6 +48,8 @@ class ir_sequence(osv.osv):
}
def _next(self, cr, uid, seq_ids, context=None):
if context is None:
context = {}
for seq in self.browse(cr, uid, seq_ids, context):
for line in seq.fiscal_ids:
if line.fiscalyear_id.id == context.get('fiscalyear_id'):

View File

@ -3,7 +3,7 @@
<menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>
<record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
<field name="name">All Uninvoiced Entries</field>
<field name="name">Time &amp; Costs to Invoice</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -11,7 +11,7 @@
<field name="context">{'search_default_to_invoice': 1}</field>
<field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
</record>
<menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced"/>
<menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced" sequence="5"/>
<record id="view_account_analytic_account_overdue_search" model="ir.ui.view">
<field name="name">account.analytic.account.search</field>
@ -81,7 +81,7 @@
<menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner"
sequence="1"/>
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="50" parent="base.menu_sales"/>
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="6" parent="base.menu_sales"/>
</data>

View File

@ -288,7 +288,7 @@
</field>
</record>
<menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance"/>
<menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance" sequence="9"/>
<menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_tree"
groups="base.group_extended"
sequence="100"

View File

@ -903,7 +903,7 @@ class account_voucher(osv.osv):
if voucher_brw.number:
name = voucher_brw.number
elif voucher_brw.journal_id.sequence_id:
name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id)
name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id, context=context)
else:
raise osv.except_osv(_('Error !'),
_('Please define a sequence on the journal !'))

View File

@ -9,6 +9,6 @@
web_icon="images/association.png"
web_icon_hover="images/association-hover.png"/>
<menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
<menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
<menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>
</data>
</openerp>

View File

@ -770,7 +770,7 @@
<menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
<menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
<menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6" groups="group_auction_manager"/>
<menuitem name="Auction" id="auction_report_menu" parent="base.menu_reporting" sequence="70" groups="group_auction_manager"/>
<act_window name="Deposit slip"
context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"

View File

@ -93,7 +93,7 @@
<field name="view_id" ref="board_auction_form1"/>
</record>
<menuitem name="Dashboard" id="menu_board_auction" parent="auction.auction_report_menu" sequence="0"/>
<menuitem name="Auction" id="menu_board_auction" parent="base.menu_dasboard" sequence="40"/>
<menuitem
name="Auction DashBoard"

View File

@ -66,10 +66,10 @@
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
<field name="context">{'menu':True}</field>
<field name="context">{'menu':True}</field>
</record>
<menuitem parent="base.reporting_menu" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="70"/>
<menuitem parent="base.menu_reporting_config" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="1"/>
</data>
</openerp>

View File

@ -160,8 +160,8 @@
<menuitem id="base.menu_administration" icon="terp-administration" name="Settings" sequence="50" action="open_board_administration_form"/>
<!-- add a menu item in adminitration/reporting/dashboards -->
<menuitem id="base.menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11" groups="base.group_extended"/>
<menuitem id="base.menu_dashboard" name="Dashboards" parent="base.menu_reporting" sequence="0"/>
<menuitem id="base.menu_reporting_board" name="Reporting" parent="base.menu_administration" sequence="11" groups="base.group_extended"/>
<menuitem id="base.menu_dashboard" name="Dashboards" parent="base.menu_reporting_board" sequence="0"/>
<menuitem id="base.menu_dashboard_admin" action="open_board_administration_form" parent="base.menu_dashboard" icon="terp-graph"/>
</data>

View File

@ -68,7 +68,7 @@
<field name="search_view_id" ref="view_board_search"/>
</record>
<menuitem action="action_view_board_list_form" id="menu_view_board_form" parent="base.reporting_menu" sequence="1"/>
<menuitem action="action_view_board_list_form" id="menu_view_board_form" parent="base.menu_reporting_config" sequence="2"/>
</data>
</openerp>

View File

@ -107,10 +107,10 @@
<field name="view_id" ref="board_crm_statistical_form"/>
</record>
<menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
<menuitem id="board.menu_sales_dasboard" name="Sales" sequence="1" parent="base.menu_dasboard"/>
<menuitem
name="CRM Dashboard" parent="board.menu_dasboard"
name="CRM Dashboard" parent="board.menu_sales_dasboard"
action="open_board_statistical_dash"
sequence="0"
id="menu_board_statistics_dash"

View File

@ -9,7 +9,7 @@
<field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
<field name="view_id" ref="crm_case_tree_view_leads"/>
<field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
<field name="context">{'search_default_new':1, 'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'}</field>
<field name="context">{'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'}</field>
<field name="help">Leads allow you to manage and keep track of all initial contacts with a prospect or partner showing interest in your products or services. A lead is usually the first step in your sales cycle. Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities. You can import a database of prospects, keep track of your business cards or integrate your website's contact form with the OpenERP Leads. Leads can be connected to the email gateway: new emails may create leads, each of them automatically gets the history of the conversation with the prospect.</field>
</record>

View File

@ -87,12 +87,12 @@
<!-- ALL MEETINGS -->
<menuitem name="Meetings" id="menu_meeting_sale"
parent="base.menu_base_partner" sequence="3"/>
<menuitem name="Import &amp; Synchronize" id="base.menu_import_crm"
parent="base.menu_base_partner"/>
<menuitem name="Meetings" id="menu_crm_case_categ_meet"
action="crm_case_categ_meet" parent="menu_meeting_sale"
sequence="1" />
action="crm_case_categ_meet" parent="base.menu_sales"
sequence="7" />
<record id="action_view_attendee_form" model="ir.actions.act_window">
<field name="name">Meeting Invitations</field>
@ -106,10 +106,6 @@
<field name="help">With Meeting Invitations you can create and manage the meeting invitations sent/to be sent to your colleagues/partners. You can not only invite OpenERP users, but also external parties, such as a customer.</field>
</record>
<menuitem id="menu_attendee_invitations"
name="Meeting Invitations" parent="crm.menu_meeting_sale"
sequence="10" action="action_view_attendee_form"
groups="base.group_no_one" />
</data>
</openerp>

View File

@ -105,7 +105,7 @@
<field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_phone_tree_view"/>
<field name="domain">[('state','!=','done')]</field>
<field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\', \'search_default_current\':1}'"/>
<field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\'}'"/>
<field name="search_view_id" ref="crm.view_crm_case_scheduled_phonecalls_filter"/>
<field name="help">Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
</record>

View File

@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0"
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0"
groups="base.group_sale_manager,base.group_sale_salesman"/>
<menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
@ -17,8 +17,8 @@
<menuitem id="menu_crm_config_phonecall" name="Phone Calls"
parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
<menuitem id="base.next_id_64" name="Reporting"
parent="base.menu_base_partner" sequence="11" />
<menuitem id="base.next_id_64" name="Sales"
parent="base.menu_reporting" sequence="1" />
<!-- crm.case.channel -->

View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-02-20 03:23+0000\n"
"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
"PO-Revision-Date: 2012-03-22 16:17+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n"
"X-Generator: Launchpad (build 14838)\n"
"X-Launchpad-Export-Date: 2012-03-23 04:41+0000\n"
"X-Generator: Launchpad (build 14996)\n"
#. module: crm
#: view:crm.lead.report:0
@ -291,7 +291,7 @@ msgstr "状态"
#: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
#: model:ir.ui.menu,name:crm.menu_crm_lead_categ
msgid "Categories"
msgstr "类"
msgstr "类"
#. module: crm
#: view:crm.lead:0
@ -419,7 +419,7 @@ msgstr "这默认百分比描述业务在这阶段的平均的成功概率"
#: field:crm.phonecall.report,categ_id:0
#: field:crm.phonecall2phonecall,categ_id:0
msgid "Category"
msgstr "类"
msgstr "类"
#. module: crm
#: view:crm.lead:0
@ -561,7 +561,7 @@ msgstr "满意度计算"
#. module: crm
#: view:crm.case.categ:0
msgid "Case Category"
msgstr "业务类"
msgstr "业务类"
#. module: crm
#: help:crm.segmentation,som_interval_default:0
@ -605,7 +605,7 @@ msgstr "电话访问"
msgid ""
"The partner category that will be added to partners that match the "
"segmentation criterions after computation."
msgstr "这业务伙伴类型将加到计算匹配业务伙伴的业务伙伴细分规则中"
msgstr "该业务伙伴分类将加到计算匹配业务伙伴的业务伙伴细分规则中"
#. module: crm
#: code:addons/crm/crm_meeting.py:93
@ -870,7 +870,7 @@ msgstr "商机列表"
#. module: crm
#: field:crm.segmentation,categ_id:0
msgid "Partner Category"
msgstr "业务伙伴类"
msgstr "业务伙伴类"
#. module: crm
#: view:crm.add.note:0
@ -1209,7 +1209,7 @@ msgstr "预期收益"
msgid ""
"Create specific phone call categories to better define the type of calls "
"tracked in the system."
msgstr "在系统中创建指定的电话访问类以方便定义电话访问跟踪类型"
msgstr "在系统中创建指定的电话访问类以方便定义电话访问跟踪类型"
#. module: crm
#: selection:crm.lead.report,creation_month:0
@ -1403,7 +1403,7 @@ msgstr "查找"
#. module: crm
#: view:board.board:0
msgid "Opportunities by Categories"
msgstr "商机类"
msgstr "商机类"
#. module: crm
#: model:crm.case.section,name:crm.section_sales_marketing_department
@ -1454,7 +1454,7 @@ msgid ""
"Create specific partner categories which you can assign to your partners to "
"better manage your interactions with them. The segmentation tool is able to "
"assign categories to partners according to criteria you set."
msgstr "创建指定的业务伙伴类型,细分规则可以根据你设定的规则去指定业务伙伴的类,以便你可以为更好管理他们和他们互动。"
msgstr "创建指定的业务伙伴类型,细分规则可以根据你设定的规则去指定业务伙伴的类,以便你可以为更好管理他们和他们互动。"
#. module: crm
#: field:crm.case.section,code:0
@ -1529,7 +1529,7 @@ msgstr "邮件"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
msgid "Phonecall Categories"
msgstr "电话访问类"
msgstr "电话访问类"
#. module: crm
#: view:crm.lead.report:0
@ -1810,12 +1810,12 @@ msgstr "值"
#. module: crm
#: help:crm.lead,type:0 help:crm.lead.report,type:0
msgid "Type is used to separate Leads and Opportunities"
msgstr "类型用于区分线索和商机"
msgstr "类型用于区分销售线索和商机"
#. module: crm
#: view:crm.lead:0 view:crm.lead.report:0
msgid "Opportunity by Categories"
msgstr "商机类型"
msgstr "商机按分类分组"
#. module: crm
#: view:crm.lead:0 field:crm.lead,partner_name:0
@ -1973,7 +1973,7 @@ msgstr "错误!"
msgid ""
"Create different meeting categories to better organize and classify your "
"meetings."
msgstr "创建不同类型的会议以便更好组织和把会议分类"
msgstr "创建不同的会议分类以便更好组织和把会议分类"
#. module: crm
#: model:ir.model,name:crm.model_crm_segmentation_line
@ -2954,7 +2954,7 @@ msgstr "探查商机"
#. module: crm
#: field:base.action.rule,act_categ_id:0
msgid "Set Category to"
msgstr "设类为"
msgstr "设置分类为"
#. module: crm
#: view:crm.meeting:0
@ -3111,7 +3111,7 @@ msgstr "联系人列表"
#. module: crm
#: model:crm.case.categ,name:crm.categ_oppor1
msgid "Interest in Computer"
msgstr "计算兴趣"
msgstr "计算机有兴趣"
#. module: crm
#: view:crm.meeting:0
@ -3171,7 +3171,7 @@ msgstr "会议"
#. module: crm
#: model:ir.model,name:crm.model_crm_case_categ
msgid "Category of Case"
msgstr "业务类"
msgstr "业务类"
#. module: crm
#: view:crm.lead:0 view:crm.phonecall:0
@ -3205,7 +3205,7 @@ msgstr "关闭或取消状态的线索不能转为商机"
#: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
#: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
msgid "Meeting Categories"
msgstr "会议类"
msgstr "会议类"
#. module: crm
#: view:crm.phonecall2partner:0
@ -3565,7 +3565,7 @@ msgstr "选项"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead4
msgid "Negotiation"
msgstr "协商"
msgstr "谈判"
#. module: crm
#: view:crm.lead:0

View File

@ -263,10 +263,10 @@
<menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
groups="base.group_extended"
parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
parent="base.next_id_64" action="action_report_crm_lead" sequence="1"/>
<menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
parent="base.next_id_64" action="action_report_crm_opportunity" sequence="5"/>
</data>
</openerp>

View File

@ -157,7 +157,7 @@
<menuitem name="Phone Calls Analysis"
groups="base.group_extended"
action="action_report_crm_phonecall"
id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="5"/>
id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="15"/>
</data>
</openerp>

View File

@ -11,14 +11,14 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<menuitem
name="Synchronize This Calendar"
name="Synchronize Your Meetings"
action="action_caldav_browse"
id="menu_caldav_browse"
icon="STOCK_EXECUTE"
parent="crm.menu_meeting_sale" sequence="1"/>
parent="base.menu_import_crm" sequence="10"/>
</data>
</openerp>
</openerp>

View File

@ -1,10 +1,16 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem
icon="terp-project" id="base.menu_main_pm"
name="Project" sequence="10"
groups="base.group_extended,base.group_sale_salesman"
web_icon="images/project.png"
web_icon_hover="images/project-hover.png"/>
<menuitem id="base.menu_aftersale" name="After-Sale Services"
groups="base.group_extended,base.group_sale_salesman"
parent="base.menu_base_partner" sequence="7" />
parent="base.menu_main_pm" sequence="2" />
<!-- Claims Menu -->
@ -14,7 +20,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,calendar,form</field>
<field name="view_id" ref="crm_case_claims_tree_view"/>
<field name="context">{'search_default_section_id': section_id, "search_default_current":1,"search_default_user_id":uid, "stage_type":'claim'}</field>
<field name="context">{'search_default_section_id': section_id,"search_default_user_id":uid, "stage_type":'claim'}</field>
<field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
<field name="help">Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.</field>
</record>

View File

@ -190,9 +190,13 @@
<field name="act_window_id" ref="action_report_crm_claim"/>
</record>
<menuitem id="base.menu_project_report" name="Project"
groups="base.group_extended"
parent="base.menu_reporting" sequence="30"/>
<menuitem name="Claims Analysis" id="menu_report_crm_claim_tree"
groups="base.group_extended"
action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
action="action_report_crm_claim" parent="base.menu_project_report" sequence="15"/>
</data>

View File

@ -13,7 +13,7 @@
<field name="res_model">crm.fundraising</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
<field name="context">{"search_default_user_id":uid,"search_default_current":1, 'search_default_section_id': section_id}</field>
<field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
<field name="search_view_id" ref="crm_fundraising.view_crm_case_fund_filter"/>
<field name="help">If you need to collect money for your organization or a campaign, Fund Raising allows you to track all your fund raising activities. In the search list, filter by funds description, email, history and probability of success.</field>
</record>

View File

@ -191,7 +191,7 @@
<menuitem name="Fundraising Analysis"
action="action_report_crm_fundraising"
groups="base.group_extended"
id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="20"/>
id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="30"/>
</data>
</openerp>

View File

@ -1,8 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<menuitem id="base.menu_aftersale" name="After-Sale Services"
parent="base.menu_base_partner" sequence="7" />
<menuitem
icon="terp-project" id="base.menu_main_pm"
name="Project" sequence="10"
web_icon="images/project.png"
web_icon_hover="images/project-hover.png"/>
<menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_main_pm" />
<!-- Help Desk (menu) -->
@ -12,7 +17,7 @@
<field name="view_mode">tree,calendar,form</field>
<field name="view_id" ref="crm_case_tree_view_helpdesk"/>
<field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
<field name="context">{"search_default_user_id":uid, "search_default_current":1, 'search_default_section_id': section_id}</field>
<field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
<field name="help">Helpdesk and Support allow you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary. You can also assign a priority level. Use the OpenERP Issues system to manage your support activities. Issues can be connected to the email gateway: new emails may create issues, each of them automatically gets the history of the conversation with the customer.</field>
</record>

View File

@ -156,9 +156,13 @@
<field name="act_window_id" ref="action_report_crm_helpdesk"/>
</record>
<menuitem id="base.menu_project_report" name="Project"
groups="base.group_extended"
parent="base.menu_reporting" sequence="30"/>
<menuitem name="Helpdesk Analysis" action="action_report_crm_helpdesk"
groups="base.group_extended"
id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" sequence="7"/>
id="menu_report_crm_helpdesks_tree" parent="base.menu_project_report" sequence="20"/>
</data>
</openerp>

View File

@ -12,7 +12,7 @@
<group>
<filter string="Last 30 Days" icon="terp-go-month" name="this_month"
domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
<filter icon="terp-go-week" string="7 Days"
<filter icon="terp-go-week" string="7 Days"
domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
<separator orientation="vertical" />
<filter icon="terp-check"
@ -152,17 +152,17 @@
<field name="view_id" ref="view_report_crm_opportunity_assign_tree"/>
<field name="act_window_id" ref="action_report_crm_opportunity_assign"/>
</record>
<record model="ir.actions.act_window.view" id="action_report_crm_lead_assign_graph">
<field name="sequence" eval="2"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="view_report_crm_lead_assign_graph"/>
<field name="act_window_id" ref="action_report_crm_opportunity_assign"/>
</record>
</record>
<menuitem id="menu_report_crm_opportunities_assign_tree"
groups="base.group_extended"
parent="base.next_id_64" action="action_report_crm_opportunity_assign" sequence="5"/>
parent="base.next_id_64" action="action_report_crm_opportunity_assign" sequence="20"/>
</data>
</openerp>

View File

@ -77,7 +77,7 @@
<menuitem id="menu_report_crm_partner_assign_tree"
groups="base.group_extended"
parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="5"/>
parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="25"/>
</data>
</openerp>

View File

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

View File

@ -35,10 +35,10 @@
<menuitem id="menu_reporting" name="Reporting" sequence="2" parent="knowledge.menu_document"/>
<menuitem
name="Dashboard"
name="Knowledge"
id="menu_reports_document"
parent="menu_reporting"
sequence="0"
parent="base.menu_dasboard"
sequence="45"
groups="base.group_system"/>

View File

@ -57,6 +57,8 @@ class email_template(osv.osv):
:param int res_id: id of the document record this mail is related to.
"""
if not template: return u""
if context is None:
context = {}
try:
template = tools.ustr(template)
record = None

View File

@ -95,7 +95,7 @@ class mail_compose_message(osv.osv_memory):
for fname, fcontent in attachment.iteritems():
data_attach = {
'name': fname,
'datas': base64.b64encode(fcontent),
'datas': fcontent,
'datas_fname': fname,
'description': fname,
'res_model' : self._name,

View File

@ -62,8 +62,10 @@
<field name="view_mode">form</field>
<field name="view_id" ref="board_associations_manager_form"/>
</record>
<menuitem id="menus_event_dashboard" name="Events"
parent="base.menu_dasboard" sequence="25"/>
<menuitem
name="Event Dashboard" parent="base.menu_report_association"
name="Event Dashboard" parent="menus_event_dashboard"
action="open_board_associations_manager"
sequence="1"
id="menu_board_associations_manager"

View File

@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem name="Events" id="event_main_menu"/>
<menuitem name="Events" id="event_main_menu"/>
<menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
<!-- EVENTS -->
@ -229,7 +229,8 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">event.event</field>
<field name="view_type">form</field>
<field name="view_mode">calendar,tree,form,graph</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="context">{"search_default_section_id": section_id}</field>
<field name="search_view_id" ref="view_event_search"/>
<field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
</record>
@ -254,7 +255,8 @@
<menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
<!-- EVENTS/REGISTRATIONS/EVENTS -->
<!-- EVENTS/REGISTRATIONS/EVENTS -->
<record model="ir.ui.view" id="view_event_registration_tree">
<field name="name">event.registration.tree</field>
<field name="model">event.registration</field>

View File

@ -141,7 +141,8 @@
<field name="act_window_id" ref="action_report_event_registration"/>
</record>
<menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="event.group_event_manager"/>
<menuitem parent="base.menu_reporting" id="menu_reporting_events" sequence="30" groups="event.group_event_manager" name="Events"/>
<menuitem parent="menu_reporting_events" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="event.group_event_manager"/>
</data>
</openerp>

View File

@ -180,6 +180,8 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
logger.info('start checking for new emails on %s server %s', server.type, server.name)
context.update({'fetchmail_server_id': server.id, 'server_type': server.type})
count = 0
imap_server = False
pop_server = False
if server.type == 'imap':
try:
imap_server = server.connect()

View File

@ -25,8 +25,8 @@
</record>
<menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
<menuitem id="menu_hr_reporting" parent="menu_hr_root" name="Reporting" sequence="10" />
<menuitem id="menu_hr_dashboard" parent="menu_hr_reporting" name="Dashboard" sequence="0"/>
<menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="40" />
<menuitem id="menu_hr_dashboard" parent="base.menu_dasboard" name="Human Resources" sequence="35"/>
<menuitem id="menu_hr_dashboard_user" parent="menu_hr_dashboard" action="open_board_hr" icon="terp-graph" sequence="4"/>
<!-- This board view will be complete by other hr_* modules-->

View File

@ -10,6 +10,7 @@
<menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
<menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
<menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1" />
<menuitem id="base.menu_hr_reports" parent="hr.menu_hr_root" sequence="40" name="Reporting"/>
<!--
==========

View File

@ -77,9 +77,9 @@
<field name="help">The Time Tracking functionality aims to manage employee attendances from Sign in/Sign out actions. You can also link this feature to an attendance device using OpenERP's web service features.</field>
</record>
<menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
<menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="5" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
<menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="4" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
<menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="10" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
<menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20"/>

View File

@ -62,7 +62,7 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Appraisal" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
<menuitem name="Appraisal" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="25"/>
<menuitem name="Periodic Appraisal" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
<menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
action="open_view_hr_evaluation_plan_tree"/>

View File

@ -177,7 +177,7 @@
<field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
</record>
<menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root"/>
<menuitem id="next_id_49" name="Expenses" sequence="15" parent="hr.menu_hr_root"/>
<menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49"/>
<record id="view_product_hr_expense_form" model="ir.ui.view">

View File

@ -14,7 +14,7 @@
<separator orientation="vertical"/>
<filter icon="terp-go-year" name="year" string="Year" domain="[('date_from','&gt;=',time.strftime('%%Y-1-1')),('date_from','&lt;=',time.strftime('%%Y-12-31'))]"/>
<filter icon="terp-go-month" name="This Month" string="Month" domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
<filter icon="terp-go-month" name="This Month-1" string=" Month-1"
<filter icon="terp-go-month" name="This Month-1" string=" Month-1"
domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
help="Holidays during last month"/>
<separator orientation="vertical"/>
@ -251,7 +251,7 @@
</record>
<!-- My leave dashboard -->
<menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="5"/>
<menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
<record model="ir.actions.act_window" id="open_ask_holidays">
<field name="name">Leave Requests</field>

View File

@ -32,9 +32,11 @@
<field name="target">new</field>
</record>
<menuitem id="menu_hr_leaves_reports" parent="base.menu_hr_reports" sequence="10" name="Leaves"/>
<menuitem
name="Leaves by Department"
parent="menu_hr_reporting_holidays"
parent="menu_hr_leaves_reports"
action="action_hr_holidays_summary_dept"
id="menu_account_central_journal"
groups="base.group_extended"

View File

@ -2,7 +2,7 @@
<openerp>
<data>
<!-- Root Menus -->
<menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="9"/>
<menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/>
<menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll"/>
<menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>

View File

@ -111,6 +111,8 @@
</field>
</record>
<menuitem id="menu_hr_timesheet_reports" parent="base.menu_hr_reports" sequence="5" name="Timesheet"/>
</data>
</openerp>

View File

@ -34,7 +34,7 @@
<menuitem action="action_hr_timesheet_employee"
id="menu_hr_timesheet_employee"
parent="menu_hr_reporting_timesheet"
parent="menu_hr_timesheet_reports"
groups="base.group_extended" sequence="2" icon="STOCK_PRINT"/>

View File

@ -37,7 +37,7 @@
<menuitem action="action_hr_timesheet_users"
id="menu_hr_timesheet_users"
parent="menu_hr_reporting_timesheet"
parent="menu_hr_timesheet_reports"
groups="base.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>

View File

@ -3,8 +3,8 @@
<data>
<menuitem
id="hr.menu_hr_reporting"
name="Reporting"
parent="hr.menu_hr_root"
name="Human Resources"
parent="base.menu_reporting"
sequence="40" />
<record id="view_timesheet_line_graph" model="ir.ui.view">

View File

@ -38,7 +38,7 @@
<menuitem action="action_hr_timesheet_analytic_profit"
id="menu_hr_timesheet_analytic_profit"
parent="hr_timesheet.menu_hr_reporting_timesheet" groups="base.group_extended" icon="STOCK_PRINT"/>
parent="hr_timesheet.menu_hr_timesheet_reports" groups="base.group_extended" icon="STOCK_PRINT"/>
</data>
</openerp>

View File

@ -36,6 +36,6 @@
<field name="res_model">html.view</field>
<field name="view_type">form</field>
</record>
<menuitem action="action_html_view_form" id="html_form" parent="base.menu_address_book" sequence="40"/>
<menuitem action="action_html_view_form" id="html_form" parent="base.menu_sales" sequence="40"/>
</data>
</openerp>

View File

@ -81,15 +81,6 @@
<menuitem name="Ideas" parent="base.menu_tools" id="menu_ideas1" sequence="4"/>
<menuitem
name="Ideas by Categories" parent="menu_ideas1"
id="menu_idea_category_tree"
action="action_idea_category_tree"/>
<menuitem name="Give Vote" parent="menu_ideas1"
id="menu_give_vote"
action="action_idea_select"
groups="base.group_tool_user"/>
<!-- Open Ideas Action -->
@ -384,10 +375,7 @@
</record>
<menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager,base.group_tool_user"/>
<menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
<menuitem name="Vote Statistics" parent="menu_idea_reporting"
id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_user"/>
<menuitem name="Idea" parent="base.menu_reporting" id="menu_idea_reporting" sequence="65"/>
<!-- Vote For Idea Action -->
<record model="ir.actions.act_window" id="action_idea_vote">
@ -398,7 +386,6 @@
<field name="search_view_id" ref="view_idea_vote_search"/>
</record>
<menuitem name="Votes" parent="menu_ideas1" id="menu_idea_vote" action="action_idea_vote"/>
</data>
</openerp>

View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem name="Import" id="menu_import_crm" parent="base.menu_base_partner"/>
<menuitem name="Import &amp; Synchronize" id="base.menu_import_crm" parent="base.menu_base_partner" sequence="6"/>
</data>
</openerp>

View File

@ -78,14 +78,14 @@
</record>
<menuitem id="menu_sync_contact"
parent="base.menu_address_book"
parent="base.menu_import_crm"
action="act_google_login_contact_form"
sequence="40" />
sequence="5" />
<menuitem id="menu_sync_calendar"
parent="crm.menu_meeting_sale"
parent="base.menu_import_crm"
action="act_google_login_form"
sequence="20" />
sequence="15" />
</data>
</openerp>

View File

@ -98,7 +98,7 @@
</record>
<menuitem name="Import SugarCRM" id="menu_sugarcrm_import" parent="import_base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE"/>
<menuitem name="Import SugarCRM" id="menu_sugarcrm_import" parent="base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE" sequence="20"/>
</data>
</openerp>

View File

@ -7,9 +7,9 @@
<menuitem name="Reporting" parent="base.menu_tools"
id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager"/>
<menuitem name="Lunch Orders"
parent="base.menu_lunch_reporting"
id="menu_lunch_reporting_order" sequence="1" />
<menuitem name="Lunch"
parent="base.menu_reporting"
id="menu_lunch_reporting_order" sequence="55" />
<menuitem name="Configuration" parent="base.menu_tools"
id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
@ -266,7 +266,7 @@
<field name="price" />
</group>
<notebook colspan="4">
<page string="General Information">
<page string="General Information">
<field name="active"/>
<separator string="Description" colspan="4" />
<field name="description" nolabel="1" colspan="4" />

View File

@ -1,3 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_mail_message,mail.message,model_mail_message,,1,0,1,0
access_mail_thread,mail.thread,model_mail_thread,,1,0,1,0
access_mail_message,mail.message,model_mail_message,,1,1,1,0
access_mail_thread,mail.thread,model_mail_thread,,1,1,1,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_mail_message mail.message model_mail_message 1 0 1 1 0
3 access_mail_thread mail.thread model_mail_thread 1 0 1 1 0

View File

@ -122,7 +122,7 @@
</record>
<menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/>
<menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="10" />
<menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="30" />
<!--
======================
@ -224,7 +224,7 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_marketing_campaign_segment_tree"/>
<field name="search_view_id" ref="view_marketing_campaign_segment_search"/>
<field name="context">{'group_by': [], 'search_default_running': 1}</field>
<field name="context">{'group_by': []}</field>
</record>
<menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20" />
@ -437,10 +437,10 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_marketing_campaign_workitem_tree"/>
<field name="search_view_id" ref="view_marketing_campaign_workitem_search"/>
<field name="context">{'group_by': [], 'search_default_todo': 1, 'search_default_today': 1}</field>
<field name="context">{'group_by': []}</field>
</record>
<menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="30"/>
<menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="10"/>
<act_window name="All Segments"
res_model="marketing.campaign.segment"

View File

@ -90,7 +90,7 @@
<field name="search_view_id" ref="view_campaign_analysis_search"/>
</record>
<menuitem name="Reporting" id="base.menu_report_marketing" parent="base.marketing_menu"/>
<menuitem name="Marketing" id="base.menu_report_marketing" parent="base.menu_reporting" sequence="45"/>
<menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="base.menu_report_marketing" sequence="2"/>
</data>

View File

@ -126,7 +126,7 @@
</record>
<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
<menuitem name="Membership" id="menu_membership" sequence="0" parent="base.menu_association"/>
<menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
<menuitem name="Configuration" id="base.menu_marketing_config_association"
parent="base.menu_association" sequence="30" groups="base.group_extended"/>

View File

@ -28,8 +28,8 @@
<field name="view_id" ref="board_mrp_manager_form"/>
</record>
<menuitem id="menus_dash_mrp" name="Dashboard"
parent="next_id_77" sequence="0"/>
<menuitem id="menus_dash_mrp" name="Manufacturing"
parent="base.menu_dasboard" sequence="15"/>
<menuitem
action="open_board_manufacturing" icon="terp-graph"
id="menu_board_manufacturing" parent="menus_dash_mrp"

View File

@ -304,7 +304,7 @@
<field name="search_view_id" ref="mrp_routing_search_view"/>
<field name="help">Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.</field>
</record>
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="1"/>
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="15"/>
<!--
Bill of Materials
@ -834,7 +834,7 @@
<field name="view_mode">tree,form,calendar,graph,gantt</field>
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_mrp_production_filter"/>
<field name="context">{'search_default_ready':1}</field>
<field name="context">{}</field>
<field name="help">Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumption of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed.</field>
</record>
<menuitem action="mrp_production_action" id="menu_mrp_production_action"
@ -1012,7 +1012,7 @@
</record>
<menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
<menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
<menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" parent="mrp.menu_mrp_bom" sequence="25"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
@ -1022,7 +1022,7 @@
parent="base.menu_mrp_root" sequence="2"
groups="base.group_extended"/>
<menuitem action="mrp.mrp_production_action_planning"
id="menu_mrp_production_order_action"
id="menu_mrp_production_order_action" name="Orders Planning"
parent="menu_mrp_planning" sequence="1"/>
</data>

View File

@ -41,8 +41,8 @@
</search>
</field>
</record>
<menuitem id="next_id_77" name="Reporting"
parent="base.menu_mrp_root" sequence="49"/>
<menuitem id="next_id_77" name="Manufacturing"
parent="base.menu_reporting" sequence="20"/>
<!-- stock.move compared to internal location src/dest -->

View File

@ -261,17 +261,17 @@
id="menu_mrp_production_wc_order"
action="mrp_production_wc_action_form"
groups="base.group_extended" sequence="2"/>
<menuitem name="Work Orders" parent="mrp.menu_mrp_planning"
<menuitem name="Work Orders By Resource" parent="mrp.menu_mrp_planning"
id="menu_mrp_production_wc_action_planning"
action="mrp_production_wc_action_planning"
sequence="2"
icon="STOCK_INDENT"
groups="base.group_extended"/>
<menuitem parent="mrp.menu_mrp_planning"
<!-- <menuitem parent="mrp.menu_mrp_planning"
id="menu_mrp_production_wc_resource_planning"
action="mrp_production_wc_resource_planning"
icon="STOCK_INDENT"
groups="base.group_extended"/>
groups="base.group_extended"/>-->
<!-- Operation codes -->

View File

@ -748,7 +748,7 @@
</record>
<!-- Miscelleanous Operations/Reporting -->
<menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="20" groups="group_pos_manager"/>
<menuitem name="Point of Sale" parent="base.menu_reporting" id="menu_point_rep" sequence="50" groups="group_pos_manager"/>
<!-- Invoice -->
<record model="ir.actions.act_window" id="action_pos_sale_all">
@ -770,8 +770,10 @@
<field name="domain">[('origin','like','POS')]</field>
</record>
<menuitem name="Reporting" id="menu_point_of_sale_reporting" parent="menu_point_root" sequence="20" />
<menuitem icon="STOCK_PRINT" action="action_report_pos_details"
id="menu_pos_details" parent="menu_point_rep" sequence="6" />
id="menu_pos_details" parent="menu_point_of_sale_reporting" sequence="6" />
<record model="ir.actions.client" id="action_pos_pos">
<field name="name">Start Point of Sale</field>

View File

@ -52,9 +52,9 @@ class pos_open_statement(osv.osv_memory):
ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context)
if journal.sequence_id:
number = sequence_obj.next_by_id(cr, uid, journal.sequence_id.id)
number = sequence_obj.next_by_id(cr, uid, journal.sequence_id.id, context=context)
else:
number = sequence_obj.next_by_code(cr, uid, 'account.cash.statement')
number = sequence_obj.next_by_code(cr, uid, 'account.cash.statement', context=context)
data.update({
'journal_id': journal.id,

View File

@ -88,7 +88,8 @@
</field>
</record>
<menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product"/>
<menuitem id="base.next_id_73" name="Purchase" parent="base.menu_reporting" sequence="10"/>
<menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.next_id_73"/>
</data>
</openerp>

View File

@ -104,16 +104,17 @@
</record>
<menuitem
id="next_id_86"
name="Dashboard"
sequence="0"
parent="base.menu_project_report"/>
id="menu_project_dasboard"
name="Project"
sequence="20"
parent="base.menu_dasboard"
/>
<menuitem
action="open_board_project"
icon="terp-graph"
id="menu_board_project"
parent="next_id_86"
parent="menu_project_dasboard"
sequence="1"/>
<menuitem

View File

@ -172,7 +172,7 @@
<field name="view_mode">tree,form,gantt</field>
<field name="view_id" ref="view_project"/>
<field name="search_view_id" ref="view_project_project_filter"/>
<field name="context">{'search_default_Current':1}</field>
<field name="context">{}</field>
<field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section.</field>
</record>
@ -524,7 +524,7 @@
<field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
<field eval="False" name="filter"/>
<field name="view_id" eval="False"/>
<field name="context">{"search_default_draft": 1, "search_default_open":1, "search_default_project_id": project_id}</field>
<field name="context">{"search_default_project_id": project_id}</field>
<field name="search_view_id" ref="view_task_search_form"/>
<field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
</record>
@ -539,7 +539,7 @@
<field name="act_window_id" ref="action_view_task"/>
</record>
<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="3"/>
<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="5"/>
<record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
<field name="name">Overpassed Tasks</field>
@ -626,7 +626,7 @@
<menuitem id="menu_project_config_project" name="Projects and Stages" parent="menu_definitions" sequence="1"/>
<menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" sequence="1"/>
<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
<act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>

View File

@ -2,10 +2,10 @@
<openerp>
<data>
<menuitem id="base.menu_project_report" name="Reporting"
<menuitem id="base.menu_project_report" name="Project"
groups="project.group_project_manager"
parent="base.menu_main_pm" sequence="50"/>
<menuitem id="project_report_task" name="Tasks"
parent="base.menu_reporting" sequence="25"/>
<menuitem id="project_report_task" name="Tasks Analysis"
parent="base.menu_project_report"/>
<record id="view_task_project_user_tree" model="ir.ui.view">

View File

@ -140,7 +140,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,gantt,graph,kanban</field>
</record>
<menuitem action="open_gtd_task" id="menu_open_gtd_timebox_tree" parent="project.menu_project_management" sequence="4"/>
<menuitem action="open_gtd_task" id="menu_open_gtd_timebox_tree" parent="project.menu_project_management" sequence="10"/>
</data>

View File

@ -79,7 +79,7 @@
<field name="usage">menu</field>
<field name="view_id" ref="board_project_issue_form"/>
</record>
<menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.next_id_86"
<menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dasboard"
icon="terp-graph"
action="open_board_project_issue"/>

View File

@ -11,7 +11,7 @@
<field name="view_mode">kanban,tree,calendar</field>
<field name="view_id" eval="False"/>
<field name="domain" eval=""/>
<field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1, "search_default_project_id":project_id}</field>
<field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1,"search_default_project_id":project_id}</field>
<field name="search_view_id" ref="view_project_issue_filter"/>
<field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
</record>
@ -53,7 +53,7 @@
view_mode="tree,form,calendar,graph"
view_type="form"/>
<menuitem name="Issues" id="menu_project_issue_track" parent="project.menu_project_management"
action="project_issue_categ_act0" sequence="4"/>
<menuitem name="Issues" id="menu_project_issue_track" parent="base.menu_aftersale"
action="project_issue_categ_act0" sequence="15"/>
</data>
</openerp>

View File

@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem id="base.menu_project_long_term" name="Planning" parent="base.menu_main_pm" sequence="1"/>
<menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="3"/>
# ------------------------------------------------------
# Project User Allocation
@ -124,7 +124,7 @@
</tree>
<form string="Project Users">
<field name="user_id"/>
<field name="date_start" />
<field name="date_start" />
<field name="date_end"/>
</form>
</field>
@ -252,7 +252,7 @@
<field name="res_model">project.phase</field>
<field name="view_type">form</field>
<field name="view_mode">gantt,tree,form,calendar</field>
<field name="context">{"search_default_current": 1}</field>
<field name="context">{}</field>
<field name="search_view_id" ref="view_project_phase_search"/>
<field name="help">A project can be split into the different phases. For each phase, you can define your users allocation, describe different tasks and link your phase to previous and next phases, add date constraints for the automated scheduling. Use the long term planning in order to planify your available users, convert your phases into a series of tasks when you start working on the project.</field>
</record>
@ -262,7 +262,7 @@
<field name="res_model">project.phase</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="context">{"search_default_current": 1}</field>
<field name="context">{}</field>
<field name="search_view_id" ref="view_project_phase_search"/>
</record>
@ -334,7 +334,7 @@
res_model="project.phase"
src_model="project.project"
view_mode="tree,form"
view_type="form"
view_type="form"
/>
# ------------------------------------------------------

View File

@ -100,6 +100,6 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="project_messages.view_project_message_tree"/>
</record>
<menuitem action="messages_form" id="menu_messages_form" parent="project.menu_project_management" groups="project.group_project_user"/>
<!--<menuitem action="messages_form" id="menu_messages_form" parent="project.menu_project_management" groups="project.group_project_user"/> -->
</data>
</openerp>

View File

@ -214,8 +214,8 @@
<field name="help">With its global system to schedule all resources of a company (people and material), OpenERP allows you to encode and then automatically compute tasks and phases scheduling, track resource allocation and availability.</field>
</record>
<!-- <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>-->
<menuitem id="base.menu_project_long_term" name="Long Term Planning"
parent="base.menu_main_pm" />
<menuitem id="base.menu_project_long_term" name="Planning"
parent="base.menu_main_pm" sequence="3"/>
<menuitem action="action_account_analytic_planning_form"
id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager"/>
@ -292,14 +292,11 @@
<!-- <field name="context">{"search_default_user_id":uid}</field> -->
<field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
</record>
<menuitem id="next_id_85" name="Planning"
parent="hr.menu_hr_reporting" />
<menuitem action="action_account_analytic_planning_stat_form"
id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
<menuitem action="action_account_analytic_planning_stat_form"
icon="terp-graph"
id="menu_board_planning"
parent="project.next_id_86"/>
parent="project.menu_project_dasboard"/>
<!-- Analytic account Form -->

View File

@ -98,7 +98,7 @@
</record>
<menuitem
id="menu_deshboard_scurm"
name="Scrum Dashboard" parent="project.next_id_86"
name="Scrum Dashboard" parent="project.menu_project_dasboard"
icon="terp-graph"
action="open_board_project_scrum"/>

View File

@ -4,7 +4,7 @@
<menuitem id="menu_scrum"
name="Scrum"
parent="base.menu_main_pm" sequence="3"/>
parent="base.menu_main_pm" sequence="7"/>
<!-- Scrum Project -->
@ -178,7 +178,7 @@
<field name="name">Product Backlogs</field>
<field name="res_model">project.scrum.product.backlog</field>
<field name="view_type">form</field>
<field name="context">{'search_default_current':1, 'search_default_user_id':uid,'search_default_project_id':project_id}</field>
<field name="context">{'search_default_user_id':uid,'search_default_project_id':project_id}</field>
<field name="search_view_id" ref="view_scrum_product_backlog_search"/>
<field name="help">The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a development sprint and may be split into several tasks. The product backlog is managed by the product owner of the project.</field>
</record>
@ -349,7 +349,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="view_id" ref="view_scrum_sprint_tree"/>
<field name="context">{"search_default_current": 1}</field>
<field name="context">{}</field>
<field name="search_view_id" ref="view_scrum_sprint_search"/>
<field name="help">The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (e.g. one month) during which the team implements a list of product backlogs. The sprint review is organized when the team presents its work to the customer and product owner.</field>
</record>
@ -450,7 +450,7 @@
<field name="res_model">project.scrum.meeting</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="context">{'search_default_scrum_daily':1,'search_default_project_id':project_id}</field>
<field name="context">{'search_default_project_id':project_id}</field>
<field name="search_view_id" ref="view_scrum_meeting_search"/>
<field name="help">The scrum agile methodology is used in software development projects. In this methodology, a daily meeting is organized by the scrum master with his team in order to detect the difficulties the team faced/will face.</field>
</record>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" ?>
<openerp>
<data>
<record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
<!-- <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
<field name="name">Time Tracking</field>
<field eval="5" name="sequence"/>
<field name="parent_id" ref="base.menu_main_pm"/>
@ -14,7 +14,7 @@
<field name="parent_id" ref="base.menu_project_management_time_tracking"/>
<field name="icon">STOCK_JUSTIFY_FILL</field>
<field name="action" ref="hr_timesheet_sheet.ir_actions_server_timsheet_sheet"/>
</record>
</record> -->
</data>
</openerp>

View File

@ -84,7 +84,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[]</field>
<field name="context">{'search_default_to_invoice': 1}</field>
<field name="context">{}</field>
<field name="view_id" ref="view_account_analytic_line_tree_inherit_account_id"/>
<field name="help">You will find here all works made on tasks that you can invoice.
In order to invoice the time spent on a project, you must define the
@ -101,18 +101,18 @@ the project form.</field>
parent="base.menu_main_pm" sequence="5"/>
<menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
parent="menu_project_billing" action="action_project_timesheet_bill_task"/>
<!--
Time Tracking menu in project Management
-->
<menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="hr_timesheet.act_hr_timesheet_line_evry1_all_form"/>
<!-- <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="hr_timesheet.act_hr_timesheet_line_evry1_all_form"/> -->
<record id="action_account_analytic_overdue" model="ir.actions.act_window">
<field name="name">Customer Projects</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="context">{'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1}</field>
<field name="context">{}</field>
<field name="domain">[('type','=','normal')]</field>
<field name="search_view_id" ref="account_analytic_analysis.view_account_analytic_account_overdue_search"/>
<field name="help">You will find here the contracts related to your customer projects in order to track the invoicing progress.</field>

View File

@ -3,8 +3,8 @@
<data>
<menuitem
id="hr.menu_hr_reporting"
name="Reporting"
parent="hr.menu_hr_root"
name="Human Resources"
parent="base.menu_reporting"
sequence="40" />
<!-- Report for Users' Timesheet and Task Hours per Month -->
@ -43,7 +43,7 @@
<filter icon="terp-go-month"
string=" Month-1 "
domain="[('name','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
help="Task hours of last month"/>
help="Task hours of last month"/>
<separator orientation="vertical"/>
<field name="user_id"/>
</group>
@ -58,7 +58,7 @@
</search>
</field>
</record>
<record id="view_task_hour_per_month_graph" model="ir.ui.view">
<field name="name">report.timesheet.task.user.graph</field>
<field name="model">report.timesheet.task.user</field>
@ -71,7 +71,7 @@
</graph>
</field>
</record>
<record id="action_report_timesheet_task_user" model="ir.actions.act_window">
<field name="name">Task Hours Per Month</field>
<field name="res_model">report.timesheet.task.user</field>

View File

@ -4,8 +4,8 @@
<menuitem
id="menu_purchase_deshboard"
name="Dashboard"
parent="base.next_id_73" sequence="0"/>
name="Purchase"
parent="base.menu_dasboard" sequence="5"/>
<record id="purchase_draft" model="ir.actions.act_window">
<field name="name">Request for Quotations</field>

View File

@ -5,7 +5,7 @@
groups="group_purchase_manager,group_purchase_user"
web_icon="images/purchases.png"
web_icon_hover="images/purchases-hover.png"/>
<menuitem id="menu_procurement_management" name="Purchase Management"
<menuitem id="menu_procurement_management" name="Purchase"
parent="base.menu_purchase_root" sequence="1" />
<menuitem id="menu_purchase_config_purchase" name="Configuration"
@ -81,11 +81,9 @@
</record-->
<!--supplier menu-->
<menuitem id="base.menu_procurement_management_supplier" name="Address Book"
parent="base.menu_purchase_root" sequence="3"/>
<menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
parent="base.menu_procurement_management_supplier"
action="base.action_partner_supplier_form" sequence="1"/>
<menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
parent="menu_procurement_management"
action="base.action_partner_supplier_form" sequence="15"/>
<!--Inventory control-->
<menuitem id="menu_procurement_management_inventory" name="Receive Products"
@ -305,7 +303,7 @@
</search>
</field>
</record>
<record id="purchase_order_tree" model="ir.ui.view">
<field name="name">purchase.order.tree</field>
<field name="model">purchase.order</field>

View File

@ -172,7 +172,7 @@
</record>
<menuitem id="base.next_id_73" name="Reporting" parent="base.menu_purchase_root" sequence="8"
<menuitem id="base.next_id_73" name="Purchase" parent="base.menu_reporting" sequence="10"
groups="purchase.group_purchase_manager"/>
<menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.next_id_73" sequence="3"/>
@ -185,7 +185,7 @@
<field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,'search_default_year':1,}</field>
<field name="help">Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries.</field>
</record>
<menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="base.next_id_73" sequence="8"/>
<menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="stock.next_id_61" sequence="1"/>
</data>
</openerp>

View File

@ -166,7 +166,7 @@
<field name="res_model">purchase.requisition</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="context">{"search_default_create_uid":uid,'search_default_draft': 1}</field>
<field name="context">{"search_default_create_uid":uid}</field>
<field name="search_view_id" ref="view_purchase_requisition_filter"/>
<field name="help">A purchase requisition is the step before a request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to suppliers. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others.</field>
</record>

View File

@ -30,8 +30,8 @@
<field name="view_id" ref="board_sales_manager_form"/>
</record>
<menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
<menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/>
<menuitem id="board.menu_sales_dasboard" name="Sales" sequence="1" parent="base.menu_dasboard"/>
<menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_sales_dasboard" sequence="0" groups="base.group_sale_manager"/>
<record id="action_quotation_for_sale" model="ir.actions.act_window">

View File

@ -128,8 +128,8 @@
<field name="help">This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
</record>
<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11" groups="base.group_sale_manager"/>
<menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1"/>
<menuitem id="base.next_id_64" name="Sales" parent="base.menu_reporting" sequence="1" groups="base.group_sale_manager"/>
<menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="10"/>
<!--This views used in board_sale module -->
<record id="view_sales_by_partner_graph" model="ir.ui.view">

View File

@ -4,10 +4,6 @@
id="base.menu_base_partner" name="Sales"
sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
<menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner" sequence="1"
/>
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
<record id="view_shop_form" model="ir.ui.view">
@ -259,8 +255,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Sales Order">
<filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]" help="Sales Order that haven't yet been confirmed"/>
<filter icon="terp-check" string="Sales" domain="[('state','in',('manual','progress'))]"/>
<filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','=','draft')]" help="Sales Order that haven't yet been confirmed"/>
<filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
<separator orientation="vertical"/>
<filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
<separator orientation="vertical"/>
@ -290,10 +286,10 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="context">{}</field>
<field name="context">{"search_default_sales":1}</field>
<field name="help">Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer.</field>
</record>
<menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3" groups="base.group_sale_salesman,base.group_sale_manager"/>
<menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="4" groups="base.group_sale_salesman,base.group_sale_manager"/>
<record id="action_order_tree2" model="ir.actions.act_window">
<field name="name">Sales in Exception</field>
@ -318,15 +314,19 @@
<record id="action_order_tree5" model="ir.actions.act_window">
<field name="name">All Quotations</field>
<field name="name">Quotations</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft')]</field>
<field name="context">{"search_default_draft":1}</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem id="menu_sale_quotations"
action="action_order_tree5" parent="base.menu_sales"
sequence="3" />
<record id="action_order_tree" model="ir.actions.act_window">
<field name="name">Old Quotations</field>
<field name="type">ir.actions.act_window</field>
@ -460,7 +460,7 @@
</record>
<record id="action_order_line_tree2" model="ir.actions.act_window">
<field name="name">Lines to Invoice</field>
<field name="name">Order Lines to Invoice</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order.line</field>
<field name="view_type">form</field>
@ -498,7 +498,7 @@
groups="base.group_sale_salesman"/>
<menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5" groups="base.group_extended"/>
<menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="2" groups="base.group_no_one"/>
<menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="10" groups="base.group_no_one"/>
<!-- configartion view -->

View File

@ -68,7 +68,7 @@
<field name="view_id" ref="board_warehouse_form"/>
</record>
<menuitem id="menu_dashboard_stock" name="Dashboard" sequence="0" parent="stock.next_id_61"/>
<menuitem id="menu_dashboard_stock" name="Warehouse" sequence="10" parent="base.menu_dasboard"/>
<menuitem action="open_board_warehouse" icon="terp-graph" groups="group_stock_manager" id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
<menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5" groups="group_stock_manager" action="open_board_warehouse"/>

View File

@ -4,8 +4,9 @@
<menuitem
id="stock.next_id_61"
name="Reporting"
parent="stock.menu_stock_root"/>
name="Warehouse"
sequence="15"
parent="base.menu_reporting"/>
<record id="view_stock_tree" model="ir.ui.view">
<field name="name">report.stock.move.tree</field>
@ -261,7 +262,7 @@
<field name="help">Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company activities.</field>
</record>
<menuitem action="action_stock_inventory_report"
id="menu_action_stock_inventory_report"
id="menu_action_stock_inventory_report"
parent="next_id_61" sequence="4"/>

View File

@ -6,8 +6,8 @@
groups="group_stock_manager,group_stock_user" sequence="5"
web_icon="images/warehouse.png"
web_icon_hover="images/warehouse-hover.png"/>
<menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
<menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2" groups="base.group_extended"/>
<menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/>
<menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2" groups="base.group_extended"/>
<menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>
<menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
parent="stock.menu_stock_product" sequence="0"/>
@ -405,7 +405,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_production_lot_tree"/>
<field name="search_view_id" ref="search_product_lot_filter" />
<field name="context">{"search_default_available":1}</field>
<field name="context">{}</field>
<field name="help">This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers.</field>
</record>
<menuitem action="action_production_lot_form" id="menu_action_production_lot_form"
@ -1051,7 +1051,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('type','=','out')]</field>
<field name="context">{'default_type': 'out', 'contact_display': 'partner_address', 'search_default_confirmed': 1, 'search_default_available': 1}</field>
<field name="context">{'default_type': 'out', 'contact_display': 'partner_address'}</field>
<field name="search_view_id" ref="view_picking_out_search"/>
<field name="help">This is the list of all delivery orders that have to be prepared, according to your different sales orders and your logistics rules.</field>
</record>
@ -1265,7 +1265,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('type','=','in')]</field>
<field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
<field name="context">{'contact_display': 'partner_address'}</field>
<field name="search_view_id" ref="view_picking_in_search"/>
<field name="help">The Incoming Shipments is the list of all orders you will receive from your suppliers. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially.</field>
</record>
@ -1510,7 +1510,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_move_search"/>
<field name="context">{'search_default_ready':1}</field>
<field name="context">{}</field>
<field name="help">This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product.</field>
</record>
<menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3"/>
@ -1719,7 +1719,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
<field name="view_id" ref="view_move_tree_reception_picking"/>
<field name="context" eval="'{\'search_default_receive\':1, \'search_default_available\':1, \'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
<field name="context" eval="'{\'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
<field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
<field name="help">Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.</field>
</record>
@ -1854,7 +1854,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
<field name="view_id" ref="view_move_tree_reception_picking"/>
<field name="context" eval="'{\'search_default_receive\':1,\'search_default_available\':1, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
<field name="context" eval="'{\'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
<field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
<field name="help">You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field).</field>
</record>

View File

@ -184,7 +184,7 @@
<!-- Forecast section -->
<menuitem id="menu_stock_sale_forecast" name="Sales Forecasts"
parent="base.menu_base_partner" sequence="6" groups="base.group_extended"/>
parent="base.menu_base_partner" sequence="5" groups="base.group_extended"/>
<record id="view_stock_sale_forecast_filter" model="ir.ui.view">
<field name="name">stock.sale.forecast.list.select</field>

View File

@ -8,7 +8,7 @@
<menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
<menuitem name="Reporting" parent="base.menu_tools"
id="base.menu_lunch_reporting" sequence="6"/>
<menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
<menuitem name="Reporting" id="menu_reporting" parent="menu_surveys" sequence="60"/>
<!--
Survey
-->
@ -1167,14 +1167,14 @@
<field name="view_id" ref="survey_type_tree"></field>
</record>
<act_window
<act_window
context="{'search_default_survey_id': [active_id], 'default_survey_id': active_id}"
id="act_survey_pages"
name="Pages"
res_model="survey.page"
src_model="survey"/>
<act_window
<act_window
context="{'search_default_survey': active_id, 'default_survey': active_id}"
id="act_survey_question"
name="Questions"
@ -1182,7 +1182,7 @@
src_model="survey"/>
<act_window
<act_window
context="{'search_default_page_id': active_id, 'default_page_id': active_id}"
id="act_survey_page_question"
name="Questions"

View File

@ -35,7 +35,7 @@
<field name="target">new</field>
</record>
<menuitem name="Surveys" id="menu_print_survey_form" sequence="1"
<menuitem name="Print Surveys" id="menu_print_survey_form" sequence="1"
action="action_view_survey_print" parent="menu_reporting"
groups="base.group_tool_manager" icon="STOCK_PRINT"/>

View File

@ -27,13 +27,13 @@
</record>
<menuitem
name="Documents"
name="Sales Documents"
action="action_document_form"
id="menu_document_files"
parent="menu_sales"/>
<menuitem parent="menu_sales"
id="menu_action_wiki_wiki" name="FAQ"
id="menu_action_wiki_wiki" name="Sales FAQ"
action="action_wiki_test" />