From 5ddec261c3b0a65609f5295e2fba3522501dc50c Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Mon, 7 Jun 2010 20:47:28 +0200
Subject: [PATCH 1/6] [IMP] stock: change label to Picking

bzr revid: nel@tinyerp.com-20100607184728-tjca46a730u41zb5
---
 addons/stock/report/picking.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 1540357c590..97510e31a64 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -170,7 +170,7 @@
     <blockTable colWidths="538.0" style="Table_Title_String">
       <tr>
         <td>
-          <para style="terp_header">Packing List: [[ picking.name ]]</para>
+          <para style="terp_header">Picking List: [[ picking.name ]]</para>
         </td>
       </tr>
     </blockTable>

From a1d16708ec491cc04b174cccd13d5d26dc28cc98 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 8 Jun 2010 12:39:47 +0530
Subject: [PATCH 2/6] [MOD/IMP] Report menu names are changed

bzr revid: vir@tinyerp.com-20100608070947-aeu6wiq5mossvi9r
---
 addons/account/account_report.xml                | 10 +++++-----
 .../wizard/account_central_journal_view.xml      |  2 +-
 .../wizard/account_general_journal_view.xml      |  2 +-
 .../wizard/account_print_journal_view.xml        |  2 +-
 addons/account/wizard/account_vat_view.xml       |  2 +-
 .../account_budget/crossovered_budget_report.xml |  4 ++--
 addons/account_report/account_report.xml         |  2 +-
 addons/account_voucher/voucher_report.xml        |  6 +++---
 addons/hr_expense/hr_expense_report.xml          |  2 +-
 .../wizard/hr_timesheet_print_employee_view.xml  |  2 +-
 addons/lunch/lunch_report.xml                    |  2 +-
 addons/purchase/__openerp__.py                   |  4 ++--
 addons/survey/survey_report.xml                  | 16 ++++++++--------
 addons/survey/wizard/survey_print.xml            |  6 +++---
 addons/survey/wizard/survey_print_answer.xml     |  6 +++---
 addons/survey/wizard/survey_print_statistics.xml |  6 +++---
 16 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 656d9d2f595..6480178d1ae 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -23,7 +23,7 @@
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
 
         <report id="account_move_line_list" model="account.tax.code" name="account.tax.code.entries" rml="account/report/account_tax_code.rml" string="All Entries"/>
-        
+
         <report
             auto="False"
             id="account_vat_declaration"
@@ -32,21 +32,21 @@
             name="account.vat.declaration"
             rml="account/report/tax_report.rml"
             string="Taxes Report"/>
-        
+
         <report id="report_account_voucher_new"
-            string="Print Voucher"
+            string="Voucher"
             model="account.move"
             name="account.move.voucher"
             rml="account/report/voucher_print.rml"
             auto="False"
             header = "False"
             menu="True"/>
-        
+
         <menuitem
             id="menu_tax_report"
             name="Taxes"
             parent="account.menu_finance_generic_reporting" sequence="3"/>
-        
+
 <!--        <wizard
             id="wizard_vat_declaration"
             menu="False"
diff --git a/addons/account/wizard/account_central_journal_view.xml b/addons/account/wizard/account_central_journal_view.xml
index ec3f0eabb5d..dfe704c7051 100644
--- a/addons/account/wizard/account_central_journal_view.xml
+++ b/addons/account/wizard/account_central_journal_view.xml
@@ -31,7 +31,7 @@
         </record>
 
 		<menuitem
-	        name="Print Central Journal"
+	        name="Central Journals"
 	        parent="account.menu_generic_report"
 	        action="action_account_central_journal"
 	        id="menu_account_central_journal"
diff --git a/addons/account/wizard/account_general_journal_view.xml b/addons/account/wizard/account_general_journal_view.xml
index 425efbaf847..fc39300d390 100644
--- a/addons/account/wizard/account_general_journal_view.xml
+++ b/addons/account/wizard/account_general_journal_view.xml
@@ -31,7 +31,7 @@
         </record>
 
 		<menuitem
