pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] trunk-usability rco

Browse Source 
bzr revid: al@openerp.com-20110806002104-xpc258vhv54j5w53
This commit is contained in:
Antony Lesuisse
2011-08-06 02:21:04 +02:00
parent 0ab21bc745 e349555fe2
commit 17e2f04cb7
50 changed files with 475 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/__openerp__.py
+1
View File
@@ -129,6 +129,7 @@ module named account_voucher.
'project/project_demo.xml',
'project/analytic_account_demo.xml',
'demo/account_minimal.xml',
'demo/account_invoice_demo.xml',
# 'account_unit_test.xml',
],
'test': [
addons/account/account_invoice_view.xml
-4
View File
@@ -378,10 +378,6 @@
<field name="period_id" select='1' string="Period"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." name = "extended filter" >
<field name="reference" select="1" string="Invoice Reference"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
addons/account/account_menuitem.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<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" sequence="6"/>
<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_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
addons/account/account_view.xml
+2 -9
View File
@@ -1201,13 +1201,6 @@
<field name="period_id" context="{'period_id':self, 'search_default_period_id':self}"/>
</group>
<newline/>
<group expand="0" string="Extended Filters...">
<field name="ref" select="1" string="Reference"/>
<field name="name" select="1"/>
<field name="narration" select="1"/>
<field name="balance" string="Debit/Credit" select='1'/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="12" col="10">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
@@ -1266,8 +1259,8 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_move_line_tree"/>
<field name="search_view_id" ref="view_account_move_line_filter"/>
<field name="domain">[('account_id', 'child_of', active_id)]</field>
<field name="context">{'account_id':active_id}</field>
<field name="domain">[]</field>
<field name="context">{'search_default_account_id': [active_id]}</field>
</record>
<record id="ir_account_move_line_select" model="ir.values">
addons/account/board_account_view.xml
-5
View File
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="note_account_type" model="board.note.type">
<field name="name">Accountants</field>
</record>
<record id="action_aged_receivable" model="ir.actions.act_window">
<field name="name">Receivable Accounts</field>
<field name="res_model">report.account.receivable</field>
addons/account/demo/account_invoice_demo.xml
+50
View File
@@ -0,0 +1,50 @@
<?xml version="1.0" ?>
<openerp>
<data noupdate="1">
<record id="demo_invoice_0" model="account.invoice">
<field name="date_due">2011-07-21</field>
<field name="payment_term" ref="account.account_payment_term"/>
<field name="journal_id" ref="account.refund_expenses_journal"/>
<field name="currency_id" ref="base.EUR"/>
<field name="address_invoice_id" ref="base.res_partner_address_wong"/>
<field name="user_id" ref="base.user_demo"/>
<field name="address_contact_id" ref="base.res_partner_address_wong"/>
<field name="reference_type">none</field>
<field name="company_id" ref="base.main_company"/>
<field name="state">draft</field>
<field name="type">in_invoice</field>
<field name="account_id" ref="account.a_pay"/>
<field eval="0" name="reconciled"/>
<field name="date_invoice">2011-06-01</field>
<field eval="14.0" name="amount_untaxed"/>
<field eval="14.0" name="amount_total"/>
<field name="partner_id" ref="base.res_partner_maxtor"/>
</record>
<record id="demo_invoice_0_line_rpanrearpanelshe0" model="account.invoice.line">
<field name="invoice_id" ref="demo_invoice_0"/>
<field name="account_id" ref="account.a_expense"/>
<field name="uos_id" ref="product.product_uom_unit"/>
<field name="price_unit" eval="10.0" />
<field name="price_subtotal" eval="10.0" />
<field name="company_id" ref="base.main_company"/>
<field name="invoice_line_tax_id" eval="[(6,0,[])]"/>
<field name="product_id" ref="product.product_product_rearpanelarm0"/>
<field name="quantity" eval="1.0" />
<field name="partner_id" ref="base.res_partner_maxtor"/>
<field name="name">[RPAN100] Rear Panel SHE100</field>
</record>
<record id="demo_invoice_0_line_rckrackcm0" model="account.invoice.line">
<field name="invoice_id" ref="demo_invoice_0"/>
<field name="account_id" ref="account.a_expense"/>
<field name="uos_id" ref="product.product_uom_unit"/>
<field name="price_unit" eval="4.0"/>
<field name="price_subtotal" eval="4.0"/>
<field name="company_id" ref="base.main_company"/>
<field name="invoice_line_tax_id" eval="[(6,0,[])]"/>
<field name="product_id" ref="product.product_product_shelf1"/>
<field name="quantity" eval="1.0" />
<field name="partner_id" ref="base.res_partner_maxtor"/>
<field name="name">[RCK200] Rack 200cm</field>
</record>
</data>
</openerp>
addons/account/partner_view.xml
+1 -1
View File
@@ -97,7 +97,7 @@
<form string="Bank account">
<field name="state"/>
<newline/>
<field name="acc_number" select="1"/>
<field name="acc_number" attrs="{'invisible':[('state','!=','bank')]}"/>
<newline/>
<field name="bank"/>
<newline/>
addons/account/project/project_view.xml
-6
View File
@@ -215,12 +215,6 @@
<field name="user_id">
<filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
</field>
</group>
<newline/>
<group expand="0" string="Extended Filters...">
<field name="journal_id" widget="selection"/>
<field name="product_id" widget="selection"/>
<field name="amount" select="1"/>
</group>
<newline/>
<group string="Group By..." expand="0">
addons/account/wizard/account_move_journal.py
+1 -1
View File
@@ -78,7 +78,7 @@ class account_move_journal(osv.osv_memory):
@return: Returns a dict that contains definition for fields, views, and toolbars
"""
res = super(account_move_journal, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
res = super(account_move_journal, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
if not view_id:
return res
addons/account/wizard/account_move_journal_view.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Standard entries">
<field name="target_move"/>
</form>
</field>
</record>
addons/account_voucher/account_voucher_view.xml
-7
View File
@@ -135,13 +135,6 @@
<field name="period_id" groups="base.group_extended"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." col='8' colspan='4'>
<field name="reference"/>
<field name="name"/>
<field name="narration"/>
<field name="amount"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="10">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
addons/account_voucher/voucher_payment_receipt_view.xml
-14
View File
@@ -23,13 +23,6 @@
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
<field name="period_id" groups="base.group_extended"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." col='8' colspan='4'>
<field name="reference"/>
<field name="name"/>
<field name="narration"/>
<field name="amount"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="10">
<filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -63,13 +56,6 @@
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
<field name="period_id" groups="base.group_extended"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." col='8' colspan='4'>
<field name="reference"/>
<field name="name"/>
<field name="narration"/>
<field name="amount"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="10">
<filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
addons/account_voucher/voucher_sales_purchase_view.xml
-14
View File
@@ -22,13 +22,6 @@
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
<field name="period_id" groups="base.group_extended"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." col='8' colspan='4'>
<field name="reference"/>
<field name="name"/>
<field name="narration"/>
<field name="amount"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="10">
<filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -61,13 +54,6 @@
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
<field name="period_id" groups="base.group_extended"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." col='8' colspan='4'>
<field name="reference"/>
<field name="name"/>
<field name="narration"/>
<field name="amount"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="10">
<filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
addons/auction/board_auction_manager_view.xml
-5
View File
@@ -1,11 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data>
<record model="board.note.type" id="note_auction_type1">
<field name="name">Auction manager</field>
</record>
<record model="ir.ui.view" id="board_auction_manager_form1">
<field name="name">board.auction.manager.form</field>
<field name="model">board.board</field>
addons/auction/board_auction_view.xml
-4
View File
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data>
<record model="board.note.type" id="note_auction_type1">
<field name="name">Auction DashBoard</field>
</record>
<record model="ir.actions.act_window" id="action_report_latest_objects_tree">
<field name="name">Latest objects</field>
<field name="res_model">auction.lots</field>
addons/base_action_rule/base_action_rule_view.xml
+5 -2
View File
@@ -3,7 +3,10 @@
<data>
<menuitem id="base.menu_base_action_rule" name="Automated Actions"
groups="base.group_extended"
parent="base.menu_custom" sequence="20" />
parent="base.menu_base_config" sequence="20" />
<menuitem id="base.menu_base_action_rule_admin" name="Automated Actions"
groups="base.group_extended"
parent="base.menu_custom" />
<!--
Action Rule Form View
@@ -118,7 +121,7 @@
</record>
<menuitem id="menu_base_action_rule_form"
parent="base.menu_base_action_rule" action="base_action_rule_act" sequence="1"/>
parent="base.menu_base_action_rule_admin" action="base_action_rule_act" sequence="1"/>
</data>
addons/base_iban/base_iban.py
+15 -5
View File
@@ -70,6 +70,14 @@ def _format_iban(string):
res += char.upper()
return res
def _pretty_iban(string):
"return string in groups of four characters separated by a single space"
res = []
while string:
res.append(string[:4])
string = string[4:]
return ' '.join(res)
class res_partner_bank(osv.osv):
_inherit = "res.partner.bank"
@@ -123,11 +131,13 @@ class res_partner_bank(osv.osv):
def name_get(self, cr, uid, ids, context=None):
res = []
to_check_ids = []
for id in self.browse(cr, uid, ids, context=context):
if id.state=='iban':
res.append((id.id,id.iban))
for val in self.browse(cr, uid, ids, context=context):
if val.state=='iban':
iban = _pretty_iban(val.iban or '')
bic = val.bank.bic or ''
res.append((val.id, _('IBAN: %s / BIC: %s') % (iban, bic)))
else:
to_check_ids.append(id.id)
to_check_ids.append(val.id)
res += super(res_partner_bank, self).name_get(cr, uid, to_check_ids, context=context)
return res
@@ -177,4 +187,4 @@ class res_partner_bank(osv.osv):
res_partner_bank()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/base_iban/base_iban_view.xml
+1 -1
View File
@@ -37,7 +37,7 @@
<field name="arch" type="xml">
<field name="acc_number" position="after">
<newline/>
<field name="iban"/>
<field name="iban" attrs="{'invisible':[('state','!=','iban')]}"/>
<newline/>
</field>
</field>
addons/board/board.py
-45
View File
@@ -195,51 +195,6 @@ class board_line(osv.osv):
board_line()
class board_note_type(osv.osv):
"""
Board note Type
"""
_name = 'board.note.type'
_description = "Note Type"
_columns = {
'name': fields.char('Note Type', size=64, required=True),
}
board_note_type()
def _type_get(self, cr, uid, context=None):
"""
Get by default Note type.
"""
obj = self.pool.get('board.note.type')
ids = obj.search(cr, uid, [])
res = obj.read(cr, uid, ids, ['name'], context=context)
res = [(r['name'], r['name']) for r in res]
return res
class board_note(osv.osv):
"""
Board Note
"""
_name = 'board.note'
_description = "Note"
_columns = {
'name': fields.char('Subject', size=128, required=True),
'note': fields.text('Note'),
'user_id': fields.many2one('res.users', 'Author', size=64),
'date': fields.date('Date', size=64, required=True),
'type': fields.selection(_type_get, 'Note type', size=64),
}
_defaults = {
'user_id': lambda object, cr, uid, context: uid,
'date': lambda object, cr, uid, context: time.strftime('%Y-%m-%d'),
}
board_note()
class res_log_report(osv.osv):
""" Log Report """
_name = "res.log.report"
addons/board/board_administration_view.xml
-4
View File
@@ -52,10 +52,6 @@
help="Log created in last month"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="creation_date"/>
</group>
<newline/>
<group expand="1" string="Group By...">
<filter string="Model" icon="terp-go-home" context="{'group_by':'res_model'}" />
<separator orientation="vertical"/>
addons/board/board_view.xml
+9 -72
View File
@@ -34,67 +34,6 @@
<field name="view_mode">form</field>
<field name="view_id" ref="view_board_homepage"/>
</record>
<!--Board Note Search View -->
<record id="view_board_note_search" model="ir.ui.view">
<field name="name">board.note.search</field>
<field name="model">board.note</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Notes">
<group col="10" colspan="4">
<field name="name" string="Subject"/>
<field name="type" string="Note Type"/>
<field name="date" string="Date"/>
</group>
<newline/>
<group expand="0" colspan="4" string="Group By...">
<filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
</group>
</search>
</field>
</record>
<!--Board Note Tree View -->
<record id="view_board_note_tree" model="ir.ui.view">
<field name="name">board.note.tree</field>
<field name="model">board.note</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Notes">
<field name="name"/>
<field name="user_id"/>
</tree>
</field>
</record>
<!--Board Note Form View -->
<record id="view_board_note_form" model="ir.ui.view">
<field name="name">board.note.form</field>
<field name="model">board.note</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Note">
<field name="name" select="1"/>
<field name="type" select="1" required="1"/>
<field name="user_id" select="1"/>
<field name="date" select="1"/>
<separator string="Notes" colspan="4"/>
<field colspan="4" name="note" nolabel="1"/>
</form>
</field>
</record>
<!-- Action for Publish note Form -->
<record id="action_view_board_note_form" model="ir.actions.act_window">
<field name="name">Publish a note</field>
<field name="res_model">board.note</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="search_view_id" ref="view_board_note_search"/>
</record>
<!-- Board Tree View -->
@@ -118,11 +57,14 @@
<field eval="1" name="priority"/>
<field name="arch" type="xml">
<form string="Dashboard">
<field name="name"/>
<button colspan="2"
name="%(action_board_menu_create)d"
string="Create Menu" type="action"
icon="gtk-justify-fill" />
<group col="6" colspan="4">
<field name="name"/>
<field name="view_id"/>
<button colspan="2"
name="%(action_board_menu_create)d"
string="Create Menu" type="action"
icon="gtk-justify-fill" />
</group>
<field colspan="4" name="line_ids" nolabel="1">
<tree string="Dashboard View">
<field name="name"/>
@@ -168,12 +110,7 @@
<menuitem
action="action_view_board_list_form"
id="menu_view_board_form" parent="base.reporting_menu" sequence="1"/>
<menuitem action="action_view_board_note_form"
id="menu_view_board_note_form"
parent="base.reporting_menu"
sequence="3" groups="base.group_system" />
id="menu_view_board_form" parent="base.reporting_menu" groups="base.group_no_one" sequence="1"/>
<act_window context="{'view': active_id}" id="dashboard_open"
multi="True" name="Open Dashboard" res_model="board.board"
addons/board/security/ir.model.access.csv
-2
View File
@@ -1,8 +1,6 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_board_board","board.board","model_board_board","base.group_user",1,1,1,1
"access_board_board_line","board.board.line","model_board_board_line","base.group_user",1,1,1,1
"access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1
"access_board_note","board.note","model_board_note","base.group_user",1,1,1,1
"access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1
"access_res_log_report","res.log.report","model_res_log_report","base.group_user",1,1,1,1
"access_res_log_report_system","res.log.report system","model_res_log_report",base.group_system,1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_board_board board.board model_board_board base.group_user 1 1 1 1
3 access_board_board_line board.board.line model_board_board_line base.group_user 1 1 1 1
access_board_note_type board.note.type model_board_note_type base.group_user 1 1 1 1
access_board_note board.note model_board_note base.group_user 1 1 1 1
4 access_board_board_sale_salesman board.board.sale.salesman model_board_board base.group_sale_salesman 1 1 1 1
5 access_res_log_report res.log.report model_res_log_report base.group_user 1 1 1 1
6 access_res_log_report_system res.log.report system model_res_log_report base.group_system 1 0 0 0
addons/crm/board_crm_view.xml
+1 -5
View File
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data>
<record model="board.note.type" id="note_crm_type">
<field name="name">CRM Configuration</field>
</record>
<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
<field name="name">crm.opportunity.user.graph1</field>
<field name="model">crm.lead.report</field>
@@ -37,7 +33,7 @@
<field name="arch" type="xml">
<tree string="Opportunities" colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
<field name="name" string="Opportunity"/>
<field name="partner_id"/>
<field name="partner_id" string="Customer"/>
<field name="stage_id"/>
<button name="stage_previous" string="Previous Stage"
states="open,pending" type="object" icon="gtk-go-back" />
addons/crm/crm_lead_view.xml
+4 -15
View File
@@ -346,21 +346,10 @@
domain="[]"
help="Show Sales Team"/>
</field>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="stage_id" widget="selection" domain="[('type', '=', 'lead')]"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
<separator orientation="vertical"/>
<field name="country_id" context="{'invisible_country': False}">
<filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
</field>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="create_date" string="Creation Date"/>
<field name="date_closed"/>
</group>
<separator orientation="vertical"/>
<field name="country_id" context="{'invisible_country': False}">
<filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
</field>
<newline/>
<group expand="0" string="Group By...">
<filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
addons/crm/crm_meeting_view.xml
-5
View File
@@ -312,11 +312,6 @@
</field>
<field name="user_id" select="1"/>
</group>
<newline/>
<group expand="0" string="Extended Filters...">
<field name="class" select="1" string="Privacy"/>
<field name="show_as" string="Show time as" select="1"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Responsible" icon="terp-personal" domain="[]"
addons/crm/crm_opportunity_view.xml
-17
View File
@@ -311,23 +311,6 @@
help="Show Sales Team"/>
</field>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="stage_id" widget="selection" domain="[('type', '=', 'opportunity')]"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
<separator orientation="vertical"/>
<field name="country_id" context="{'invisible_country': False}">
<filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
</field>
<separator orientation="vertical"/>
<field name="email_from"/>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="create_date" string="Creation Date"/>
<field name="date_closed"/>
<field name="subjects"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="16">
<filter string="Salesman" icon="terp-personal"
addons/crm/report/crm_lead_report.py
+19 -7
View File
@@ -31,6 +31,21 @@ AVAILABLE_STATES = [
('pending','Pending')
]
MONTHS = [
('01', 'January'),
('02', 'February'),
('03', 'March'),
('04', 'April'),
('05', 'May'),
('06', 'June'),
('07', 'July'),
('08', 'August'),
('09', 'September'),
('10', 'October'),
('11', 'November'),
('12', 'December')
]
class crm_lead_report(osv.osv):
""" CRM Lead Report """
_name = "crm.lead.report"
@@ -45,12 +60,8 @@ class crm_lead_report(osv.osv):
'channel_id':fields.many2one('res.partner.canal', 'Channel', readonly=True),
'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
'month':fields.selection([('01', 'January'), ('02', 'February'), \
('03', 'March'), ('04', 'April'),\
('05', 'May'), ('06', 'June'), \
('07', 'July'), ('08', 'August'),\
('09', 'September'), ('10', 'October'),\
('11', 'November'), ('12', 'December')], 'Month', readonly=True),
'creation_month':fields.selection(MONTHS, 'Creation Date', readonly=True),
'deadline_month':fields.selection(MONTHS, 'Exp. Closing', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True),
'create_date': fields.datetime('Create Date', readonly=True, select=True),
'day': fields.char('Day', size=128, readonly=True),
@@ -88,8 +99,9 @@ class crm_lead_report(osv.osv):
SELECT
id,
to_char(c.date_deadline, 'YYYY') as name,
to_char(c.date_deadline, 'MM') as month,
to_char(c.date_deadline, 'MM') as deadline_month,
to_char(c.date_deadline, 'YYYY-MM-DD') as day,
to_char(c.create_date, 'MM') as creation_month,
to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
addons/crm/report/crm_lead_report_view.xml
+8 -8
View File
@@ -18,7 +18,8 @@
<field name="channel_id" invisible="1"/>
<field name="type" invisible="1"/>
<field name="priority" invisible="1"/>
<field name="month" invisible="1"/>
<field name="creation_month" invisible="1"/>
<field name="deadline_month" invisible="1"/>
<field name="section_id" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="company_id" invisible="1"/>
@@ -157,12 +158,10 @@
<filter string="State" icon="terp-stock_effects-object-colorize"
domain="[]" context="{'group_by':'state'}" />
<separator orientation="vertical" />
<filter string="Day" icon="terp-go-today"
domain="[]" context="{'group_by':'day'}" help="Day on which lead/opportunity is created"/>
<filter string="Month" icon="terp-go-month"
domain="[]" context="{'group_by':'month'}" help="Month in which lead/opportunity is created"/>
<filter string="Year" icon="terp-go-year"
domain="[]" context="{'group_by':'name'}" help="Year in which lead/opportunity is created"/>
<filter string="Creation Date" icon="terp-go-month"
domain="[]" context="{'group_by':'creation_month'}"/>
<filter string="Exp. Closing" icon="terp-go-month"
domain="[]" context="{'group_by':'deadline_month'}"/>
</group>
</search>
</field>
@@ -177,7 +176,8 @@
<field name="arch" type="xml">
<tree colors="blue:state in ('draft');black:state in ('open','pending','done');gray:state in ('cancel') " string="Opportunities Analysis">
<field name="name" invisible="1"/>
<field name="month" invisible="1"/>
<field name="creation_month" invisible="1"/>
<field name="deadline_month" invisible="1"/>
<field name="section_id" invisible="1" groups="base.group_extended"/>
<field name="user_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
addons/crm_helpdesk/crm_helpdesk_view.xml
-4
View File
@@ -254,10 +254,6 @@
domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
help="My Sales Team(s)" />
</field>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="write_date" string="Updated Date"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner"
addons/document/board_document_view.xml
-4
View File
@@ -1,10 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data>
<record model="board.note.type" id="note_document_type">
<field name="name">Document</field>
</record>
<record model="ir.ui.view" id="board_document_manager_form">
<field name="name">board.document.manager.form</field>
<field name="model">board.board</field>
addons/event/board_association_view.xml
-4
View File
@@ -34,10 +34,6 @@
<field name="view_mode">tree,form</field>
</record>
<record model="board.note.type" id="note_association_type">
<field name="name">associations</field>
</record>
<record model="ir.ui.view" id="board_associations_manager_form">
<field name="name">board.associations.manager.form</field>
<field name="model">board.board</field>
addons/hr/hr_demo.xml
+19 -30
View File
@@ -11,6 +11,21 @@
<field name="name">Experience</field>
</record>
<record id="category_sr_exec" model="hr.employee.category">
<field name="name">Senior (5 years)</field>
<field name="parent_id" ref="category_experience"/>
</record>
<record id="category_jr_exec" model="hr.employee.category">
<field name="name">Junior (6 months)</field>
<field name="parent_id" ref="category_experience"/>
</record>
<record id="category_trainee" model="hr.employee.category">
<field name="name">Trainee</field>
<field name="parent_id" ref="category_experience"/>
</record>
<record id="category_ranking" model="hr.employee.category">
<field name="name">Ranking</field>
</record>
@@ -20,42 +35,16 @@
<field name="parent_id" ref="category_ranking"/>
</record>
<record id="category_cto" model="hr.employee.category">
<field name="name">CTO</field>
<field name="parent_id" ref="category_ceo"/>
</record>
<record id="category_managers" model="hr.employee.category">
<field name="name">Managers (Tech. Heads)</field>
<field name="parent_id" ref="category_cto"/>
</record>
<record id="category_project_managers" model="hr.employee.category">
<field name="name">Project Managers</field>
<field name="parent_id" ref="category_managers"/>
<field name="name">Executive Managers</field>
<field name="parent_id" ref="category_ranking"/>
</record>
<record id="category_employee" model="hr.employee.category">
<field name="name">Employees</field>
<field name="parent_id" ref="category_project_managers"/>
<field name="parent_id" ref="category_ranking"/>
</record>
<record id="category_sr_exec" model="hr.employee.category">
<field name="name">Sr. Executives (5 years)</field>
<field name="parent_id" ref="category_experience"/>
</record>
<record id="category_jr_exec" model="hr.employee.category">
<field name="name">Jr. Executives (6 months)</field>
<field name="parent_id" ref="category_experience"/>
</record>
<record id="category_trainee" model="hr.employee.category">
<field name="name">Trainee</field>
<field name="parent_id" ref="category_experience"/>
</record>
<!-- Example employee -->
<record id="employee1" model="hr.employee">
@@ -76,7 +65,7 @@
<field name="name">Antoine Philippe</field>
<field name="calendar_id" ref="resource.timesheet_group1"/>
<field name="user_id" ref="base.user_root"/>
<field name="category_ids" eval="[(6, 0, [ref('category_trainee')])]"/>
<field name="category_ids" eval="[(6, 0, [ref('category_trainee'),ref('category_employee')])]"/>
</record>
<record id="ir_ui_view_sc_employees_demo" model="ir.ui.view_sc">
addons/hr_holidays/hr_holidays_data.xml
+6
View File
@@ -23,6 +23,12 @@
<field name="color_name">brown</field>
</record>
<!--Unpaid Leave -->
<record model="hr.holidays.status" id="holiday_status_unpaid">
<field name="name">Unpaid</field>
<field name="limit">True</field>
<field name="color_name">brown</field>
</record>
</data>
</openerp>
addons/hr_holidays/hr_holidays_demo.xml
+24
View File
@@ -31,10 +31,34 @@
<field name="employee_id" ref="hr.employee1"/>
</record>
<record model="hr.holidays" id="hr_holidays_employee1_vc">
<field name="name">Summer Vacation</field>
<field name="holiday_status_id" ref="holiday_status_unpaid"/>
<field eval="time.strftime('%Y-%m-20')" name="date_from"/>
<field eval="time.strftime('%Y-%m-22')" name="date_to"/>
<field name="type">add</field>
<field name="state">draft</field>
<field name="number_of_days_temp">7</field>
<field name="employee_id" ref="hr.employee1"/>
</record>
<record model="hr.holidays" id="hr_holidays_employee1_int_tour">
<field name="name">International Tour</field>
<field name="holiday_status_id" ref="holiday_status_comp"/>
<field eval="time.strftime('%Y-%m-20')" name="date_from"/>
<field eval="time.strftime('%Y-%m-22')" name="date_to"/>
<field name="type">add</field>
<field name="number_of_days_temp">7</field>
<field name="employee_id" ref="hr.employee1"/>
</record>
<workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
<workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
<workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
<workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
<workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_int_tour"/>
<workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_int_tour"/>
</data>
</openerp>
addons/hr_holidays/hr_holidays_view.xml
-3
View File
@@ -22,9 +22,6 @@
<filter icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
</field>
<field name="holiday_status_id" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Extended Filters...">
<field name="date_from"/>
<field name="date_to"/>
</group>
addons/hr_recruitment/hr_recruitment_demo.xml
+43
View File
@@ -134,5 +134,48 @@
<field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
<field eval="'6630125'" name="partner_phone"/>
</record>
<record id="hr_case_programmer" model="hr.applicant">
<field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
<field name="partner_address_id" ref="base.res_partner_address_14"/>
<field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
<field name="type_id" ref="degree_bac5"/>
<field name="partner_id" ref="base.res_partner_15"/>
<field eval="'3'" name="priority"/>
<field name="user_id" ref="base.user_root"/>
<field eval="'Shane Williams'" name="partner_name"/>
<field eval="'open'" name="state"/>
<field eval="1.15" name="duration"/>
<field eval="'tina_augustie@example.com'" name="partner_name2"/>
<field eval="'9812398524'" name="partner_mobile"/>
<field eval="1" name="active"/>
<field name="categ_id" ref="categ_job2"/>
<field name="stage_id" ref="stage_job4"/>
<field eval="'Programmer'" name="name"/>
<field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
<field eval="'6630125'" name="partner_phone"/>
<field name="job_id" ref="hr.job_jr_appli"/>
<field eval="11000.0" name="salary_expected"/>
</record>
<record id="hr_case_advertisement" model="hr.applicant">
<field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
<field name="type_id" ref="degree_licenced"/>
<field name="partner_id" ref="base.res_partner_11"/>
<field eval="'4'" name="priority"/>
<field name="user_id" ref="base.user_root"/>
<field eval="'David Armstrong'" name="partner_name"/>
<field eval="'done'" name="state"/>
<field eval="'david@market.edu'" name="partner_name2"/>
<field eval="'9925741564'" name="partner_mobile"/>
<field eval="1" name="active"/>
<field eval="2.20" name="duration"/>
<field name="categ_id" ref="categ_job1"/>
<field name="stage_id" ref="stage_job5"/>
<field eval="'Advertisement'" name="name"/>
<field eval="'25968745'" name="partner_phone"/>
<field eval="11000.0" name="salary_expected"/>
</record>
</data>
</openerp>
addons/hr_timesheet/hr_timesheet_demo.xml
+41
View File
@@ -78,6 +78,47 @@
<field name="journal_id" ref="analytic_journal"/>
</record>
<record id="working_hours_Training" model="hr.analytic.timesheet">
<field name="name">Training to partner</field>
<field name="user_id" ref="base.user_root"/>
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
<field eval="01.00" name="unit_amount"/>
<field name="product_id" ref="product_consultant"/>
<field name="product_uom_id" ref="product.uom_hour"/>
<field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
<field eval="-30.00" name="amount"/>
<field name="general_account_id" model="account.account" ref="account.a_expense"/>
<field name="invoice_id" ref="account.account_invoice_6"/>
<field name="journal_id" ref="analytic_journal"/>
</record>
<record id="working_hours_presentation" model="hr.analytic.timesheet">
<field name="name">Presentation</field>
<field name="user_id" ref="base.user_root"/>
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
<field eval="01.00" name="unit_amount"/>
<field name="product_id" ref="product_consultant"/>
<field name="product_uom_id" ref="product.uom_hour"/>
<field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
<field eval="-30.00" name="amount"/>
<field name="general_account_id" model="account.account" ref="account.a_expense"/>
<field name="invoice_id" ref="account.account_invoice_5"/>
<field name="journal_id" ref="analytic_journal"/>
</record>
<record id="working_hours_trainee" model="hr.analytic.timesheet">
<field name="name">Training to trainee</field>
<field name="user_id" ref="base.user_root"/>
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
<field eval="01.00" name="unit_amount"/>
<field name="product_id" ref="product_consultant"/>
<field name="product_uom_id" ref="product.uom_hour"/>
<field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
<field eval="-30.00" name="amount"/>
<field name="general_account_id" model="account.account" ref="account.a_expense"/>
<field name="invoice_id" ref="account.account_invoice_4"/>
<field name="journal_id" ref="analytic_journal"/>
</record>
</data>
</openerp>
addons/membership/membership_view.xml
-4
View File
@@ -20,10 +20,6 @@
<field name="name"/>
<field name="categ_id" widget="selection" operator="child_of"/>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
</group>
<newline/>
<group expand='0' string='Group by...' groups="base.group_extended">
<filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
<separator orientation="vertical"/>
addons/mrp/board_manufacturing_view.xml
-4
View File
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="note_sale_type" model="board.note.type">
<field name="name">Production</field>
</record>
<record id="board_mrp_manager_form" model="ir.ui.view">
<field name="name">board.mrp.manager.form</field>
<field name="model">board.board</field>
addons/project/__openerp__.py
-1
View File
@@ -60,7 +60,6 @@ Dashboard for project members that includes:
],
'demo_xml': [
'project_demo.xml',
'board_project_demo.xml',
],
'test':[
'test/test_project.yml',
addons/project/board_project_demo.xml
-17
View File
@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<!--
Administrator shortcut
Demo user startup menu
-->
<record id="note_project" model="board.note">
<field name="name">Don't forget the new development policies.</field>
<field name="user_id" ref="base.user_root"/>
<field name="type">Project</field>
</record>
</data>
</openerp>
addons/project/board_project_manager_view.xml
-4
View File
@@ -2,10 +2,6 @@
<openerp>
<data>
<record id="note_project_type" model="board.note.type">
<field name="name">Project managers</field>
</record>
<!--
Board for project managers
-->
addons/project/board_project_view.xml
-11
View File
@@ -2,10 +2,6 @@
<openerp>
<data>
<record id="note_project_manager_type" model="board.note.type">
<field name="name">Project</field>
</record>
<!-- My task -->
<record id="view_task_tree" model="ir.ui.view">
<field name="name">project.task.tree</field>
@@ -79,13 +75,6 @@
<field name="view_id" ref="view_task_tree"/>
</record>
<record id="action_view_board_note_tree" model="ir.actions.act_window">
<field name="name">Public Notes</field>
<field name="res_model">board.note</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('type','=','Project')]</field>
</record>
<record id="board_project_form" model="ir.ui.view">
<field name="name">board.project.form</field>
<field name="model">board.board</field>
addons/project_issue/project_issue_view.xml
-5
View File
@@ -221,12 +221,7 @@
<filter domain="[('assigned_to','=',False)]" help="Unassigned Issues" icon="terp-personal-" separator="1"/>
</field>
<field name="project_id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
<field name="version_id" widget="selection"/>
<separator orientation="vertical"/>
<field name="id"/>
</group>
<newline/>
addons/project_timesheet/project_timesheet.py
+12 -1
View File
@@ -28,7 +28,18 @@ from tools.translate import _
class project_project(osv.osv):
_inherit = 'project.project'
def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
res = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context)
if part and res and ('value' in res):
# set Invoice Task Work to 100%
data_obj = self.pool.get('ir.model.data')
data_id = data_obj._get_id(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')
if data_id:
factor_id = data_obj.browse(cr, uid, data_id).res_id
res['value'].update({'to_invoice': factor_id})
return res
project_project()
class project_work(osv.osv):
addons/purchase/purchase_demo.xml
+138
View File
@@ -22,6 +22,33 @@
<field name="partner_address_id" ref="base.res_partner_address_zen"/>
</record>
<record id="order_purchase3" model="purchase.order">
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="pricelist_id" ref="purchase.list0"/>
<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
<field name="partner_address_id" ref="base.res_partner_address_3000"/>
</record>
<record id="order_purchase4" model="purchase.order">
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="pricelist_id" ref="purchase.list0"/>
<field name="partner_id" ref="base.res_partner_4"/>
<field name="partner_address_id" ref="base.res_partner_address_7"/>
</record>
<record id="order_purchase5" model="purchase.order">
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="pricelist_id" ref="purchase.list0"/>
<field name="partner_id" ref="base.res_partner_maxtor"/>
<field name="partner_address_id" ref="base.res_partner_address_wong"/>
</record>
<record id="order_purchase6" model="purchase.order">
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="pricelist_id" ref="purchase.list0"/>
<field name="partner_id" ref="base.res_partner_vickingdirect0"/>
<field name="partner_address_id" ref="base.res_partner_address_brussels0"/>
</record>
<!--Resource: purchase.order.line-->
<record id="line1_purchase" model="purchase.order.line">
@@ -54,7 +81,118 @@
<field name="product_qty">1</field>
</record>
<record id="line4_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase3"/>
<field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
<field name="name">Onsite Senior Intervention</field>
<field name="product_id" ref="product.product_product_0"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="price_unit">900</field>
<field name="product_qty">10</field>
</record>
<record id="line5_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase3"/>
<field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
<field name="name">Onsite Intervention</field>
<field name="product_id" ref="product.product_product_1"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="price_unit">100</field>
<field name="product_qty">5</field>
</record>
<record id="line6_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase4"/>
<field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
<field name="name">[PC2] Basic+ PC (assembly on order)</field>
<field name="product_id" ref="product.product_product_pc2"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="price_unit">40</field>
<field name="product_qty">5</field>
</record>
<record id="line7_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase4"/>
<field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
<field name="name">[MB1] Mainboard ASUStek A7N8X</field>
<field name="product_id" ref="product.product_product_mb1"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="price_unit">45</field>
<field name="product_qty">15</field>
</record>
<record id="line8_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase4"/>
<field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
<field name="name">[MB2] Mainboard ASUStek A7V8X-X</field>
<field name="product_id" ref="product.product_product_mb2"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="price_unit">45</field>
<field name="product_qty">15</field>
</record>
<record id="line9_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase5"/>
<field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
<field name="name">[CPU1] Processor AMD Athlon XP 1800+</field>
<field name="product_id" ref="product.product_product_cpu1"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="price_unit">60</field>
<field name="product_qty">3</field>
</record>
<record id="line10_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase5"/>
<field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
<field name="name">[CPU3] Processor AMD Athlon XP 2200+</field>
<field name="product_id" ref="product.product_product_cpu3"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="price_unit">50</field>
<field name="product_qty">13</field>
</record>
<record id="line11_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase5"/>
<field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
<field name="name">[HDD1] HDD Seagate 7200.8 80GB</field>
<field name="product_id" ref="product.product_product_hdd1"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="price_unit">70</field>
<field name="product_qty">10</field>
</record>
<record id="line12_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase6"/>
<field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
<field name="name">[HDD2] HDD Seagate 7200.8 120GB</field>
<field name="product_id" ref="product.product_product_hdd2"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="price_unit">70</field>
<field name="product_qty">10</field>
</record>
<record id="line12_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase6"/>
<field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
<field name="name">[RAM] DDR 256MB PC400</field>
<field name="product_id" ref="product.product_product_ram"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="price_unit">700</field>
<field name="product_qty">10</field>
</record>
<record id="line13_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase6"/>
<field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
<field name="name">[RAM512] DDR 512MB PC400</field>
<field name="product_id" ref="product.product_product_ram512"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="price_unit">1700</field>
<field name="product_qty">10</field>
</record>
<workflow action="purchase_confirm" model="purchase.order" ref="order_purchase2"/>
<workflow action="purchase_confirm" model="purchase.order" ref="order_purchase4"/>
<workflow action="purchase_confirm" model="purchase.order" ref="order_purchase6"/>
<record id="stock.res_company_tinyshop0" model="res.company">
<field eval="1.0" name="po_lead"/>
addons/sale/board_sale_view.xml
-4
View File
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="note_sale_type" model="board.note.type">
<field name="name">Sales</field>
</record>
<record id="board_sales_manager_form" model="ir.ui.view">
<field name="name">board.sales.manager.form</field>
<field name="model">board.board</field>
addons/sale/sale_demo.xml
+67
View File
@@ -178,6 +178,73 @@
</record>
<workflow action="order_confirm" model="sale.order" ref="order5"/>
<!--Resource: sale.order-->
<record id="order6" model="sale.order">
<field name="shop_id" ref="shop"/>
<field model="product.pricelist" name="pricelist_id" search="[]"/>
<field name="user_id" ref="base.user_demo"/>
<field name="partner_id" ref="base.res_partner_maxtor"/>
<field name="partner_invoice_id" ref="base.res_partner_address_wong"/>
<field name="partner_shipping_id" ref="base.res_partner_address_wong"/>
<field name="partner_order_id" ref="base.res_partner_address_wong"/>
</record>
<record id="order6_line0" model="sale.order.line">
<field name="order_id" ref="order6"/>
<field name="name">Onsite Senior Intervention</field>
<field name="product_id" ref="product.product_product_0"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_qty">4</field>
<field name="price_unit">250</field>
<field name="type">make_to_order</field>
<field name="delay">15</field>
</record>
<record id="order6_line1" model="sale.order.line">
<field name="order_id" ref="order6"/>
<field name="name">Onsite Intervention</field>
<field name="product_id" ref="product.product_product_1"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_qty">4</field>
<field name="price_unit">500</field>
<field name="type">make_to_order</field>
<field name="delay">15</field>
</record>
<workflow action="order_confirm" model="sale.order" ref="order6"/>
<workflow action="manual_invoice" model="sale.order" ref="order6"/>
<!--Resource: sale.order-->
<record id="order7" model="sale.order">
<field name="shop_id" ref="shop"/>
<field model="product.pricelist" name="pricelist_id" search="[]"/>
<field name="user_id" ref="base.user_demo"/>
<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
<field name="partner_invoice_id" ref="base.res_partner_address_3000"/>
<field name="partner_shipping_id" ref="base.res_partner_address_3000"/>
<field name="partner_order_id" ref="base.res_partner_address_3000"/>
</record>
<record id="order7_line0" model="sale.order.line">
<field name="order_id" ref="order7"/>
<field name="name">[MB1] Mainboard ASUStek A7N8X</field>
<field name="product_id" ref="product.product_product_mb1"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_qty">4</field>
<field name="price_unit">250</field>
<field name="type">make_to_order</field>
<field name="delay">15</field>
</record>
<record id="order7_line1" model="sale.order.line">
<field name="order_id" ref="order7"/>
<field name="name">[MB2] Mainboard ASUStek A7V8X-X</field>
<field name="product_id" ref="product.product_product_mb2"/>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="product_uom_qty">4</field>
<field name="price_unit">500</field>
<field name="type">make_to_order</field>
<field name="delay">15</field>
</record>
<workflow action="order_confirm" model="sale.order" ref="order7"/>
<workflow action="manual_invoice" model="sale.order" ref="order7"/>
<!-- Run all schedulers -->
<function model="procurement.order" name="run_scheduler"/>
addons/stock/board_warehouse_view.xml
-5
View File
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="note_warehouse_type" model="board.note.type">
<field name="name">Warehouse</field>
</record>
<record id="action_incoming_product_board" model="ir.actions.act_window">
<field name="name">Incoming Product</field>
<field name="res_model">stock.move</field>
addons/stock/stock_view.xml
+6 -22
View File
@@ -1247,6 +1247,8 @@
<separator orientation="vertical" />
<filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
<separator orientation="vertical"/>
<filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
<separator orientation="vertical"/>
<field name="name"/>
<field name="partner_id"/>
<field name="origin"/>
@@ -1254,10 +1256,6 @@
<field name="company_id" widget="selection" groups="base.group_multi_company" />
</group>
<newline/>
<group expand="0" string="Extended Filters..." colspan="4" col="8">
<filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="8">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical" />
@@ -1498,14 +1496,8 @@
<field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
<field name="address_id" string="Partner" context="{'contact_display':'partner'}" filter_domain="[('picking_id.address_id','ilike',self)]"/>
<field name="date"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." colspan="4" col="8" groups="base.group_extended">
<field name="origin"/>
<field name="picking_id"/>
<field name="prodlot_id"/>
<field name="tracking_id"/>
<field name="state"/>
<field name="origin"/>
<field name="prodlot_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
@@ -1691,11 +1683,7 @@
<field name="origin"/>
<field name="partner_id" string="Partner"/>
<field name="product_id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="tracking_id" context="{'tracking': self}"/>
<field name="prodlot_id"/>
<field name="prodlot_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
@@ -1728,11 +1716,7 @@
<field name="origin"/>
<field name="partner_id" string="Partner"/>
<field name="product_id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="tracking_id" context="{'tracking_id': self}"/>
<field name="prodlot_id"/>
<field name="prodlot_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">