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

[MERGE] merge branch from lp:~openerp-commiter/openobject-addons/ergonomy-search-views

Browse Source 
bzr revid: hmo@tinyerp.com-20091214091032-2ieqhz9c3rcgb9fo
This commit is contained in:
Harry (Open ERP)
2009-12-14 14:40:32 +05:30
parent a641c5cb63 4f4657086e
commit e1e4a430bb
12 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/board_account/board_account_view.xml
+1 -1
View File
@@ -45,7 +45,7 @@
<action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
<action colspan="4" height="160" name="%(account.action_invoice_tree1)d" string="Customer invoices"/>
<action colspan="4" height="160" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
</child1>
<child2>
addons/board_association/board_association_view.xml
+6 -4
View File
@@ -17,15 +17,17 @@
name="%(event.action_event_registration)d"
colspan="4"/>
<action
string="Tasks"
string="My Tasks"
name="%(project.action_view_task)d"
colspan="4"
height="200"
width="510"/>
width="510"
domain="[('user_id', '=', uid),('state','in',('open','draft'))]"/>
<action
string="Invoices"
string="Unpaid Invoices"
name="%(account.action_invoice_tree)d"
colspan="4"/>
colspan="4"
domain="[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]"/>
</child1>
<child2>
addons/board_auction/board_auction_view.xml
+5 -3
View File
@@ -18,8 +18,9 @@
name="%(auction.action_report_latest_objects_tree)d"
height="200"
width="510"/>
<action string="Latest Deposits"
<action string="My Latest Deposits"
name="%(auction.action_report_latest_doposit_manager_tree)d"
domain="[('create_uid','=',uid)]"
/>
<action string="Objects statistics"
name="%(auction.action_report_object_encoded_member_tree)d"
@@ -35,9 +36,10 @@
colspan="4"/>
<action
string="Objects By Day"
string="My Objects By Day"
name="%(auction.action_report_auction_object_date_tree)d"
view_mode="graph,tree" colspan="4"/>
view_mode="graph,tree" colspan="4"
domain="[('user_id','=',uid),('month','=',time.strftime('%%Y-%%m-01'))]"/>
<action
string="Estimations/Adjudication"
name="%(auction.action_report_auction_estimation_adj_category_member_tree)d"
addons/board_document/board_document_view.xml
+2 -1
View File
@@ -16,7 +16,8 @@
<action
string="New Files"
name="%(report_document.action_view_all_document_tree1)d"
view_mode="tree"/>
view_mode="tree"
domain="[('name','=',time.strftime('%%Y-%%m-01'))]"/>
<action
string="File Size by Month"
addons/board_manufacturing/board_manufacturing_view.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<hpaned position="100">
<child1>
<action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/>
<action colspan="4" name="%(stock.action_picking_all)d" string="Deliveries"/>
<action colspan="4" name="%(stock.action_picking_all)d" string="Deliveries (Out picking)" domain="[('state','=','assigned'),('type','=','out')]"/>
<action colspan="4" name="%(mrp.mrp_procurement_action4)d" string=" Requisition in Exception"/>
</child1>
addons/board_project/board_project_manager_view.xml
+1 -1
View File
@@ -64,7 +64,7 @@
<button colspan="4" icon="terp-partner" name="%(open_board_project)d" string="My tasks board" type="action"/>
<action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_form)d" string="Project's planning"/>
<action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_form)d" string="My Project's planning" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]"/>
<action colspan="4" name="%(action_project_pipeline_user)d" string="My user's pipeline"/>
addons/board_project/board_project_view.xml
+1 -1
View File
@@ -60,7 +60,7 @@
<action colspan="4" height="150" name="%(action_view_board_note_tree)d" string="Public Notes"/>
</child1>
<child2>
<action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_form)d" string="Planning"/>
<action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_form)d" string="My Planning" domain="[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]"/>
<action colspan="4" name="%(report_timesheet.action_timesheet_user_stat_all)d" string="Timesheets"/>
</child2>
</hpaned>
addons/board_sale/board_sale_view.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<form string="Sales manager board">
<hpaned position="100">
<child1>
<action colspan="4" height="200" name="%(sale.action_order_tree5)d" string="All quotations" width="510"/>
<action colspan="4" height="200" name="%(sale.action_order_tree5)d" string="My quotations" width="510" domain="[('state','=','draft'),('user_id','=',uid)]"/>
<action colspan="4" name="%(report_sale.action_order_sale_list)d" string="Top ten sales of the month"/>
<action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases statistics"/>
</child1>
addons/crm/crm_report_view.xml
-4
View File
@@ -66,7 +66,6 @@
<search string="Cases by Section and Type">
<group col="10" colspan="4">
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by Section and Type for this year"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by Section and Type for this month"/>
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
@@ -146,7 +145,6 @@
<search string="Cases by Section and Stage">
<group col="8" colspan="4">
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by Section and Stage for this year"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by Section and Stage for this month"/>
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
@@ -214,7 +212,6 @@
<search string="Cases by Section, Category and Stage">
<group col='8' colspan='4'>
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by Section, Category and Stage for this year"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by Section, Category and Stage for this month"/>
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
@@ -296,7 +293,6 @@
<search string="Search Cases by User">
<group col='12' colspan='4'>
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by User for this year"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by User for this month"/>
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
addons/report_crm/report_crm_view.xml
-3
View File
@@ -63,7 +63,6 @@
<search string="Search Cases by User">
<group col="12" colspan="4">
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
@@ -145,7 +144,6 @@
<search string="Search Cases by categories and Sections">
<group col="12" colspan="4">
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
@@ -217,7 +215,6 @@
<search string="Search Cases by Section">
<group col="4" colspan="4">
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
addons/stock/stock_view.xml
+2 -2
View File
@@ -1263,8 +1263,8 @@
<filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
<filter icon="terp-stock" string="Planned Today" domain="[('date_planned','=',time.strftime('%%m-%%d-%%Y %%H:%%M:%%S')))]" help="Orders planned for today"/>
<separator orientation="vertical"/>
<field name="origin" string="Purchase Order"/>
<field name="partner_id" string="Supplier"/>
<field name="origin" string="Purchase Order" select="1"/>
<field name="partner_id" string="Supplier" select="1"/>
<field name="product_id"/>
</group>
</search>
addons/stock/wizard/wizard_partial_move.py
+2 -3
View File
@@ -176,9 +176,8 @@ def _do_split(self, cr, uid, data, context):
('done', move.picking_id.id))
res = cr.fetchall()
if len(res) == len(move.picking_id.move_lines):
pick_obj.action_done(cr, uid, [move.picking_id.id])
#wf_service.trg_validate(uid, 'stock.picking', move.picking_id.id, 'button_done', cr)
#wf_service.trg_write(uid, 'stock.picking', move.picking_id.id, cr)
pick_obj.action_move(cr, uid, [move.picking_id.id])
wf_service.trg_validate(uid, 'stock.picking', move.picking_id.id, 'button_done', cr)
return {}