-	        name="Print General Journal"
+	        name="General Journals"
 	        parent="account.menu_generic_report"
 	        action="action_account_general_journal"
 	        id="menu_account_general_journal"
diff --git a/addons/account/wizard/account_print_journal_view.xml b/addons/account/wizard/account_print_journal_view.xml
index 078db421b19..69a5b5dee39 100644
--- a/addons/account/wizard/account_print_journal_view.xml
+++ b/addons/account/wizard/account_print_journal_view.xml
@@ -33,7 +33,7 @@
         </record>
 
 		<menuitem
-	        name="Print Journal"
+	        name="Journals"
 	        parent="account.menu_generic_report"
 	        action="action_account_print_journal"
 	        id="menu_account_print_journal"
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 528922d8763..fa53ac97a17 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -31,7 +31,7 @@
         </record>
 
 		<menuitem
-	        name="Print Taxes Report"
+	        name="Taxes Report"
 	        parent="menu_tax_report"
 	        action="action_account_vat_declaration"
 	        id="menu_account_vat_declaration"
diff --git a/addons/account_budget/crossovered_budget_report.xml b/addons/account_budget/crossovered_budget_report.xml
index 0e3fcad2fc7..7a968cc9557 100644
--- a/addons/account_budget/crossovered_budget_report.xml
+++ b/addons/account_budget/crossovered_budget_report.xml
@@ -4,7 +4,7 @@
 
 	<!-- Reports on crossovered.budget -->
 		<report id="report_crossovered_budget"
-				string="Print Budgets"
+				string="Budgets"
 				model="crossovered.budget"
 				name="crossovered.budget.report"
 				rml="account_budget/report/crossovered_budget_report.rml"
@@ -48,7 +48,7 @@
 			model="account.budget.post"
 			name="account.budget"
 			rml="account_budget/report/budget_report.rml"
-			string="Print Budget"/>
+			string="Budget"/>
 
 	</data>
 </openerp>
diff --git a/addons/account_report/account_report.xml b/addons/account_report/account_report.xml
index 4576e421c2e..48273cdd3b3 100644
--- a/addons/account_report/account_report.xml
+++ b/addons/account_report/account_report.xml
@@ -11,6 +11,6 @@
             menu="False"
             model="account.report.report"
             name="print.indicator.pdf"
-            string="Print Indicators in PDF"/>
+            string="Indicators in PDF"/>
     </data>
 </openerp>
diff --git a/addons/account_voucher/voucher_report.xml b/addons/account_voucher/voucher_report.xml
index 56353628bd1..c0dfed1c683 100644
--- a/addons/account_voucher/voucher_report.xml
+++ b/addons/account_voucher/voucher_report.xml
@@ -2,16 +2,16 @@
 <openerp>
     <data>
         <report id="report_account_voucher"
-            string="Print Voucher"
+            string="Vouchers"
             model="account.voucher"
             name="voucher.cash_receipt.drcr"
             rml="account_voucher/report/report_voucher.rml"
             auto="False"
             header = "False"
             menu="True"/>
-            
+
         <report id="report_account_voucher_amt"
-            string="Print Receipt"
+            string="Receipts"
             model="account.voucher"
             name="voucher.cash_amount"
             rml="account_voucher/report/report_voucher_amount.rml"
diff --git a/addons/hr_expense/hr_expense_report.xml b/addons/hr_expense/hr_expense_report.xml
index bad8e790801..9d5f0c3e2c1 100644
--- a/addons/hr_expense/hr_expense_report.xml
+++ b/addons/hr_expense/hr_expense_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report auto="False" id="hr_expenses" model="hr.expense.expense" name="hr.expense" rml="hr_expense/report/expense.rml" string="Print HR expenses"/>
+        <report auto="False" id="hr_expenses" model="hr.expense.expense" name="hr.expense" rml="hr_expense/report/expense.rml" string="HR expenses"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index d6c7398864a..9b37db8b0c6 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -57,7 +57,7 @@
         </record>
 
 		<record id="action_hr_timesheet_my" model="ir.actions.act_window">
-            <field name="name">Print My Timesheet</field>
+            <field name="name">My Timesheet</field>
             <field name="res_model">hr.analytical.timesheet.employee</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/lunch/lunch_report.xml b/addons/lunch/lunch_report.xml
index 6503c99a6ea..c5e933847cd 100644
--- a/addons/lunch/lunch_report.xml
+++ b/addons/lunch/lunch_report.xml
@@ -3,7 +3,7 @@
     <data>
         <report
             id="report_lunch_order"
-            string="Print Order"
+            string="Lunch Order"
             model="lunch.order"
             name="lunch.order"
             rml="lunch/report/order.rml"
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 46d7c3296b9..4b0aef691d3 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -34,7 +34,7 @@
     'depends': ['base', 'account', 'stock', 'process', 'mrp_procurement'],
     'init_xml': [],
     'update_xml': [
-                   
+
         'security/purchase_security.xml',
         'security/ir.model.access.csv',
         'purchase_workflow.xml',
@@ -49,7 +49,7 @@
         'stock_view.xml',
         'partner_view.xml',
         'process/purchase_process.xml',
-        'report/purchase_report_view.xml',
+#        'report/purchase_report_view.xml',
     ],
     'test': [
              'test/purchase_from_order.yml',
diff --git a/addons/survey/survey_report.xml b/addons/survey/survey_report.xml
index c5e76dd133f..3ca05f6ba63 100644
--- a/addons/survey/survey_report.xml
+++ b/addons/survey/survey_report.xml
@@ -6,20 +6,20 @@
 				id="report_survey_form"
 				model="survey"
 				name="survey.form"
-				string="Print Survey"/>
+				string="Surveys"/>
 
-		<report auto="True" 
-				id="survey_analysis" 
+		<report auto="True"
+				id="survey_analysis"
 				model="survey"
 				name="survey.analysis"
-				rml="" 
-				string="Print Survey Statistics"/>
+				rml=""
+				string="Surveys Statistics"/>
 
-		<report auto="True" 
-				id="survey_browse_response" 
+		<report auto="True"
+				id="survey_browse_response"
 				model="survey"
 				name="survey.browse.response"
 				rml=""
-				string="Print Answers"/>
+				string="Surveys Answers"/>
 	</data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index 9470a8bfc3b..8f8793e6b1e 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!-- Survey Print Form View -->
-				 
+
 		<record id="view_survey_print" model="ir.ui.view">
 			<field name="name">Survey Print</field>
 			<field name="model">survey.print</field>
@@ -35,7 +35,7 @@
 			<field name="target">new</field>
 		</record>
 
-        <menuitem name="Print Survey" id="menu_print_survey_form" sequence="1"
+        <menuitem name="Surveys" id="menu_print_survey_form" sequence="1"
             action="action_view_survey_print" parent="menu_reporting"
             groups="group_survey_manager" icon="STOCK_PRINT"/>
 
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index fc754fa2e6c..1e34fc1029f 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!-- Survey Print answer Form View -->
-				 
+
 		<record id="view_survey_print_answer" model="ir.ui.view">
 			<field name="name">Survey Print Answer</field>
 			<field name="model">survey.print.answer</field>
@@ -36,7 +36,7 @@
 			<field name="target">new</field>
 		</record>
 
-		<menuitem name="Print Answer" action="action_view_survey_print_answer" id="menu_print_survey_answer"
+		<menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
 			parent="menu_reporting" icon="STOCK_PRINT" groups="group_survey_manager"/>
 
 	</data>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index 8838a18098c..5659b82e896 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!-- Survey Print Statistics Form View -->
-				 
+
 		<record id="view_survey_print_statistics" model="ir.ui.view">
 			<field name="name">Survey Print Statistics</field>
 			<field name="model">survey.print.statistics</field>
@@ -30,7 +30,7 @@
 			<field name="target">new</field>
 		</record>
 
-		<menuitem name="Print Survey Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
+		<menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
 			parent="menu_reporting" icon="STOCK_PRINT" groups="group_survey_manager"/>
 
 	</data>

From 68066d3cfd8afb53c277ddc5799d9b9684751343 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 8 Jun 2010 09:12:11 +0200
Subject: [PATCH 3/6] [IMP] purchase: Add new menu Outcoming shipment

bzr revid: nel@tinyerp.com-20100608071211-6zoxwf19wfy0gaxi
---
 addons/purchase/purchase_view.xml             |   1 +
 .../purchase/report/purchase_report_view.xml  | 203 ++++++++++++++++++
 addons/stock/stock.py                         |   2 +-
 addons/stock/stock_view.xml                   |  27 +++
 4 files changed, 232 insertions(+), 1 deletion(-)
 create mode 100644 addons/purchase/report/purchase_report_view.xml

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 10c5ccd9749..17fd47b7012 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -23,6 +23,7 @@
               name="Incoming Shipments" sequence="9"/>
         <menuitem action="stock.action_reception_picking_move" id="menu_action_reception_picking_move"
               name="Incoming Products" parent="menu_procurement_management_inventory" sequence="10"/>
+      <menuitem action="stock.action_picking_tree_out" id="menu_action_picking_treeout" parent="menu_procurement_management_inventory" sequence="11"/>
 
      <!--Invoice control-->
       <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
new file mode 100644
index 00000000000..468f3892a13
--- /dev/null
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_purchase_order_graph">
+            <field name="name">product.month.graph</field>
+            <field name="model">purchase.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Purchase Orders Statistics" type="bar">
+                    <field name="product_id"/>
+                    <field name="quantity" operator="+"/>
+                    <field name="price_total" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="view_purchase_order_tree" model="ir.ui.view">
+            <field name="name">purchase.order.tree</field>
+            <field name="model">purchase.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Purchase Orders Statistics">
+                	<field name="date" invisible="1"/>
+                	<field name="date_approve" invisible="1"/>
+                	<field name="expected_date" invisible="1"/>
+                	<field name="user_id" invisible="1"/>
+                	<field name="partner_id" invisible="1"/>
+                    <field name="product_id" invisible="1"/>
+                    <field name="quantity" invisible="1"/>
+                	<field name="day" invisible="1"/>
+                    <field name="name" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="warehouse_id" invisible="1"/>
+                    <field name="validator" invisible="1"/>
+                    <field name="company_id" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="location_id" invisible="1"/>
+                    <field name="shipped_qty" sum="# of received"/>
+                    <field name="invoiced_qty" sum="# of invoiced"/>
+                    <field name="nbr" sum="# of Lines"/>
+                    <field name="price_average" avg="Average Price"/>
+                	<field name="price_total" sum="Total Price"/>
+                    <field name="delay" sum="# Days to close"/>
+                	<field name="delay_pass" sum="Total Price"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_purchase_order_search" model="ir.ui.view">
+        <field name="name">report.purchase.order.search</field>
+        <field name="model">purchase.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Purchase Orders">
+            <group colspan="10" col="12">
+            	<filter icon="terp-purchase" string="This Year"
+	                    	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+	                    	    help="Tasks performed in this year"/>
+                <filter icon="terp-purchase" string="This Month"
+                		name="month"
+                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                		help="Tasks performed in this month"/>
+                <filter icon="gtk-media-rewind"
+                        string="    7 Days    "
+                        separator="1"
+                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                        help="Tasks during last 7 days"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-purchase"
+                    	string="Quotations"
+                    	domain="[('state','=','draft')]"/>
+                <filter icon="terp-purchase"
+                		string="Waiting Schedule"
+                		domain="[('state','=','waiting_date')]"/>
+                <filter icon="terp-purchase"
+                		string="Manual in progress"
+                		domain="[('state','=','manual')]"/>
+                <filter icon="terp-purchase" string="Done" domain="[('state','=','done')]"/>
+
+                <separator orientation="vertical"/>
+                <field name="partner_id" string="Supplier"/>
+                <field name="product_id"/>
+                <field name="user_id" widget="selection">
+                    <filter icon="terp-purchase"
+                    		string="Purchase Non User"
+                    		help="Purchase Non User"
+                    		domain="[('user_id','=',False)]"/>
+                </field>
+				</group>
+				<newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
+                    <filter string="Supplier" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
+                    <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
+                    <filter string="Destination" icon="terp-purchase" context="{'group_by':'location_id'}"/>
+                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-purchase" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-purchase" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-purchase" context="{'group_by':'name'}"/>
+                </group>
+				<newline/>
+                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
+                    <field name="date"/>
+                    <field name="date_approve"/>
+                    <field name="expected_date"/>
+                    <newline/>
+                    <field name="invoice_method"/>
+                    <field name="warehouse_id" widget="selection"/>
+                    <field name="validator" widget="selection"/>
+                    <separator orientation="vertical"/>
+                    <field name="location_id"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_purchase_order_report_all" model="ir.actions.act_window">
+        <field name="name">Purchase Orders</field>
+        <field name="res_model">purchase.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="search_view_id" ref="view_purchase_order_search"/>
+        <field name="context">{'search_default_month':1,'search_default_Responsible':1,'group_by_no_leaf':1,'group_by':[]}</field>
+    </record>
+
+    <menuitem id="base.next_id_73" name="Reporting" parent="base.menu_purchase_root" sequence="8"/>
+    <menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.next_id_73" sequence="3"/>
+
+	<record model="ir.ui.view" id="view_purchase_order_qty_amount_graph">
+            <field name="name">purchase.order.qty.amount.graph</field>
+            <field name="model">purchase.order.qty.amount</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Total Qty and Amount by month" type="bar">
+                    <field name="month"/>
+                    <field name="total_qty" operator="+"/>
+                    <field name="total_amount" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_purchase_order_qty_amount_tree">
+            <field name="name">purchase.order.qty.amount.tree</field>
+            <field name="model">purchase.order.qty.amount</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Total Qty and Amount by month" >
+                    <field name="month"/>
+                    <field name="total_qty" />
+                    <field name="total_amount"/>
+                </tree>
+            </field>
+        </record>
+
+	    <record id="action_purchase_order_qty_amount_all" model="ir.actions.act_window">
+	        <field name="name">Total Qty and Amount by month</field>
+	        <field name="res_model">purchase.order.qty.amount</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">graph,tree</field>
+	    </record>
+
+	    <record model="ir.ui.view" id="view_purchase_order_by_user_graph">
+            <field name="name">purchase.order.by.user.graph</field>
+            <field name="model">purchase.order.by.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Total Orders by User per month" type="bar">
+                    <field name="name" />
+                    <field name="month" group="True" />
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_purchase_order_by_user_tree">
+            <field name="name">purchase.order.by.user.tree</field>
+            <field name="model">purchase.order.by.user</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Total Orders by User per month" >
+                	<field name="name"/>
+                    <field name="month"/>
+                    <field name="nbr" />
+                </tree>
+            </field>
+        </record>
+
+	    <record id="action_purchase_order_by_user_all" model="ir.actions.act_window">
+	        <field name="name">Total Orders by User per month</field>
+	        <field name="res_model">purchase.order.by.user</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">graph,tree</field>
+	    </record>
+    </data>
+</openerp>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 6c3d09f2895..87d8acf05f3 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -814,7 +814,7 @@ class stock_picking(osv.osv):
                 invoices_group[partner.id] = invoice_id
             res[picking.id] = invoice_id
             for move_line in picking.move_lines:
-                origin = move_line.picking_id.name
+                origin = move_line.picking_id.name or ''
                 if move_line.picking_id.origin:
                     origin += ':' + move_line.picking_id.origin
                 if group:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d821ab39d51..553d398984b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1734,5 +1734,32 @@
             <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
         </record>
 
+        <record id="action_picking_tree_out" model="ir.actions.act_window">
+            <field name="name">Outcoming Shipments</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
+            <field name="domain">[('type','=','out')]</field>
+            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
+            <field name="search_view_id" ref="view_picking_in_search"/>
+        </record>
+        <record id="action_invoice_tree5_out" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_picking_in_tree"/>
+            <field name="act_window_id" ref="action_picking_tree_out"/>
+        </record>
+        <record id="action_invoice_tree5_view2_out" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_picking_in_form"/>
+            <field name="act_window_id" ref="action_picking_tree_out"/>
+        </record>
+        <record id="action_invoice_tree5_viewout_cal" model="ir.actions.act_window.view">
+            <field eval="3" name="sequence"/>
+            <field name="view_mode">calendar</field>
+            <field name="act_window_id" ref="action_picking_tree_out"/>
+        </record>
     </data>
 </openerp>

From 31d03734fa5984f473313ce4bef04959620174a3 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 8 Jun 2010 12:48:20 +0530
Subject: [PATCH 4/6] [MOD] Small changes

bzr revid: vir@tinyerp.com-20100608071820-1lb29h0qb845hrp5
---
 addons/purchase/__openerp__.py | 2 +-
 addons/stock/stock_report.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 4b0aef691d3..e172e5e73f1 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -49,7 +49,7 @@
         'stock_view.xml',
         'partner_view.xml',
         'process/purchase_process.xml',
-#        'report/purchase_report_view.xml',
+        'report/purchase_report_view.xml',
     ],
     'test': [
              'test/purchase_from_order.yml',
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 60de8d1f74f..3084e8527a7 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -3,7 +3,7 @@
     <data>
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/>
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
-        <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Print Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
+        <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
         <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>
         <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content (With children)" rml="stock/report/lot_overview_all.rml"/>

From 7fdff8a84312058b9025bb02e992e836752fa4c0 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 8 Jun 2010 09:42:55 +0200
Subject: [PATCH 5/6] uncomment purchase report

bzr revid: nel@tinyerp.com-20100608074255-yzbn031tr39l22jm
---
 addons/purchase/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 4b0aef691d3..e172e5e73f1 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -49,7 +49,7 @@
         'stock_view.xml',
         'partner_view.xml',
         'process/purchase_process.xml',
-#        'report/purchase_report_view.xml',
+        'report/purchase_report_view.xml',
     ],
     'test': [
              'test/purchase_from_order.yml',

From 6cb4f3175b3ac92d2a8f7b93febfea2fdc8a3f59 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 8 Jun 2010 15:27:42 +0530
Subject: [PATCH 6/6] [MOD] account :small change in icon , partner :
 modification in partner address view

bzr revid: vir@tinyerp.com-20100608095742-vskc85gi8mmglli4
---
 addons/account/account_view.xml           | 10 +++++-----
 addons/base_contact/base_contact_view.xml |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ca777ea61ae..b18e3e2f609 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -988,11 +988,11 @@
                         <field name="partner_id" select='1'/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="12" col="10">
-                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
-                        <filter string="Type" icon="terp-account" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
-                        <filter string="States" icon="terp-account" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="12" col="10">
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
+                        <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 8852ea19980..b4e7fa3e2ed 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -134,7 +134,8 @@
             <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1" position="replace">
                 <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1">
                     <form string="Address">
-                       <group string="Postal Address" colspan="2" col="2">
+                       <group  colspan="2" col="2">
+                           <separator string="Postal Address" colspan="2" col="2"/>
                            <field name="type" />
                            <field name="street"/>
                            <field name="street2"/>
@@ -143,7 +144,8 @@
                            <field name="country_id" completion="1"/>
                            <field name="state_id"/>
                         </group>
-                        <group string="Communication" colspan="2" col="2">
+                        <group colspan="2" col="2">
+                           <separator string="Communication" colspan="2" col="2"/>
                            <field name="phone"/>
                            <field name="fax"/>
                            <field name="email" widget="email"/>