From 39adfe070f8f41cc7cf2aa8fbd4f8d7221b9986a Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 13:15:00 +0200
Subject: [PATCH 01/15] [FIX] sale orders dates

bzr revid: nel@tinyerp.com-20100616111500-hm9u1np13tt8nlnn
---
 addons/sale_order_dates/sale.py | 3 ++-
 addons/stock/stock_view.xml     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/sale_order_dates/sale.py b/addons/sale_order_dates/sale.py
index 1b4bad360e6..877199b32ad 100644
--- a/addons/sale_order_dates/sale.py
+++ b/addons/sale_order_dates/sale.py
@@ -48,7 +48,8 @@ class sale_order_dates(osv.osv):
                 dt=DateTime.strptime(order.date_order, '%Y-%m-%d') + DateTime.RelativeDateTime(days=line.delay or 0.0)
                 dt_s = dt.strftime('%Y-%m-%d')
                 dates_list.append(dt_s)
-            res[order.id] = min(dates_list)
+            if dates_list:
+                res[order.id] = min(dates_list)
             return res
 
     _columns = {
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ab33b07aacb..3fdfda9e057 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -322,6 +322,7 @@
                     <field name="date_planned" string="Date"/>
                     <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
+                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
                 </tree>
             </field>
         </record>

From 5c854d68caf08e1baecced7ec858c998e8b82d9e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 16 Jun 2010 13:38:52 +0200
Subject: [PATCH 02/15] merge

bzr revid: fp@tinyerp.com-20100616113852-cj3dwha1w74l5q3w
---
 addons/idea/test/test_idea.yml         |  4 ++--
 addons/purchase/purchase_view.xml      |  3 +--
 addons/sale_order_dates/__openerp__.py |  8 +++++---
 addons/sale_order_dates/sale_view.xml  | 12 +++++-------
 addons/stock/stock.py                  |  5 +----
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml
index 4c3f5301a5a..bcb764f8933 100644
--- a/addons/idea/test/test_idea.yml
+++ b/addons/idea/test/test_idea.yml
@@ -19,13 +19,13 @@
     user_id: base.user_root
     
 - |
-  I check that idea on draft state.
+  I check that the idea is in draft state.
 -
   !assert {model: idea.idea, id: idea_idea_0}:
     - state == 'draft'  
     
 - |
-  I open this idea by click on "Open" button.
+  I open this idea by clicking on the "Open" button.
 - 
   !workflow {model: idea.idea, action: idea_open, ref: idea_idea_0}
   
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 3a7277a4766..e6cf510b018 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -91,8 +91,7 @@
                                     <field name="product_qty"/>
                                     <field name="product_uom"/>
                                     <field name="price_unit"/>
-                                     <field name="price_subtotal" groups="base.group_extended"/>
-                                    <field name="invoiced"/>
+                                    <field name="price_subtotal" groups="base.group_extended"/>
                                 </tree>
                                 <!-- default form view -->
                             </field>
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index e8a2cf6e6b6..0f7a56fba20 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -21,11 +21,13 @@
 
 
 {
-    'name': 'Customer & Sales',
+    'name': 'Sale Order Dates',
     'version': '1.0',
     'category': 'Generic Modules/CRM & SRM',
-    'description': """Sale Orders Dates""",
-    'author': 'Tiny',
+    'description': """
+Add commitment, requested and effective dates on the sale order.
+""",
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ["sale"],
     'init_xml': [
diff --git a/addons/sale_order_dates/sale_view.xml b/addons/sale_order_dates/sale_view.xml
index 7f5edf811ef..54248fa0176 100644
--- a/addons/sale_order_dates/sale_view.xml
+++ b/addons/sale_order_dates/sale_view.xml
@@ -2,22 +2,20 @@
 <openerp>
     <data>
 
-   <record id="view_sale_orderfor" model="ir.ui.view">
+        <record id="view_sale_orderfor" model="ir.ui.view">
             <field name="name">sale.order.form.inherit5</field>
             <field name="model">sale.order</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-              <field name="date_confirm" position="after">
-                    <separator string="Dates" colspan="4"/>
+                <field name="date_confirm" position="after">
                     <field name="commitment_date"/>
-                    <newline/>
                     <field name="effective_date"/>
                     <field name="requested_date"/>
-              </field>
+                </field>
             </field>
-                </record>
+        </record>
 
 
-     </data>
+    </data>
 </openerp>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a7241c2bbe6..924bf69c520 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2251,7 +2251,7 @@ class stock_inventory(osv.osv):
                         'prodlot_id': lot_id,
                         'date': inv.date,
                         'date_planned': inv.date,
-                        'state': 'assigned'
+                        'state': 'done'
                     }
                     if change > 0:
                         value.update( {
@@ -2271,9 +2271,6 @@ class stock_inventory(osv.osv):
                             'product_qty': line.product_qty
                         })
                     move_ids.append(self._inventory_line_hook(cr, uid, line, value))
-            if len(move_ids):
-                self.pool.get('stock.move').action_done(cr, uid, move_ids,
-                        context=context)
             self.write(cr, uid, [inv.id], {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S'), 'move_ids': [(6, 0, move_ids)]})
         return True
 

From e28676b821b440bdaa9771adccf36b902dfe0b00 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 16 Jun 2010 17:11:41 +0530
Subject: [PATCH 03/15] [MOD,IMP] point_of_sale : improvements in pos order
 report, account,hr,mrp,project,stock: changes in icons

bzr revid: vir@tinyerp.com-20100616114141-l6nbfgc6wsof1hzh
---
 addons/account/account_invoice_view.xml       | 20 +++++------
 addons/account/account_view.xml               | 20 +++++------
 .../project_account_analytic_line_view.xml    |  2 +-
 .../account_analytic_entries_report_view.xml  |  2 +-
 .../report/account_analytic_report_view.xml   |  2 +-
 .../report/account_entries_report_view.xml    |  2 +-
 .../report/account_invoice_report_view.xml    |  2 +-
 .../account_automatic_reconcile_view.xml      |  4 +--
 .../wizard/account_central_journal_view.xml   |  2 +-
 .../wizard/account_change_currency_view.xml   |  2 +-
 addons/account/wizard/account_chart_view.xml  |  2 +-
 .../wizard/account_invoice_state_view.xml     |  6 ++--
 .../wizard/account_journal_select_view.xml    |  4 +--
 .../account_move_bank_reconcile_view.xml      |  4 +--
 .../wizard/account_move_journal_view.xml      |  4 +--
 ...ccount_move_line_reconcile_select_view.xml |  4 +--
 .../wizard/account_move_line_select_view.xml  |  4 +--
 ...ount_move_line_unreconcile_select_view.xml |  4 +--
 .../account_open_closed_fiscalyear_view.xml   |  4 +--
 .../account_partner_balance_report_view.xml   |  2 +-
 .../wizard/account_period_close_view.xml      |  2 +-
 .../account/wizard/account_reconcile_view.xml |  4 +--
 .../account_statement_from_invoice_view.xml   |  2 +-
 .../account/wizard/account_use_model_view.xml |  4 +--
 .../wizard/account_validate_move_view.xml     |  2 +-
 addons/crm/report/crm_lead_report_view.xml    |  2 +-
 .../crm/report/crm_phonecall_report_view.xml  |  2 +-
 .../report/crm_claim_report_view.xml          |  2 +-
 .../report/crm_fundraising_report_view.xml    |  2 +-
 addons/hr_attendance/hr_attendance_view.xml   |  2 +-
 .../report/hr_evaluation_report_view.xml      |  2 +-
 .../report/hr_expense_report_view.xml         |  2 +-
 .../report/available_holidays_view.xml        |  2 +-
 .../report/hr_holidays_report_view.xml        |  2 +-
 .../report/hr_recruitment_report_view.xml     |  2 +-
 .../hr_timesheet_invoice_report_view.xml      |  2 +-
 .../hr_timesheet_sheet_view.xml               | 20 +++++------
 .../report/timesheet_report_view.xml          |  2 +-
 .../mrp/report/mrp_production_order_view.xml  |  2 +-
 .../report/report_pos_order_view.xml          | 13 ++++---
 addons/project/report/project_report_view.xml |  2 +-
 .../report/project_issue_report_view.xml      |  4 +--
 .../purchase/report/purchase_report_view.xml  | 34 +++++++++----------
 addons/sale/report/sale_report_view.xml       |  4 +--
 .../stock/report/report_stock_move_view.xml   |  2 +-
 .../report/report_stock_picking_view.xml      |  2 +-
 46 files changed, 111 insertions(+), 106 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1f86fb07b90..2421c4c044d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -193,7 +193,7 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="gtk-apply"/>
+                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific"/>
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
                                 <field name="amount_tax"/>
@@ -202,12 +202,12 @@
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="3" colspan="4">
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-apply"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="terp-camera_test"/>
                                     <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="terp-gtk-stop"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="stock_effects-object-colorize"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="gtk-execute"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="terp-dolar"/>
                                 </group>
                             </group>
                         </page>
@@ -256,7 +256,7 @@
                     <field name="number"/>
                     <field name="type" invisible="1"/>
                     <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-                    <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change Currency"/>
+                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change Currency"/>
                     <newline/>
                     <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user"/>
                     <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@@ -286,7 +286,7 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="gtk-apply"/>
+                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific"/>
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
                                 <field name="amount_tax"/>
@@ -295,11 +295,11 @@
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="4" colspan="4" groups="base.group_user">
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="gtk-print"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Create" icon="gtk-execute"/>
+                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-check"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-document-new"/>
                                     <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="gtk-execute"/>
                                 </group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1b9e166ac81..ab28fa3925c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -407,9 +407,9 @@
                     <group col="7" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
-                        <button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/>
-                        <button name="button_confirm" states="draft" string="Confirm" type="object"  icon="gtk-apply"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="terp-gtk-stop"/>
                     </group>
                 </form>
             </field>
@@ -465,7 +465,7 @@
                         <field name="total_entry"/>
                         <field name="total_new"/>
                         <field name="total_balance"/>
-                        <button colspan="2" name="dummy" string="Compute" icon="gtk-execute"/>
+                        <button colspan="2" name="dummy" string="Compute" icon="terp-stock_format-scientific"/>
                     </group>
                 </form>
             </field>
@@ -956,8 +956,8 @@
                             <field name="narration" colspan="4" nolabel="1"/>
                             <field name="state" select="1"/>
                             <group col="2" colspan="2">
-                                <button name="button_validate" states="draft" string="Validate" type="object" icon="gtk-execute"/>
-                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
+                                <button name="button_validate" states="draft" string="Validate" type="object" icon="terp-camera_test"/>
+                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="terp-gtk-stop"/>
                             </group>
                         </page>
                         <page string="Other Information">
@@ -1094,9 +1094,9 @@
                     <group col="7" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
-                        <button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/>
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="terp-gtk-stop"/>
                     </group>
                 </form>
             </field>
@@ -1372,7 +1372,7 @@
                     <field name="period_type"/>
                     <field name="model_id"/>
                     <group col="2" colspan="2">
-                        <button name="compute" states="draft,running" string="Compute" type="object" icon="gtk-execute"/>
+                        <button name="compute" states="draft,running" string="Compute" type="object" icon="terp-stock_format-scientific"/>
                         <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
                     </group>
                     <separator colspan="4" string="Subscription Lines"/>
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
index 96d9186cfa8..d564ffb5c81 100644
--- a/addons/account/project/wizard/project_account_analytic_line_view.xml
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -17,7 +17,7 @@
                        	 <separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	 <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	 <button icon="gtk-execute" string="Open Entries" name="action_open_window" type="object"/>
+                    	 <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
                    	</group>
                 </form>
             </field>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 1564859540a..3b9e3ec193e 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -66,7 +66,7 @@
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index 290e6950569..070b3a8c10a 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -82,7 +82,7 @@
                     <filter string="Account Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 0c3a77db2a7..5645c34d20c 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -93,7 +93,7 @@
                     <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
                     <filter string="Period of Move Line" icon="terp-go-month" context="{'group_by':'period_id2'}"/>
                     <newline/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                  </group>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 542b695e7dd..448f2abaf6d 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -111,7 +111,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <newline/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 9711fc9b941..02fbb5a7376 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -21,7 +21,7 @@
 				    <separator string ="" colspan="4"/>
 				    <group colspan="2" col="4">
      					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="reconcile" string="Reconcile" type="object" icon="gtk-ok"/>
+               			<button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
  					</group>
 				</form>
              </field>
@@ -56,7 +56,7 @@
 	    			<field name="unreconciled"/>
      				<group colspan="4" col="6">
                        	<separator colspan="6"/>
-     					<button special="cancel" string="Ok" icon="gtk-ok" default_focus="1"/>
+     					<button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
  					</group>
 				</form>
              </field>
diff --git a/addons/account/wizard/account_central_journal_view.xml b/addons/account/wizard/account_central_journal_view.xml
index dfe704c7051..b833af4a9dd 100644
--- a/addons/account/wizard/account_central_journal_view.xml
+++ b/addons/account/wizard/account_central_journal_view.xml
@@ -15,7 +15,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
 	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-print"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 5dca78673c5..3eae57dfe61 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -13,7 +13,7 @@
 				    <separator colspan="4"/>
               		<group colspan="2" col="4">
             			<button special="cancel" string="Cancel"  icon="gtk-cancel"/>
-            			<button name="change_currency" string="Change Currency" type="object" icon="gtk-go-forward"/>
+            			<button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize"/>
                 	</group>
 			</form>
             </field>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 66da81d24f6..24a1effb689 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -17,7 +17,7 @@
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-                    	<button icon="gtk-open" string="Open Charts"
+                    	<button icon="terp-gtk-go-back-rtl" string="Open Charts"
                     		name="account_chart_open_window" type="object" />
                     </group>
                 </form>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index e0c22a0007f..8bdfb4ba8e2 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -10,7 +10,7 @@
                 <separator string="Confirm Draft Invoices" colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Close"/>
-                        <button icon="gtk-execute" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
+                        <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
@@ -43,8 +43,8 @@
             <form string="Cancel Selected Invoices">
                 <separator string="Cancel Selected Invoices" colspan="4"/>
                     <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Close"/>
-                        <button icon="gtk-execute" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
+                        <button icon="terp-dialog-close" special="cancel" string="Close"/>
+                        <button icon="terp-gtk-stop" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index 71a0d591768..d2cfc95a77f 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -11,8 +11,8 @@
                 		<label string="Are you sure you want to open Journal Entries!" colspan="4"/>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Open Entries" name="action_open_window" type="object"/>
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 89342803aaf..f17c2396255 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -13,8 +13,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Open for bank reconciliation" name="action_open_window" type="object"/>
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Open for bank reconciliation" name="action_open_window" type="object"/>
                    </group>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 7a25932bb98..c423a79e77c 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -16,8 +16,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Open Journal" name="action_open_window" type="object"/>
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Open Journal" name="action_open_window" type="object"/>
                    	</group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index dbd25408fe1..08a44a33639 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -13,8 +13,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-						<button icon="gtk-open"
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel" />
+						<button icon="terp-gtk-go-back-rtl"
 							string="Open for Reconciliation" name="action_open_window"
 							type="object" />
                    </group>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index d0b6a2f709a..bf3831baea0 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -11,8 +11,8 @@
                 		<label string="Are you sure you want to open Account move line entries!" colspan="4"/>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Open Entries" name="open_window" type="object" default_focus="1"/>
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index 7d10c02f010..86681106845 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -13,8 +13,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-						<button icon="gtk-open"
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel" />
+						<button icon="terp-gtk-go-back-rtl"
 							string="Open For Unreconciliation" name="action_open_window"
 							type="object" />
                    </group>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index c5269939e0c..b8c914cd737 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -13,8 +13,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Open" name="remove_entries" type="object"/>
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_partner_balance_report_view.xml b/addons/account/wizard/account_partner_balance_report_view.xml
index 55fb71553d7..35a2556982d 100644
--- a/addons/account/wizard/account_partner_balance_report_view.xml
+++ b/addons/account/wizard/account_partner_balance_report_view.xml
@@ -31,7 +31,7 @@
      				<newline/>
      				<group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+     					<button special="cancel" string="Cancel" icon="terp-gtk-stop"/>
                			<button name="check_state" string="Print" type="object" icon="gtk-print"/>
  					</group>
  				</form>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 0866e64bdb6..82e7f8b3f3a 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -16,7 +16,7 @@
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-close" string="Close Period" name="data_save" type="object"/>
+                    	<button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 0f92376e045..1bed69d45fe 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -54,7 +54,7 @@
 				    <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>
+                    	<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
@@ -99,7 +99,7 @@
 				    <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
+                    	<button icon="gtk-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml
index 6f17279888c..05b77a1d570 100644
--- a/addons/account/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account/wizard/account_statement_from_invoice_view.xml
@@ -15,7 +15,7 @@
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Go" name="search_invoices" type="object"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index fec632c2e59..ccd8b594296 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -52,7 +52,7 @@
                        	<label string = "Entry Lines Created." colspan="2"/>
                        	<newline/>
                     	<button icon="gtk-ok" special="cancel" string="Ok"/>
-                    	<button icon="gtk-execute" string="Open" name="open_moves" type="object" default_focus='1'/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Open" name="open_moves" type="object" default_focus='1'/>
                    </group>
                </form>
             </field>
@@ -67,7 +67,7 @@
                 	<group colspan="4" col="6">
                        	<label string = "Are you sure you want to create entries?" colspan="2"/>
                        	<newline/>
-                    	<button icon="gtk-ok" special="cancel" string="Cancel"/>
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
                     	<button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
                    </group>
                </form>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 27ca48662bc..d0fd808dd3a 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -17,7 +17,7 @@
 				    <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields." colspan="4"/>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Validate" name="validate_move" type="object"/>
+                    	<button icon="terp-camera_test" string="Validate" name="validate_move" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 0601cd47c71..1eb4a2928a3 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -126,7 +126,7 @@
                         	domain="[]"
                         	context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-month"
+                        <filter string="Day" icon="terp-go-today"
                         	domain="[]" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month"
                         	domain="[]" context="{'group_by':'month'}" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index f1f5eb4a490..58136ea7a43 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -136,7 +136,7 @@
                             domain="[]"
                             context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-month"
+                        <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" />
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 7892039436c..0664295b83d 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -152,7 +152,7 @@
                              context="{'group_by':'type_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-month"
+                        <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"/>
 
                         <filter string="Month" icon="terp-go-month"
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 6e27fc8390d..ecd442d238f 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -142,7 +142,7 @@
                             domain="[]" context="{'group_by':'categ_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-month"
+                        <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"/>
 
                         <filter string="Month" icon="terp-go-month"
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index e3db974ebb5..cc7802f612b 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -57,7 +57,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
-                        <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'day'}"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 5406a7a3fbd..2a5cbe21ad9 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -82,7 +82,7 @@
                     <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}"/>
                     <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index bcc560573ab..b25ba45dd60 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -99,7 +99,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 5fd9a9c0199..327cdab032b 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -88,7 +88,7 @@
 	                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
 	                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+	                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
 	                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
 	                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
 	                </group>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 24ea6745270..7f42982eaad 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -90,7 +90,7 @@
                     <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 4fca4a8b239..93a63ca6e49 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -95,7 +95,7 @@
                    <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                    <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
             	   <separator orientation="vertical"/>
-            	   <filter string="Day" name = "day" icon="terp-go-month" domain="[]" context="{'group_by':'day'}"/>
+            	   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
             	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
             	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index b3f81e5fbb1..882edfeee5a 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -76,7 +76,7 @@
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
                     </group>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 51edeea837b..cbaf4cd802f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -105,12 +105,12 @@
                     <notebook colspan="4">
                         <page string="Daily View">
                             <group col="6" colspan="4">
-                                <button name="button_dummy" string="Go to:" type="object" icon="gtk-redo"/>
+                                <button name="button_dummy" string="Go to:" type="object" icon="terp-gtk-jump-to-ltr"/>
                                 <field name="date_current" nolabel="1"/>
                                 <label string=""/>
-                                <button icon="gtk-media-previous" name="date_previous" string="" type="object"/>
-                                <button name="date_today" string="Today" type="object" icon="gtk-home"/>
-                                <button icon="gtk-media-next" name="date_next" string="" type="object"/>
+                                <button icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/>
+                                <button name="date_today" string="Today" type="object" icon="terp-go-today"/>
+                                <button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
                             </group>
 
                             <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="hr_attendance.group_hr_attendance">
@@ -121,8 +121,8 @@
                                 </tree>
                             </field>
                             <group col="1" colspan="1" groups="hr_attendance.group_hr_attendance">
-                                <button name="sign_in" string="Sign In" type="object" icon="gtk-go-back"/>
-                                <button name="sign_out" string="Sign Out" type="object" icon="gtk-go-forward"/>
+                                <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
+                                <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
                             </group>
 
                             <field name="state_attendance" groups="hr_attendance.group_hr_attendance"/>
@@ -176,10 +176,10 @@
                     </notebook>
                     <field name="state"/>
                     <group col="4" colspan="2">
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-execute"/>
-                        <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
-                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-stop"/>
-                        <button name="done" states="confirm" string="Accept" type="workflow" icon="gtk-apply"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-gtk-jump-to-rtl"/>
+                        <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="terp-gtk-stop"/>
+                        <button name="done" states="confirm" string="Accept" type="workflow" icon="terp-camera_test"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 51e6b5d295c..4a6e486dac3 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -91,7 +91,7 @@
 	                    <separator orientation="vertical"/>
 	                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+	                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
 	                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
 	                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 61aff34bf91..9c4d4924924 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -81,7 +81,7 @@
                     	<separator orientation="vertical"/>
                     	<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                     	<separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     	<filter string="Month" name="terp-go-month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                    </group>
diff --git a/addons/point_of_sale/report/report_pos_order_view.xml b/addons/point_of_sale/report/report_pos_order_view.xml
index ecd3d431a3a..3efe9548c70 100644
--- a/addons/point_of_sale/report/report_pos_order_view.xml
+++ b/addons/point_of_sale/report/report_pos_order_view.xml
@@ -38,7 +38,6 @@
 	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                        help="POS ordered created last 365 days"/>
 	                    <filter icon="terp-go-month" string="   30 Days   "
-	                        name="month"
 	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                        help="POS ordered created in last 30 days"/>
 	                    <filter icon="terp-go-week"
@@ -46,6 +45,12 @@
 	                         separator="1"
 	                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                         help="POS ordered created last 7 days"/>
+	                    <filter icon="terp-go-today"
+                             string="    Today    "
+                             name="today"
+                             separator="1"
+                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
+                             help="POS ordered created by today"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-document-new"
 	                        string="Draft"
@@ -59,7 +64,7 @@
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="user_id" widget="selection">
-                        <filter icon="terp-dolar"
+                        <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
@@ -76,7 +81,7 @@
 	                    <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                         <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
 	                </group>
@@ -90,7 +95,7 @@
 	        <field name="view_type">form</field>
 	        <field name="view_mode">tree,graph</field>
 	        <field name="search_view_id" ref="view_report_pos_order_search"/>
-	        <field name="context">{'search_default_month':1,'search_default_User':1}</field>
+	        <field name="context">{'search_default_today':1,'search_default_User':1}</field>
 	    </record>
 
 	    <menuitem action="action_report_pos_order_all" id="menu_report_pos_order_all" parent="menu_point_rep" sequence="1"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9b685001664..92edbc78d77 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -117,7 +117,7 @@
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                         <filter string="Stage" icon="terp-stage" context="{'group_by':'type'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index b4d0af02185..c422d987db5 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -93,7 +93,7 @@
                         <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
                         <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
                         <separator orientation="vertical" />
-                        <filter name="User" string="Responsible" icon="terp-personal" 
+                        <filter name="User" string="Responsible" icon="terp-personal"
                         domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Assigned to" name="Responsible" icon="terp-personal"
                         domain="[]" context="{'group_by':'assigned_to'}" />
@@ -118,7 +118,7 @@
                         	context="{'group_by':'company_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
+                        <filter string="Day" icon="terp-go-today"
                         	domain="[]" context="{'group_by':'day'}"/>
 
                         <filter string="Month" icon="terp-go-month"
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 2d18ae18b36..6b27a0ec6df 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -52,24 +52,24 @@
         <field name="arch" type="xml">
             <search string="Purchase Orders">
             <group colspan="10" col="12">
-                <filter icon="terp-purchase" string="This Year"
+                <filter icon="terp-go-year" 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"
+                <filter icon="terp-go-month" 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"
+                <filter icon="terp-go-week"
                         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"
+                <filter icon="terp-document-new"
                         string="Quotations"
                         name="quotes"
                         domain="[('state','=','draft')]"/>
-                <filter icon="terp-purchase"
+                <filter icon="terp-accessories-archiver"
                         string="Orders"
                         name="orders"
                         domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
@@ -80,21 +80,21 @@
                 <field name="company_id" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Supplier" name="group_partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" name="group_product_id" icon="terp-purchase" context="{'group_by':'product_id'}"/>
+                <group expand="0" string="Group By..." colspan="10" col="12">
+                    <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
-                    <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
+                    <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <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-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
+                    <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
-                    <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'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 4e6d75694fe..41ebc1de088 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -78,7 +78,7 @@
 	                <field name="partner_id"/>
                     <field name="product_id"/>
 	                <field name="user_id" widget="selection">
-	                    <filter icon="terp-dolar"
+	                    <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
@@ -99,7 +99,7 @@
                     <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                     <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <separator orientation="vertical"/>
-                   <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                   <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index e8ec9ed2983..0f41c0e4b3b 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -98,7 +98,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Company" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index a14298ff771..83405f2c1bf 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -83,7 +83,7 @@
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Invoice Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'invoice_state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'day'}"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
                     </group>

From 2bfffa9e1a005db7353d3bb1c2a679a4c1cc542e Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 16 Jun 2010 17:13:59 +0530
Subject: [PATCH 04/15] [IMP] mrp, purchase, stock, hr, project: Re-organized
 menus.

bzr revid: uco@tinyerp.com-20100616114359-5l1fa5ht1k59wvlr
---
 .../account_analytic_analysis_menu.xml        |  6 ++--
 addons/base_contact/base_contact_view.xml     | 12 +++++++
 addons/hr/hr_view.xml                         | 10 ++++--
 addons/hr_attendance/hr_attendance_view.xml   |  4 +--
 .../wizard/hr_attendance_sign_in_out_view.xml |  2 +-
 addons/hr_contract/hr_contract_view.xml       |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   |  2 +-
 addons/hr_expense/hr_expense_view.xml         |  2 +-
 .../report/hr_expense_report_view.xml         |  2 +-
 addons/hr_holidays/hr_holidays_view.xml       |  4 +--
 addons/hr_recruitment/hr_recruitment_view.xml | 14 ++++----
 .../report/hr_recruitment_report_view.xml     |  2 +-
 .../hr_timesheet_print_employee_view.xml      |  4 +--
 .../wizard/hr_timesheet_print_users_view.xml  |  2 +-
 .../wizard/hr_timesheet_sign_in_out_view.xml  |  2 +-
 .../hr_timesheet_invoice_report.xml           | 10 +++---
 .../hr_timesheet_invoice_report_view.xml      |  2 +-
 .../hr_timesheet_analytic_profit_view.xml     |  2 +-
 .../hr_timesheet_sheet_view.xml               |  4 +--
 .../report/timesheet_report_view.xml          |  3 +-
 addons/mrp/mrp_view.xml                       | 19 +++++-----
 addons/mrp_operations/mrp_operations_view.xml |  2 +-
 addons/project/project_view.xml               |  7 ++--
 addons/project_gtd/project_gtd_view.xml       |  7 ++--
 addons/project_issue/project_issue_menu.xml   |  3 +-
 addons/project_issue/project_issue_view.xml   |  2 +-
 .../project_long_term_view.xml                | 12 +++----
 .../project_planning_view.xml                 |  8 ++---
 addons/purchase/purchase_view.xml             | 35 +++++++++++++++----
 addons/sale_journal/sale_journal_view.xml     |  2 +-
 addons/scrum/scrum_view.xml                   |  8 ++---
 addons/stock/stock_view.xml                   | 25 ++++++-------
 addons/stock_planning/stock_planning_view.xml |  2 +-
 33 files changed, 134 insertions(+), 89 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index b83ce33596d..821f7180e2e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,8 +1,8 @@
 <openerp>
     <data>
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
-        <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>
-        <menuitem id="menu_invoicing" name="Billing" parent="next_id_71" sequence="20"/>
+<!--        <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>-->
+        <menuitem id="menu_invoicing" name="Billing" parent="base.menu_main_pm" sequence="4"/>
 
         <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
             <field name="name">All Uninvoiced Entries</field>
@@ -23,7 +23,7 @@
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
             <field name="domain">[]</field>
         </record>
-        <menuitem name="Analytic Accounts" action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="next_id_71"/>
+<!--        <menuitem name="Analytic Accounts" action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="next_id_71"/>-->
 
         <record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window">
             <field name="name">Overpassed Accounts</field>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 04429a94186..2145123599c 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -122,6 +122,18 @@
         <field name="search_view_id" ref="view_partner_contact_search"/>
     </record>
     <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
+    
+    <!--    
+    Contacts for Suppliers
+    -->
+    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
+             sequence="7"/>
+    <menuitem id="base.menu_procurement_management_supplier" name="Address Book"
+            parent="base.menu_purchase_root" sequence="3"/>
+    <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
+            parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
+    <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" 
+            parent = "base.menu_procurement_management_supplier" sequence="2"/>
 
     <!-- Views for Partners Form View -->
 
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f6a03030a6f..4adb8c3488b 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -9,7 +9,7 @@
         <menuitem
             id="menu_hr_main"
             parent="menu_hr_root"
-            name="Human Resources"
+            name="Human Resources Management"
             sequence="0"/>
         <menuitem
             id="menu_hr_configuration"
@@ -18,8 +18,14 @@
             groups="group_hr_manager"
             sequence="50" />
         <menuitem
-            id="menu_view_employee_category_configuration_form"
+            id="menu_hr_management"
+            name="Human Resources Management"
             parent="hr.menu_hr_configuration"
+            groups="group_hr_manager"
+            sequence="1" />
+        <menuitem
+            id="menu_view_employee_category_configuration_form"
+            parent="hr.menu_hr_management"
             name="Employees"
             sequence="1"/>
 
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index e3db974ebb5..091723d7604 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -77,9 +77,9 @@
         <menuitem
            id="menu_hr_time_tracking"
            name="Time Tracking"
-           parent="hr.menu_hr_root" sequence="7"/>
+           parent="hr.menu_hr_root" sequence="3"/>
         <menuitem action="open_view_attendance" id="menu_open_view_attendance"
-            parent="menu_hr_time_tracking" groups="hr.group_hr_manager"/>
+            parent="menu_hr_time_tracking" groups="hr.group_hr_manager" sequence="3"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index 443983dffe7..a7a39312aff 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -46,7 +46,7 @@
 
         <menuitem action="action_hr_attendance_sigh_in_out"
             id="menu_hr_attendance_sigh_in_out"
-            parent="menu_hr_time_tracking"/>
+            parent="menu_hr_time_tracking" sequence="4"/>
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 0b92bcc986a..e1135a9f058 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -48,7 +48,7 @@
             <field name="domain">[]</field>
         </record>
 
-        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="5"/>
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
 
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
 
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index cbb4c796c90..5784bb4d868 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -64,7 +64,7 @@
         <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
 
        <menuitem
-            name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="3"/>
+            name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
         <menuitem
             parent="menu_eval_hr_config"
             id="menu_open_view_hr_evaluation_plan_tree"
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index cafe42fcffa..9c5ebf49953 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -171,7 +171,7 @@
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
 
-        <menuitem id="next_id_49" name="Expenses" sequence="8"
+        <menuitem id="next_id_49" name="Expenses" sequence="4"
            parent="hr.menu_hr_root"/>
 
         <menuitem action="expense_all" id="menu_expense_all" name="Expenses"
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index bcc560573ab..1322b5a241d 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -134,7 +134,7 @@
     </record>
 
     <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
-    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
+    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1a310a55100..98c8d558f3a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -245,7 +245,7 @@
             name="Holidays Management"
             parent="hr.menu_hr_root"
             id="menu_open_ask_holidays"
-            sequence="9"/>
+            sequence="5"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
             <field name="name">Leave Requests</field>
@@ -362,7 +362,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
         <menuitem name="Leave Status"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ef5fcd3387f..09f8cee6314 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -2,12 +2,6 @@
 <openerp>
     <data>
 
-       <menuitem
-        id="menu_hr_config_applicant"
-        name="Applicant"
-        parent="hr.menu_hr_configuration"
-        />
-
     # ------------------------------------------------------
     # Job Categories
     # ------------------------------------------------------
@@ -323,8 +317,12 @@
         id="menu_hr_recruitment_recruitment"
         name="Recruitment"
         parent="hr.menu_hr_configuration"
-        />
-
+        sequence="2"/>
+    <menuitem
+        id="menu_hr_config_applicant"
+        name="Applicant"
+        parent="menu_hr_recruitment_recruitment"
+        sequence="2"/>
     <menuitem
         id="menu_hr_recruitment_stage"
         name="Stages"
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 4fca4a8b239..fb000d68aa3 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -129,7 +129,7 @@
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
 	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
-    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
+    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
 
 </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 9b37db8b0c6..a3723d2adba 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -34,7 +34,7 @@
         <menuitem action="action_hr_timesheet_employee"
         	id="menu_hr_timesheet_employee"
         	parent="menu_hr_reporting_timesheet"
-        	groups="base.group_extended"/>
+        	groups="base.group_extended" sequence="2" icon="STOCK_PRINT"/>
 
 
       <!-- Print My Timesheet -->
@@ -68,7 +68,7 @@
         <menuitem action="action_hr_timesheet_my"
         	id="menu_hr_timesheet_my"
         	parent="menu_hr_reporting_timesheet"
-        	groups="hr.group_hr_user" />
+        	groups="hr.group_hr_user" sequence="4" icon="STOCK_PRINT"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index de834621c23..2d2af2a4769 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -34,7 +34,7 @@
         <menuitem action="action_hr_timesheet_users"
         	id="menu_hr_timesheet_users"
         	parent="menu_hr_reporting_timesheet"
-        	groups="hr.group_hr_manager" />
+        	groups="hr.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
 
 
      </data>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 6f6ce56b091..099eb0d4642 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -54,7 +54,7 @@
         	id="menu_hr_timesheet_sign_in"
         	groups="base.group_extended"
         	parent="hr_attendance.menu_hr_time_tracking"
-        	/>
+        	sequence="5" />
 
     	<record id="view_hr_timesheet_sign_out" model="ir.ui.view">
             <field name="name">hr.sign.out.project.form</field>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index a801e21082b..b1a6cc0dc51 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -6,11 +6,11 @@
             name="Reporting"
             parent="hr.menu_hr_root"
             sequence="10" />
-        <menuitem
-            id="menu_hr_reporting_timesheet_invoice"
-            name="Timesheet Invoice"
-            parent="hr.menu_hr_reporting"
-            sequence="5" />
+<!--        <menuitem-->
+<!--            id="menu_hr_reporting_timesheet_invoice"-->
+<!--            name="Timesheet Invoice"-->
+<!--            parent="hr.menu_hr_reporting"-->
+<!--            sequence="5" />-->
         <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
 
         <!--<wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger.report" string="Cost Ledger"/>-->
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index b3f81e5fbb1..516d624d050 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -512,6 +512,6 @@
                 id="menu_hr_action_random_timesheet_lines_board"
                 name="Working Hours"
                 parent="hr_attendance.menu_hr_time_tracking"
-                groups="hr.group_hr_manager"/>
+                groups="hr.group_hr_manager" sequence="2"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index b68112a5a38..16cf8cf8e8a 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -34,7 +34,7 @@
 
        	<menuitem action="action_hr_timesheet_analytic_profit"
         	id="menu_hr_timesheet_analytic_profit"
-        	parent="menu_hr_reporting_timesheet_invoice" groups="base.group_extended"/>
+        	parent="hr_timesheet.menu_hr_reporting_timesheet" groups="base.group_extended" icon="STOCK_PRINT"/>
 
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 51edeea837b..be60d24dc4a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -227,12 +227,12 @@
           <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"
-             parent="base.menu_main_pm" sequence="3"/>
+             parent="base.menu_main_pm" sequence="5"/>
          <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
              groups="hr.group_hr_manager" sequence="5"/>
         <!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
-            groups="hr.group_hr_manager"/>
+            groups="hr.group_hr_manager" sequence="1"/>
 
         <!--
             Company inheritancy
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 51e6b5d295c..7336a3a2049 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -121,6 +121,7 @@
             <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
-        <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all" parent="hr.menu_hr_reporting"/>
+        <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all" 
+                parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1"/>
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index b3004fffb2f..ef0b9a1adc7 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -4,7 +4,7 @@
 
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager" sequence="3"/>
-        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
+        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
         <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
 <!--        <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root"  sequence="3" />-->
@@ -78,7 +78,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Properties"
+        <menuitem name="Master Bill of Materials"
             id="menu_mrp_property"
             parent="menu_mrp_configuration"
             groups="base.group_extended"
@@ -230,8 +230,8 @@
         </record>
  <!--       <menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="mrp.menu_mrp_bom" groups="base.group_extended"
                   sequence="100" />-->
-        <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="40" />
-        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="30"/>
+        <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="40" />
+        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="30"/>
 
         <!--
           Bill of Materials
@@ -415,11 +415,11 @@
         -->
 
         <menuitem action="procurement.procurement_action" id="menu_mrp_procurement_action"
-                  parent="mrp.menu_mrp_manufacturing" sequence="2" />
+                  parent="mrp.menu_mrp_manufacturing" sequence="3" />
 <!--        <menuitem action="procurement.procurement_action5" id="menu_mrp_procurement_exception_action"-->
 <!--                  parent="mrp.menu_mrp_control" sequence="1" />-->
 
-         <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
+         <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="3"/>
         <menuitem action="procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
 
         <!--
@@ -851,10 +851,11 @@
 
         <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root"
             groups="base.group_extended"
-            sequence="2"/>
+            sequence="4"/>
+        <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
-        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_mrp_configuration" sequence="1"/>
-        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index a5c6564644e..bd3574d2608 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -206,7 +206,7 @@
     <menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing"
         id="menu_mrp_production_wc_order"
         action="mrp_production_wc_action_form"
-        groups="base.group_extended"/>
+        groups="base.group_extended" sequence="2"/>
     <menuitem name="Work Orders" parent="menu_mrp_planning"
         id="menu_mrp_production_wc_action_planning"
         action="mrp_production_wc_action_planning"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 004ed9ba429..04ee0b42df0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -507,13 +507,14 @@
         </record>
 
         <record id="open_task_type_form" model="ir.actions.act_window">
-            <field name="name">Task Types</field>
+            <field name="name">Types</field>
             <field name="res_model">project.task.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="task_type_tree"/>
         </record>
-        <menuitem action="open_task_type_form" id="menu_task_types" parent="project.menu_definitions"/>
-
+        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
+        <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
+        
         <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
         <act_window
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 64f6bcdfbd1..f5639ea5629 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -30,8 +30,9 @@
         <field name="res_model">project.gtd.context</field>
     </record>
 
-    <menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions" groups="group_project_getting"/>
-    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting" parent="menu_open_gtd_time" action="open_gtd_context_tree"/>
+<!--    <menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions" groups="group_project_getting"/>-->
+    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting" 
+                parent="project.menu_tasks_config" action="open_gtd_context_tree"/>
 
     <record model="ir.ui.view" id="view_gtd_timebox_tree">
         <field name="name">project.gtd.timebox.tree</field>
@@ -68,7 +69,7 @@
         <field name="view_id" ref="view_gtd_timebox_tree"/>
     </record>
 
-    <menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="menu_open_gtd_time" action="open_gtd_timebox_tree"/>
+    <menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="project.menu_tasks_config" action="open_gtd_timebox_tree"/>
     <record model="ir.ui.view" id="project_task_tree">
         <field name="name">project.task.tree.timebox</field>
         <field name="model">project.task</field>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index c9bb771a2ac..ea902ea599f 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -46,6 +46,7 @@
             view_type="form"/>
 
     <!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>-->
-    <menuitem name="Issues" id="menu_project_issue_track"  parent="project.menu_project_management" action="project_issue_categ_act0"/>
+    <menuitem name="Issues" id="menu_project_issue_track"  parent="project.menu_project_management" 
+            action="project_issue_categ_act0" sequence="3"/>
 </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 673f4239971..973e0a1a20c 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-       <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="1"/>
+       <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/>
 
         <record id="project_issue_categ_action" model="ir.actions.act_window">
             <field name="name">Issue Categories</field>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index cafaefa9633..a63449abf85 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-    <menuitem id="menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
+    <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
 
     # ------------------------------------------------------
     # Project Resource Allocation
@@ -292,18 +292,18 @@
 
         <menuitem action="act_project_phase"
             groups="base.group_extended"
-            id="menu_project_phase" parent="menu_project_long_term" sequence="4"/>
+            id="menu_project_phase" parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
-            name="Resource Allocations" parent="menu_project_long_term" />
+            name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>-->
         <menuitem id="menu_pm_resources_project1"
             groups="base.group_extended"
-            name="Resources" parent="base.menu_main_pm" sequence="2"/>
+            name="Resources" parent="project.menu_definitions" sequence="3"/>
 
-        <menuitem id="menu_phase_schedule" name="Scheduling" parent="menu_project_long_term"/>
-        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="project.menu_project_management" sequence="4"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
 
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 1d55d9db6c4..fff11703de5 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -217,12 +217,12 @@
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="account_analytic_planning_view_search"/>
         </record>
-        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>
-        <menuitem id="planning_main" name="Long Term Planning"
-            parent="base.menu_pm_planning" />
+<!--        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>-->
+        <menuitem id="base.menu_project_long_term" name="Long Term Planning"
+            parent="base.menu_main_pm" />
 
         <menuitem action="action_account_analytic_planning_form"
-            id="menu_report_account_analytic_planning" parent="planning_main" />
+            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3"/>
 
         <!--
             Planning statistics
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 3a7277a4766..6a8f5eb6f55 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -7,14 +7,36 @@
             groups="group_purchase_user" sequence="7"/>
        <menuitem id="menu_procurement_management" name="Purchase Management"
             parent="base.menu_purchase_root" sequence="1"/>
+        
+        <!--supplier addresses action-->
+        <record id="action_supplier_address_form" model="ir.actions.act_window">
+            <field name="name">Addresses</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.partner.address</field>
+            <field name="view_type">form</field>
+            <field name="context">{"search_default_supplier":1}</field>
+            <field name="search_view_id" ref="base.view_res_partner_address_filter"/>
+        </record>
+        <record id="action_supplier_address_form_view1" model="ir.actions.act_window.view">
+            <field eval="10" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="base.view_partner_address_tree"/>
+            <field name="act_window_id" ref="action_supplier_address_form"/>
+        </record>
+        <record id="action_supplier_address_form_view2" model="ir.actions.act_window.view">
+            <field eval="20" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="base.view_partner_address_form1"/>
+            <field name="act_window_id" ref="action_supplier_address_form"/>
+        </record>
 
      <!--supplier menu-->
-     <menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
+     <menuitem id="base.menu_procurement_management_supplier" name="Address Book"
             parent="base.menu_purchase_root" sequence="3"/>
-     <menuitem id="menu_procurement_management_supplier_name" name="Suppliers"
+     <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
             parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
-
-
+     <menuitem action="action_supplier_address_form" id="menu_purchases_partner_address_form"
+            parent="base.menu_procurement_management_supplier" sequence="3"/>
 
           <!--Inventory control-->
       <menuitem id="menu_procurement_management_inventory" name="Inventory Control"
@@ -27,7 +49,7 @@
       <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
             parent="base.menu_purchase_root" sequence="6"/>
      <menuitem name="Pending Invoices" id="menu_procurement_management_pending_invoice" action="account.action_invoice_tree_pending_invoice"
-      parent="menu_procurement_management_invoice"/>
+      parent="menu_procurement_management_invoice" sequence="13"/>
 
       <!--product menu-->
       <menuitem id="menu_procurement_management_product" name="Product"
@@ -346,7 +368,8 @@
             <field name="view_id" ref="purchase_order_line_form"/>
             <field name="act_window_id" ref="purchase_line_form_action2"/>
         </record>
-        <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_procurement_management_invoice"/>
+        <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" 
+                    parent="menu_procurement_management_invoice" sequence="12"/>
 
         <!--
             Procurements
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 5b3d2de5652..86299968f4b 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -439,7 +439,7 @@
             <field name="search_view_id" ref="view_picking_journal_search"/>
         </record>
 
-        <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
+        <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_warehouse_config" action="action_definition_picking_journal"/>
 
         <record model="ir.actions.act_window" id="action_invoice_type_tree">
             <field name="name">Picking by invoice_method</field>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 70c3e82ee56..46ce72c2f0a 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -4,7 +4,7 @@
 
         <menuitem id="menu_scrum"
             name="Scrum"
-            parent="base.menu_main_pm"/>
+            parent="base.menu_main_pm" sequence="3"/>
 
         <!-- Scrum Project -->
 
@@ -172,7 +172,7 @@
         <menuitem
             action="action_product_backlog_form"
             id="menu_action_product_backlog_form"
-            sequence="20"
+            sequence="10"
             parent="menu_scrum"/>
 
         <!--
@@ -293,7 +293,7 @@
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
         </record>
         <menuitem
-            sequence="10"
+            sequence="30"
             action="action_sprint_all_tree" id="menu_action_sprint_all_tree" parent="menu_scrum"/>
 
         <!--
@@ -375,7 +375,7 @@
             <field name="context">{'search_default_scrum_daily':1}</field>
             <field name="search_view_id" ref="view_scrum_meeting_search"/>
         </record>
-        <menuitem sequence="30"
+        <menuitem sequence="20"
             action="action_meeting_form" id="menu_action_meeting_form" parent="menu_scrum"/>
 
         <!--
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3fdfda9e057..1011f88f577 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -3,11 +3,12 @@
     <data>
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
-        <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="5"/>
-        <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="4"/>
+        <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="7"/>
+        <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15"/>
-        <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="3"/>
+        <menuitem id="menu_warehouse_config" name="Warehouse mangement" parent="menu_stock_configuration" sequence="1"/>
+        <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>
@@ -181,7 +182,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_tracking_tree"/>
         </record>
-        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="2"/>
+        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
             groups="base.group_extended"
             parent="menu_traceability"/>
@@ -481,7 +482,7 @@
             <field name="view_id" ref="view_location_tree2"/>
             <field name="context">{'full':1, 'search_default_in_location':1}</field>
         </record>
-        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration" />
+        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" />
 
         <record id="view_location_tree" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
@@ -541,7 +542,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_warehouse_tree"/>
         </record>
-        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_stock_configuration"/>
+        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config"/>
 
         <record id="stock_picking_move_wizard_form" model="ir.ui.view">
             <field name="name">stock.picking.move.wizard.form</field>
@@ -933,7 +934,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree_delivery"/>
         </record>
-        <menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="20"/>
+        <menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="1"/>
 
         #
         # Sending Products
@@ -1126,7 +1127,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree"/>
         </record>
-        <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="5"/>
+        <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="3"/>
 
         <record id="view_picking_in_tree" model="ir.ui.view">
             <field name="name">stock.picking.in.tree</field>
@@ -1308,7 +1309,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree4"/>
         </record>
-        <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="1"/>
+        <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="2"/>
 
         <record id="view_picking_internal_search" model="ir.ui.view">
             <field name="name">stock.picking.internal.search</field>
@@ -1347,7 +1348,7 @@
             <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
-        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
+        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="4"/>
 
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
@@ -1699,7 +1700,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-<!--        <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/>-->
+<!--        <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_warehouse_config"/>-->
 
         <act_window
             context="{'location': active_id}"
@@ -1923,7 +1924,7 @@
             action="action_stock_journal_form"
             id="menu_action_stock_journal_form"
             groups="base.group_extended"
-            parent="menu_stock_configuration" />
+            parent="menu_warehouse_config" />
 
     </data>
 </openerp>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 7eb19f8863c..027ba285193 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -267,7 +267,7 @@
 
 <!-- Create Planning section -->
 
-        <menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root"/>
+        <menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root" sequence="2"/>
 
        <record id="view_stock_planning_createlines_form" model="ir.ui.view">
             <field name="name">stock.planning.createlines.form</field>

From b0a2103e5973b73ff5bb752a7939777df6e03110 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 16 Jun 2010 14:25:03 +0200
Subject: [PATCH 05/15] removed not clean module

bzr revid: fp@tinyerp.com-20100616122503-swfhu1nwxwzsmctk
---
 addons/stock_avg_consommation/__init__.py     |  25 -----
 addons/stock_avg_consommation/__openerp__.py  |  35 ------
 .../stock_avg_consommation.py                 | 100 ------------------
 .../stock_avg_consommation_view.xml           |  18 ----
 .../stock_avg_consommation/wizard/__init__.py |  24 -----
 .../wizard/stock_avg_consommation_wizard.py   |  57 ----------
 6 files changed, 259 deletions(-)
 delete mode 100644 addons/stock_avg_consommation/__init__.py
 delete mode 100644 addons/stock_avg_consommation/__openerp__.py
 delete mode 100644 addons/stock_avg_consommation/stock_avg_consommation.py
 delete mode 100644 addons/stock_avg_consommation/stock_avg_consommation_view.xml
 delete mode 100644 addons/stock_avg_consommation/wizard/__init__.py
 delete mode 100644 addons/stock_avg_consommation/wizard/stock_avg_consommation_wizard.py

diff --git a/addons/stock_avg_consommation/__init__.py b/addons/stock_avg_consommation/__init__.py
deleted file mode 100644
index c4d17a90d9a..00000000000
--- a/addons/stock_avg_consommation/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import stock_avg_consommation
-import wizard
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_avg_consommation/__openerp__.py b/addons/stock_avg_consommation/__openerp__.py
deleted file mode 100644
index 37008770cae..00000000000
--- a/addons/stock_avg_consommation/__openerp__.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Stock Average consommation',
-    'version': '1.0',
-    'category': 'Generic Modules/Inventory Control',
-    'author': 'Tiny',
-    'depends': ['stock'],
-    'init_xml': [],
-    'update_xml': ['stock_avg_consommation_view.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_avg_consommation/stock_avg_consommation.py b/addons/stock_avg_consommation/stock_avg_consommation.py
deleted file mode 100644
index b9dab63d18b..00000000000
--- a/addons/stock_avg_consommation/stock_avg_consommation.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields,osv
-import tools
-import ir
-import pooler
-from mx import DateTime
-from datetime import datetime
-import time
-from dateutil.relativedelta import relativedelta
-
-class stock_avg_consommation(osv.osv):
-    _name = "stock.avg.consommation"
-    _inherit="product.product"
-
-    def _compute_avg_consommation(self, cr, uid, ids, fields, args, context={}):
-        print  ids, fields, args, context
-        date_str=False
-        from_date=context.get('from_date',False)
-        to_date=context.get('to_date',False)
-
-        if from_date and to_date:
-            date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
-        elif from_date:
-            date_str="date_planned>='%s'"%(from_date)
-        elif to_date:
-            date_str="date_planned<='%s'"%(to_date)
-
-        date_object_to = to_date and  datetime.strptime(to_date, '%Y-%m-%d %H:%M:%S') or datetime.now()
-        date_object_from = from_date and datetime.strptime(from_date, '%Y-%m-%d %H:%M:%S')  or (datetime.now() + relativedelta(days=-30))
-        dd = date_object_to - date_object_from
-        total_days=dd.days+1
-        if not from_date and not to_date:
-            date_str="date_planned>='%s' and date_planned<='%s'"%(date_object_from.strftime('%Y-%m-%d 00:00:00'), date_object_to.strftime('%Y-%m-%d 23:59:59'))
-        elif not from_date:
-            date_str="date_planned>='%s'"%(date_object_from.strftime('%Y-%m-%d 00:00:00'))
-        elif not to_date:
-            date_str="date_planned<='%s'"%(date_object_to.strftime('%Y-%m-%d 23:59:59'))
-        res={}
-        for line_id in ids:
-            res[line_id] = False
-        location_ids = []
-
-        if context.get('location', False):
-            if type(context['location']) == type(1):
-                location_ids = [context['location']]
-            elif type(context['location']) in (type(''), type(u'')):
-                location_ids = self.pool.get('stock.location').search(cr, uid, [('name','ilike',context['location'])], context=context)
-            else:
-                location_ids = context['location']
-        else:
-            location_ids = []
-            wids = self.pool.get('stock.warehouse').search(cr, uid, [], context=context)
-            for w in self.pool.get('stock.warehouse').browse(cr, uid, wids, context=context):
-                location_ids.append(w.lot_stock_id.id)
-
-        # build the list of ids of children of the location given by id
-        if context.get('compute_child',True):
-            child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
-            location_ids = child_location_ids or location_ids
-        else:
-            location_ids = location_ids
-
-
-
-        #sql = """select product_id,sum(product_qty) from stock_move sm,stock_picking sp where sm.picking_id=sp.id and sp.type in ('out','delivery') and %s and  location_id <> ANY(%s) and location_dest_id =ANY(%s) group by product_id""" % (date_str, location_ids, location_ids)
-        sql = """select product_id,sum(product_qty) from stock_move sm,stock_picking sp where sm.picking_id=sp.id and sp.type in ('out','delivery') and """+date_str+""" and  sm.location_id not in %s and sm.location_dest_id in %s group by product_id"""
-        cr.execute(sql, [tuple(location_ids), tuple(location_ids)])
-        product_ids = []
-        res_sum = cr.fetchall()
-        for line_id, avg in res_sum:
-            res[line_id] = avg/total_days
-            product_ids.append(avg)
-        return res
-
-    _columns = {
-        'avg_consommation':fields.function(_compute_avg_consommation,method=True, type='float', string="Average Consommation"),
-    }
-stock_avg_consommation()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_avg_consommation/stock_avg_consommation_view.xml b/addons/stock_avg_consommation/stock_avg_consommation_view.xml
deleted file mode 100644
index d9afed69af3..00000000000
--- a/addons/stock_avg_consommation/stock_avg_consommation_view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-       <record id="stock_avg_consommation_tree" model="ir.ui.view">
-            <field name="name">stock.avg.consommation.tree</field>
-            <field name="model">stock.avg.consommation</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="product.product_product_tree_view"/>
-            <field name="arch" type="xml">
-   				<field name="state" position="after">
-                        <field name="avg_consommation" />
-                </field>
-            </field>
-        </record>
-	</data>
-</openerp>
-
-
diff --git a/addons/stock_avg_consommation/wizard/__init__.py b/addons/stock_avg_consommation/wizard/__init__.py
deleted file mode 100644
index a7d7cfed3dc..00000000000
--- a/addons/stock_avg_consommation/wizard/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import stock_avg_consommation_wizard
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_avg_consommation/wizard/stock_avg_consommation_wizard.py b/addons/stock_avg_consommation/wizard/stock_avg_consommation_wizard.py
deleted file mode 100644
index 7d5d8657aa2..00000000000
--- a/addons/stock_avg_consommation/wizard/stock_avg_consommation_wizard.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class stock_location_product(osv.osv_memory):
-    _inherit = "stock.location.product"
-
-    def action_open_window(self, cr, uid, ids, context):
-        """ To open location wise product information specific to given duration
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param ids: An ID or list of IDs if we want more than one
-         @param context: A standard dictionary
-         @return: Invoice type
-        """
-
-        mod_obj = self.pool.get('ir.model.data')
-        view = mod_obj._get_id(cr, uid, 'stock_avg_consommation', 'stock_avg_consommation_tree')
-        id = mod_obj.read(cr, uid, view, ['res_id'])
-
-        for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
-            return {
-                'name': False,
-                'view_id':[id['res_id']],
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'stock.avg.consommation',
-                'type': 'ir.actions.act_window',
-                'context': {'location': context['active_id'],
-                       'from_date': location_obj['from_date'],
-                       'to_date': location_obj['to_date']},
-                'domain': [('type', '<>', 'service')],
-            }
-
-stock_location_product()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 953e7dc67d047be05e71300ddf4f16ba28c4b351 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 15:26:09 +0200
Subject: [PATCH 06/15] [IMP] stock views

bzr revid: nel@tinyerp.com-20100616132609-abqesd6tm8axcokx
---
 addons/purchase/security/ir.model.access.csv |  2 +
 addons/stock/stock_view.xml                  | 51 +++++++++++++++-----
 addons/stock/wizard/stock_move_view.xml      |  4 +-
 addons/stock/wizard/stock_splitinto.py       |  8 +--
 4 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index c6a09d5d728..d1ccce7b15f 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -24,3 +24,5 @@
 "access_account_sequence_fiscalyear_purchase_user","account.sequence.fiscalyear purchase","account.model_account_sequence_fiscalyear","group_purchase_user",1,1,1,1
 "access_res_partner_purchase_user","res.partner purchase","base.model_res_partner","group_purchase_user",1,0,0,0
 "access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0
+"access_account_journal","account.journal","account.model_account_journal","purchase.group_purchase_user",1,1,1,0
+"access_account_journal_manager","account.journal","account.model_account_journal","purchase.group_purchase_manager",1,1,1,1
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3fdfda9e057..bf07fe15058 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -631,15 +631,18 @@
                                     <button
                                         name="%(stock.track_line)d"
                                         string="Split in production lots"
-                                           type="action" icon="terp-stock_effects-object-colorize"
-                                           states="draft,waiting,confirmed,assigned" />
+                                        groups="base.group_extended" 
+                                        type="action" icon="terp-stock_effects-object-colorize"
+                                        states="draft,waiting,confirmed,assigned" />
                                     <field groups="base.group_extended" name="tracking_id"/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                            groups="base.group_extended" 
                                             icon="terp-stock_effects-object-colorize" 
                                             states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
                                         icon="terp-stock_effects-object-colorize" 
+                                        groups="base.group_extended" 
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
@@ -677,9 +680,11 @@
 
                                             <newline/>
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"
+                                              groups="base.group_extended" />
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                                groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize" />
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
@@ -792,9 +797,11 @@
                                     <field groups="base.group_extended" name="tracking_id"/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                        groups="base.group_extended" 
                                         states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                                        groups="base.group_extended" 
                                         icon="terp-stock_effects-object-colorize" 
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
@@ -837,9 +844,12 @@
                                             <field groups="base.group_extended" name="tracking_id"/>
 
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            <button name="%(track_line)d" string="Split in production lots" 
+                                            groups="base.group_extended" 
+                                            type="action" icon="terp-stock_effects-object-colorize"/>
                                             <label/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                              groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize"
                                                 states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
@@ -993,9 +1003,11 @@
                                     <field name="tracking_id" groups="base.group_extended"/>
                                   <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                       icon="terp-stock_effects-object-colorize"
+                                      groups="base.group_extended" 
                                       states="draft,assigned,confirmed,done"/>
                                 <button name="setlast_tracking" string="Set Last Tracking" type="object"
                                     attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                                    groups="base.group_extended" 
                                     icon="terp-stock_effects-object-colorize" 
                                     states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
@@ -1027,9 +1039,12 @@
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"
+                                                groups="base.group_extended" 
+                                             />
                                             <label/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                                groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize" 
                                                 states="draft,assigned,confirmed,done"/>
                                             <label/>
@@ -1178,13 +1193,16 @@
                                       <button
                                            name="%(stock.track_line)d"
                                            string="Split in production lots"
+                                            groups="base.group_extended" 
                                            type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
                                     <field name="tracking_id" groups="base.group_extended"/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                        groups="base.group_extended" 
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                                        groups="base.group_extended" 
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="state"/>
@@ -1216,7 +1234,9 @@
                                             <label/>
                                           	<button groups="base.group_extended" name="267" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
                                             <label/>
-                                            <button name="275" string="Split Stock Moves" type="action" icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" states="draft,assigned,confirmed,done"/>
+                                            <button name="275" string="Split Stock Moves" type="action"
+                                              groups="base.group_extended" 
+                                              icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -1371,11 +1391,12 @@
                         groups="base.group_extended"/>
                     <field groups="base.group_extended" name="tracking_id"/>
                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                        groups="base.group_extended" 
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
-                        icon="terp-stock_effects-object-colorize" 
-                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                        groups="base.group_extended" 
+                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
@@ -1435,9 +1456,12 @@
                                 <newline/>
                                 <group colspan="4" col="4">
                                   <label/>
-                                	<button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
+                                	<button name="%(track_line)d"
+                                    groups="base.group_extended" 
+                                   string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
                                   <label/>
-                                	<button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                        groups="base.group_extended" 
                                 		icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                 		states="draft,assigned,confirmed,done"/>
                                 </group>
@@ -1530,10 +1554,12 @@
                         groups="base.group_extended"/>
                     <field name="tracking_id" groups="base.group_extended"/>
                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                        groups="base.group_extended" 
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                        groups="base.group_extended" 
                         icon="terp-stock_effects-object-colorize" 
                         states="draft,assigned,confirmed,done"/>
                     <field name="date_planned"/>
@@ -1582,10 +1608,13 @@
                             <group col="2" colspan="2">
                               <label/>
 	                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                groups="base.group_extended" 
 	                            	icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
 	                            	states="draft,assigned,confirmed,done"/>
                               <label/>
-	                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+	                            <button name="%(track_line)d" string="Split in production lots" 
+                              groups="base.group_extended" 
+                              type="action" icon="terp-stock_effects-object-colorize"/>
                         	</group>
                             <separator colspan="4" string="Move State"/>
                             <field name="state"/>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 05c35d5a830..71626e7d161 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -120,7 +120,7 @@
 
                   <group colspan="4" attrs="{'invisible':[('use_exist','=',True)]}">
 	                	<field name="line_ids" colspan="4" nolabel="1">
-	                		<tree string="Lots Number" editable="top">
+	                		<tree string="Lots Number" editable="bottom">
 	                			<field name="name" string="Lots"/>
 	                			<field name="quantity" />
 	                		</tree>
@@ -132,7 +132,7 @@
                     </group>
                   <group colspan="4" attrs="{'invisible':[('use_exist','!=',True)]}">
 	                	<field name="line_exist_ids" colspan="4" nolabel="1">
-	                		<tree string="Lots Number" editable="top">
+	                		<tree string="Lots Number" editable="bottom">
 	                			<field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
 	                			<field name="quantity" />
 	                		</tree>
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index dcc97d6379d..ff4cd588c47 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -57,15 +57,15 @@ class stock_split_into(osv.osv_memory):
         value_to_split = self.browse(cr, uid, data[0], context)
         quantity =  value_to_split.quantity or 0.0
         ir_sequence_obj = self.pool.get('ir.sequence')
-        prodlot_obj = self.pool.get('stock.production.lot')
+        track_obj = self.pool.get('stock.tracking')
         for move in move_obj.browse(cr, uid, rec_id):
             move_qty = move.product_qty
             uos_qty_rest = move.product_uos_qty
             quantity_rest = move_qty - quantity
             if quantity_rest == 0:
                 continue
-            sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-            prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence}, {'product_id': move.product_id.id})
+            sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.tracking')
+            tracking_id = track_obj.create(cr, uid, {'name': sequence}, {'product_id': move.product_id.id})
             uos_qty = quantity / move_qty * move.product_uos_qty
             uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
             default_val = {
@@ -76,7 +76,7 @@ class stock_split_into(osv.osv_memory):
             current_move = move_obj.copy(cr, uid, move.id, default_val)
             new_move.append(current_move)
             update_val['product_qty'] = quantity_rest
-            update_val['prodlot_id'] = prodlot_id
+            update_val['tracking_id'] = tracking_id
             update_val['product_uos_qty'] = uos_qty_rest
             move_obj.write(cr, uid, [move.id], update_val)
         return {}

From 606c842f0d7f0cd6948a556a400b8e20daa8a54e Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 16 Jun 2010 19:04:52 +0530
Subject: [PATCH 07/15] [IMP]: Re-organized Sales menu.

bzr revid: uco@tinyerp.com-20100616133452-qrpiy2r0crxe0d2z
---
 addons/base_calendar/base_calendar_view.xml                   | 2 +-
 addons/crm/crm_phonecall_menu.xml                             | 2 +-
 addons/crm/crm_view.xml                                       | 2 +-
 addons/crm_claim/crm_claim_menu.xml                           | 2 +-
 addons/crm_claim/crm_claim_view.xml                           | 2 +-
 addons/crm_fundraising/crm_fundraising_menu.xml               | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml               | 2 +-
 addons/crm_fundraising/report/crm_fundraising_report_view.xml | 2 +-
 addons/crm_helpdesk/crm_helpdesk_menu.xml                     | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml                     | 2 +-
 addons/html_view/html_view.xml                                | 2 +-
 addons/product/product_view.xml                               | 4 ++--
 addons/report_intrastat/report_intrastat_view.xml             | 2 +-
 addons/sale/report/sale_report_view.xml                       | 2 +-
 addons/sale/sale_view.xml                                     | 4 ++--
 addons/sale_journal/report/sale_journal_report_view.xml       | 3 ++-
 addons/stock_planning/stock_planning_view.xml                 | 4 ++--
 addons/wiki_sale_faq/wiki_sale_faq_view.xml                   | 2 +-
 18 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 56e45c9ccf9..21b16443e0a 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -138,7 +138,7 @@
 
         <!-- Calenadar's menu -->
           <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_base_config" sequence="15" />
+            parent="base.menu_config_address_book" sequence="15" />
 
         <!-- Invitation menu -->
 
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index a5caf10b673..74bba86be04 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -48,7 +48,7 @@
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
         groups="base.group_extended"
-        parent="base.menu_base_partner" sequence="5" />
+        parent="base.menu_base_partner" sequence="4" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
         <field name="name">Inbound</field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 19e3f731606..a402be2c85b 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -17,7 +17,7 @@
             parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
 
         <menuitem id="base.next_id_64" name="Reporting"
-            parent="base.menu_base_partner" sequence="8" />
+            parent="base.menu_base_partner" sequence="11" />
 
         <!-- Case Sections Form View -->
 
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 7fb1c08f84b..e6ccdbe5bea 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -4,7 +4,7 @@
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
             groups="base.group_extended"
-            parent="base.menu_base_partner" sequence="6" />
+            parent="base.menu_base_partner" sequence="7" />
 
         <!-- Claims Menu -->
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index b25009c2339..487a116ca1d 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -4,7 +4,7 @@
 
     <menuitem id="menu_config_claim" name="Claim"
         groups="base.group_extended"
-        parent="base.menu_base_config" sequence="8" />
+        parent="base.menu_base_config" sequence="6" />
 
     <!-- Claims categories  -->
 
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index e681594045b..440f1cd29b8 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -6,7 +6,7 @@
 
     <menuitem id="base.menu_fundrising" name="Fund Raising"
         groups="base.group_extended"
-        parent="base.menu_base_partner" sequence="7" />
+        parent="base.menu_base_partner" sequence="8" />
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
         <field name="name">Funds</field>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 9ef1c936be4..4824cc8b3a3 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -4,7 +4,7 @@
            <!-- Fund Raising Configuration Menu -->
         <menuitem id="menu_config_fundrising" name="Fund Raising"
         groups="base.group_extended"
-        parent="base.menu_base_config" sequence="7" />
+        parent="base.menu_base_config" sequence="8" />
 
         <!-- Fund Raising Categories Form View -->
 
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index ecd442d238f..4a5e05b28e1 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -201,7 +201,7 @@
         <menuitem name="Fundraising"
             action="action_report_crm_fundraising"
             groups="base.group_extended"
-            id="menu_report_crm_fundraising_tree" parent="base.next_id_64" />
+            id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index f671e3b77e0..3d93f17e218 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
     <menuitem id="base.menu_aftersale" name="After-Sale Services"
-    	parent="base.menu_base_partner" sequence="6" />
+    	parent="base.menu_base_partner" sequence="7" />
 
 <!-- Help Desk (menu) -->
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 57e7bba0199..f91650a315a 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -4,7 +4,7 @@
        <!-- Helpdesk Support Categories Configuration Menu-->
        <menuitem id="menu_config_helpdesk" name="Helpdesk"
         groups="base.group_extended"
-        parent="base.menu_base_config" sequence="8" />
+        parent="base.menu_base_config" sequence="7" />
 
         <!-- Helpdesk Support Categories Form View -->
 
diff --git a/addons/html_view/html_view.xml b/addons/html_view/html_view.xml
index d26909586b5..7babda37c46 100644
--- a/addons/html_view/html_view.xml
+++ b/addons/html_view/html_view.xml
@@ -36,6 +36,6 @@
             <field name="res_model">html.view</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem action="action_html_view_form" id="html_form" parent="base.menu_address_book" sequence="20"/>
+        <menuitem action="action_html_view_form" id="html_form" parent="base.menu_address_book" sequence="40"/>
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 09a287f0a38..69f04e079f2 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="40"/>
+        <menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="9"/>
 
         <record id="product_search_form_view" model="ir.ui.view">
             <field name="name">product.search.form</field>
@@ -194,7 +194,7 @@
             <field name="search_view_id" ref="product_search_form_view"/>
         </record>
 
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="7"/>
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
         <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 0449b097ec4..4c949174714 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -67,7 +67,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="base.menu_product"/>
+        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="product.prod_config_main"/>
 
 
         <record id="view_report_intrastat_tree" model="ir.ui.view">
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 41ebc1de088..b7dfd117ed0 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -125,7 +125,7 @@
         <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
     </record>
 
-    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
+    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11"/>
     <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="3"/>
 
     <record id="action_stock_move_report_so" model="ir.actions.act_window">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0d28969c816..b924ade18af 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -3,7 +3,7 @@
     <data>
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
         <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
         <record id="view_shop_form" model="ir.ui.view">
@@ -505,7 +505,7 @@
 
         <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product" groups="base.group_extended"/>
 
-        <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="6"/>
+        <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"/>
         <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
         <!-- configartion view -->
 
diff --git a/addons/sale_journal/report/sale_journal_report_view.xml b/addons/sale_journal/report/sale_journal_report_view.xml
index aa0a9cf06fe..19e93f58eb3 100644
--- a/addons/sale_journal/report/sale_journal_report_view.xml
+++ b/addons/sale_journal/report/sale_journal_report_view.xml
@@ -81,7 +81,8 @@
 	        <field name="context">{'search_default_journal': 1,'group_by_no_leaf':1,'group_by':[]}</field>
 	    </record>
 
-	    <menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all" parent="base.next_id_64" action="action_sale_journal_report_open_menu_all"/>
+	    <menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all" 
+	              parent="base.next_id_64" action="action_sale_journal_report_open_menu_all" sequence="2"/>
 
 	 <!-- picking by journal and invoice's tree view-->
 
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 027ba285193..d95f49cbd70 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -121,8 +121,8 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem id="menu_stock_sale_forecast" name="Stock and Sales Forecasts" parent="base.menu_base_partner"/>
-
+        <menuitem id="menu_stock_sale_forecast" name="Stock and Sales Forecasts" 
+                parent="base.menu_base_partner" sequence="6"/>
         <menuitem id="menu_stock_sale_forecast_createlines" name="Create Stock and Sales Forecasts" parent="menu_stock_sale_forecast" action="action_stock_sale_forecast_createlines_form" sequence = "5"/>
 
         <record id="view_stock_sale_forecast_form" model="ir.ui.view">
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
index c3643bdf049..a97ba15db0e 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
@@ -4,7 +4,7 @@
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
         <menuitem name="Documents"
-           id="menu_sales" sequence="6"
+           id="menu_sales" sequence="10"
            parent="base.menu_base_partner"/>
 
        <record model="ir.actions.act_window" id="action_document_form">

From a0606d8a036b975de45a9ce17b2e36f58ebe87dc Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 15:39:24 +0200
Subject: [PATCH 08/15] [IMP] set group user to sales menu

bzr revid: nel@tinyerp.com-20100616133924-j705xw200wlcvm9j
---
 addons/sale/sale_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0d28969c816..5e73d76056f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="sale.group_sale_user"/> 
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>

From eae27319ebc94021447519247765e2ec6b3de694 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 22:02:39 +0200
Subject: [PATCH 09/15] [IMP] stock: rules and view

bzr revid: nel@tinyerp.com-20100616200239-kznn7jkpgxggiprj
---
 addons/stock/security/ir.model.access.csv |  4 +++-
 addons/stock/stock_view.xml               | 22 +++++++++-------------
 addons/stock/wizard/stock_splitinto.py    |  4 ++--
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index f7bbc7ea3b9..7ecb0b833e9 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -50,4 +50,6 @@
 "access_stock_replacement_result","stock.replacement.result","model_stock_replacement_result","stock.group_stock_user",1,1,1,1
 "access_stock_ups","stock.ups","model_stock_ups","stock.group_stock_user",1,1,1,1
 "access_stock_ups_final","stock.ups.final","model_stock_ups_final","stock.group_stock_user",1,1,1,1
-"access_stock_ups_upload","stock.ups.upload","model_stock_ups_upload","stock.group_stock_user",1,1,1,1
\ No newline at end of file
+"access_stock_ups_upload","stock.ups.upload","model_stock_ups_upload","stock.group_stock_user",1,1,1,1
+"access_stock_split_into","stock.split.into","model_stock_split_into","stock.group_stock_user",1,1,1,0
+"access_stock_split_into_manager","stock.split.into","model_stock_split_into","stock.group_stock_manager",1,1,1,1
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index bf07fe15058..d824cefe2c7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1192,8 +1192,8 @@
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                       <button
                                            name="%(stock.track_line)d"
-                                           string="Split in production lots"
-                                            groups="base.group_extended" 
+                                           string="Split in production ii lots"
+                                            groups="base.group_extended"
                                            type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
                                     <field name="tracking_id" groups="base.group_extended"/>
@@ -1385,8 +1385,8 @@
                         icon="gtk-convert" context="{'scrap': True}"
                         states="draft,waiting,confirmed,assigned" />
                     <field name="prodlot_id" groups="base.group_extended"/>
-                    <button name="%(track_line)d" string="Split" type="action"
-                        icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
+                    <button name="%(track_line)d" string="Split in Production Lots" type="action"
+                        icon="gtk-justify-fill" 
                         states="assigned,confirmed"
                         groups="base.group_extended"/>
                     <field groups="base.group_extended" name="tracking_id"/>
@@ -1595,27 +1595,23 @@
                             <field name="date_expected"/>
                             <field name="priority"/>
                             <field name="address_id" context="{'contact_display':'partner'}"/>
-                            <newline/>
+                            <field name="picking_id"/>
                             <newline/>
                             <field name="prodlot_id" groups="base.group_extended"
                                 context="{'location_id':location_id, 'product_id':product_id}"
                                 domain="[('product_id','=?',product_id)]"
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                             <field groups="base.group_extended" name="tracking_id"/>
-
                             <newline/>
-                            <field name="picking_id"/>
-                            <group col="2" colspan="2">
+                              <label/>
+	                            <button name="%(track_line)d" string="Split in production lots" 
+                              groups="base.group_extended" 
+                              type="action" icon="terp-stock_effects-object-colorize"/>
                               <label/>
 	                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                 groups="base.group_extended" 
 	                            	icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
 	                            	states="draft,assigned,confirmed,done"/>
-                              <label/>
-	                            <button name="%(track_line)d" string="Split in production lots" 
-                              groups="base.group_extended" 
-                              type="action" icon="terp-stock_effects-object-colorize"/>
-                        	</group>
                             <separator colspan="4" string="Move State"/>
                             <field name="state"/>
                             <group col="5" colspan="2">
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index ff4cd588c47..d0f46e45658 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -69,13 +69,13 @@ class stock_split_into(osv.osv_memory):
             uos_qty = quantity / move_qty * move.product_uos_qty
             uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
             default_val = {
-                'product_qty': quantity,
+                'product_qty': quantity_rest,
                 'product_uos_qty': uos_qty,
                 'state': move.state
             }
             current_move = move_obj.copy(cr, uid, move.id, default_val)
             new_move.append(current_move)
-            update_val['product_qty'] = quantity_rest
+            update_val['product_qty'] = quantity
             update_val['tracking_id'] = tracking_id
             update_val['product_uos_qty'] = uos_qty_rest
             move_obj.write(cr, uid, [move.id], update_val)

From d2d3ab1a6d0c0efc876e7d449f5db08ea9a9fe67 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Thu, 17 Jun 2010 04:33:45 +0100
Subject: [PATCH 10/15] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100617033345-dxafwr55ev6k3x9j
---
 addons/account/i18n/it.po             | 2 +-
 addons/base_module_quality/i18n/it.po | 2 +-
 addons/board/i18n/nl_BE.po            | 2 +-
 addons/google_map/i18n/ru.po          | 2 +-
 addons/mrp_operations/i18n/hi.po      | 2 +-
 addons/mrp_repair/i18n/hi.po          | 2 +-
 addons/multi_company/i18n/it.po       | 2 +-
 addons/product/i18n/vi.po             | 2 +-
 addons/stock/i18n/nl.po               | 2 +-
 addons/stock/i18n/pl.po               | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 499700a8777..d2a543a0a3e 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 565dd1e0f4d..3c18c0ec32e 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index 2754b34b4bd..b36d1a918a6 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index c4f6acceef1..04619e44885 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index fa9b4ac9ef8..657860cae37 100644
--- a/addons/mrp_operations/i18n/hi.po
+++ b/addons/mrp_operations/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/hi.po b/addons/mrp_repair/i18n/hi.po
index 902b7bbf5bd..6136b1e992a 100644
--- a/addons/mrp_repair/i18n/hi.po
+++ b/addons/mrp_repair/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/multi_company/i18n/it.po b/addons/multi_company/i18n/it.po
index aa820150b5a..1899d197277 100644
--- a/addons/multi_company/i18n/it.po
+++ b/addons/multi_company/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 35d5e643150..93bb2e12631 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 25a0c9e5358..bc826ef796d 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index aade911d099..95d22fcaa6c 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock

From 24d7b1bcfc16d96626f3df5a8b541a63411744c6 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Thu, 17 Jun 2010 10:11:22 +0200
Subject: [PATCH 11/15] [IMP] stock: set use exist to true when outgoing

bzr revid: nel@tinyerp.com-20100617081122-rfnwk4e5jh5sw7g1
---
 addons/stock/wizard/stock_move.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 5f930361dfe..d66972fd36b 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -183,6 +183,8 @@ class split_in_production_lot(osv.osv_memory):
             res.update({'product_uom': move.product_uom.id})
         if 'qty' in fields:
             res.update({'qty': move.product_qty})
+        if 'use_exist' in fields:
+            res.update({'use_exist': (move.picking_id and move.picking_id.type=='out' and True) or False})
         return res
 
     _columns = {

From 8c1ef52f0788b1652c43c53d8edc40ebb75d299d Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Thu, 17 Jun 2010 11:55:52 +0200
Subject: [PATCH 12/15] [IMP] stock split into add condition qty <=0

bzr revid: nel@tinyerp.com-20100617095552-teeaeyd2yuwb46y0
---
 addons/stock/wizard/stock_splitinto.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index d0f46e45658..9c01f380247 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -62,7 +62,7 @@ class stock_split_into(osv.osv_memory):
             move_qty = move.product_qty
             uos_qty_rest = move.product_uos_qty
             quantity_rest = move_qty - quantity
-            if quantity_rest == 0:
+            if (quantity_rest == 0) or (quantity <= 0) :
                 continue
             sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.tracking')
             tracking_id = track_obj.create(cr, uid, {'name': sequence}, {'product_id': move.product_id.id})

From 42443c892d5b958f4b0460664547482af11a37cb Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 17 Jun 2010 15:34:51 +0530
Subject: [PATCH 13/15] [IMP] crm, hr, project, stock, sale: Menu
 Re-organization.

bzr revid: uco@tinyerp.com-20100617100451-75hoxnbpjoo1clie
---
 addons/base_contact/base_contact_view.xml     |  2 +-
 addons/crm/crm_opportunity_view.xml           |  6 +++---
 addons/crm/crm_view.xml                       |  4 ++--
 addons/crm/report/crm_lead_report_view.xml    |  4 ++--
 .../crm/report/crm_phonecall_report_view.xml  |  2 +-
 addons/crm_claim/crm_claim_menu.xml           |  2 +-
 .../report/crm_claim_report_view.xml          |  2 +-
 addons/crm_helpdesk/crm_helpdesk_menu.xml     |  2 +-
 .../report/crm_helpdesk_report_view.xml       |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 20 +++++++++----------
 addons/hr_timesheet/hr_timesheet_report.xml   |  2 +-
 .../hr_timesheet_print_employee_view.xml      |  4 ++--
 .../wizard/hr_timesheet_print_users_view.xml  |  2 +-
 .../hr_timesheet_analytic_profit_view.xml     |  2 +-
 ...heet_invoice_analytic_cost_ledger_view.xml |  2 +-
 addons/mail_gateway/mail_gateway_view.xml     |  5 +++--
 .../report/task_report_view.xml               |  3 ++-
 .../report_intrastat_view.xml                 |  6 ++++--
 addons/sale/report/sale_report_view.xml       |  4 ++--
 .../report/sale_journal_report_view.xml       |  3 ++-
 addons/sale_journal/sale_journal_view.xml     |  2 +-
 addons/stock/__openerp__.py                   |  1 +
 addons/stock/report/__init__.py               |  1 +
 .../stock/report/report_stock_move_view.xml   |  4 ++--
 .../report/report_stock_picking_view.xml      |  3 ++-
 addons/stock_planning/stock_planning_view.xml |  4 ++--
 addons/thunderbird/thunderbird_installer.xml  |  3 ++-
 27 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 2145123599c..352e8cf62d3 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -132,7 +132,7 @@
             parent="base.menu_purchase_root" sequence="3"/>
     <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
             parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
-    <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" 
+    <menuitem name="Contacts" id="menu_purchases_partner_contact_form" action="action_partner_contact_form" 
             parent = "base.menu_procurement_management_supplier" sequence="2"/>
 
     <!-- Views for Partners Form View -->
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 08530fcae27..550d82f86ac 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -15,7 +15,7 @@
 
         <menuitem action="crm_opportunity_categ_action"
             id="menu_crm_case_opportunity-act" name="Categories"
-            parent="menu_crm_config_opportunity" />
+            parent="menu_crm_config_opportunity" sequence="1"/>
 
         <!-- Opportunity Stages Form View-->
 
@@ -30,7 +30,7 @@
 
         <menuitem action="crm_opportunity_stage_act"
             id="menu_crm_opportunity_stage_act" name="Stages"
-            parent="menu_crm_config_opportunity" />
+            parent="menu_crm_config_opportunity" sequence="2"/>
 
         <!-- Opportunity Resource Type Form View -->
 
@@ -45,7 +45,7 @@
 
         <menuitem action="crm_opportunity_resource_act"
             id="menu_crm_opportunity_resource_act" name="Resource"
-            parent="menu_crm_config_opportunity" />
+            parent="menu_crm_config_opportunity" sequence="3"/>
 
         <!-- Opportunities Form View -->
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a402be2c85b..b196d9cb4ca 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -169,7 +169,7 @@
 
         <menuitem action="crm_case_section_act"
             id="menu_crm_case_section_act" sequence="4"
-            parent="base.menu_crm_config_sales" />
+            parent="menu_crm_config_opportunity" />
 
 
 
@@ -354,7 +354,7 @@
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
             groups="base.group_extended" sequence="5"
-            parent="base.menu_crm_config_sales" />
+            parent="menu_crm_config_opportunity" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
             <field name="name">view.users.form.crm.modif.inherited1</field>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 1eb4a2928a3..b9119325c52 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -232,10 +232,10 @@
        </record>
 
        <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
-           parent="base.next_id_64" action="action_report_crm_lead" />
+           parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
 
        <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
-           parent="base.next_id_64" action="action_report_crm_opportunity" />
+           parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 58136ea7a43..ccc6cd677f4 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -189,7 +189,7 @@
 
         <menuitem name="Phone Calls Analysis"
             action="action_report_crm_phonecall"
-            id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
+            id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="5"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index e6ccdbe5bea..40f077d49f0 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -47,7 +47,7 @@
         </record>
 
         <menuitem name="Claims" id="menu_crm_case_claims"
-            parent="base.menu_aftersale" action="crm_case_categ_claim0" />
+            parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 0664295b83d..f10f403c034 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -213,7 +213,7 @@
 
        <menuitem name="Claims" id="menu_report_crm_claim_tree"
            groups="base.group_extended"
-           action="action_report_crm_claim" parent="base.next_id_64" />
+           action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
 
 
     </data>
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 3d93f17e218..8ac1cb7df4b 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -37,7 +37,7 @@
     </record>
 
     <menuitem name="Helpdesk and Support" id="menu_help_support_main"
-    	parent="base.menu_aftersale" action="crm_case_helpdesk_act111" />
+    	parent="base.menu_aftersale" action="crm_case_helpdesk_act111" sequence="2"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index c6875e21a4a..1ebdb041a9a 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -181,7 +181,7 @@
 
         <menuitem name="Helpdesk" action="action_report_crm_helpdesk"
             groups="base.group_extended"
-            id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" />
+            id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" sequence="7"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 09f8cee6314..cb8e4e196d7 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+	    <menuitem
+	        id="menu_hr_recruitment_recruitment"
+	        name="Recruitment"
+	        parent="hr.menu_hr_configuration"
+	        sequence="2"/>
+	    <menuitem
+	        id="menu_hr_config_applicant"
+	        name="Applicant"
+	        parent="menu_hr_recruitment_recruitment"
+	        sequence="2"/>
 
     # ------------------------------------------------------
     # Job Categories
@@ -313,16 +323,6 @@
         <field name="view_id" ref="hr_recruitment_stage_tree"/>
     </record>
 
-    <menuitem
-        id="menu_hr_recruitment_recruitment"
-        name="Recruitment"
-        parent="hr.menu_hr_configuration"
-        sequence="2"/>
-    <menuitem
-        id="menu_hr_config_applicant"
-        name="Applicant"
-        parent="menu_hr_recruitment_recruitment"
-        sequence="2"/>
     <menuitem
         id="menu_hr_recruitment_stage"
         name="Stages"
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index f161c8c07f9..1354788f77b 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -10,7 +10,7 @@
             id="menu_hr_reporting_timesheet"
             name="Timesheet"
             parent="hr.menu_hr_reporting"
-            sequence="4" />
+            sequence="5" />
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
 
         <!--<wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
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 a3723d2adba..4c5ed013e1d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -16,7 +16,7 @@
                 	</group>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
+                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
@@ -50,7 +50,7 @@
                 	</group>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
+                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 2d2af2a4769..fa1f4a80c9a 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -16,7 +16,7 @@
                 	</group>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
+                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 16cf8cf8e8a..651edf9b2b1 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -17,7 +17,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="STOCK_PRINT"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
index ea14e52ed52..bab9e1ff8e5 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
@@ -15,7 +15,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="STOCK_PRINT"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index e5b7b426fe9..7b8ce52cbec 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -165,8 +165,9 @@
             <field name="act_window_id" ref="action_view_mailgate_thread"/>
         </record>
 
-            <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
-           parent="base.menu_base_config"  sequence="100"/>
+        <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
+        <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
+           parent="base.menu_base_config_mail" sequence="5"/>
 
         <act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"
             id="act_res_partner_emails" name="Emails"
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 5a653985a20..5886d5351dd 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -170,7 +170,8 @@
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_report_timesheet_task_user_search"/>
         </record>
-        <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" action="action_report_timesheet_task_user"/>
+        <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" 
+                    action="action_report_timesheet_task_user" sequence="4"/>
 
     </data>
 </openerp>
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 4c949174714..f9a894efbe8 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -67,7 +67,8 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="product.prod_config_main"/>
+        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" 
+                parent="base.menu_config_address_book" sequence="2"/>
 
 
         <record id="view_report_intrastat_tree" model="ir.ui.view">
@@ -119,6 +120,7 @@
             <field name="search_view_id" ref="view_report_intrastat_search"/>
         </record>
 
-        <menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" parent="stock.next_id_61"/>
+        <menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" 
+                parent="stock.next_id_61" sequence="6"/>
     </data>
 </openerp>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index b7dfd117ed0..de0cfaa95e2 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -126,7 +126,7 @@
     </record>
 
     <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11"/>
-    <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="3"/>
+    <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1"/>
 
     <record id="action_stock_move_report_so" model="ir.actions.act_window">
         <field name="name">Shipments Analysis</field>
@@ -135,7 +135,7 @@
         <field name="view_mode">tree,graph</field>
         <field name="context">{'search_default_month':1, 'search_default_group_product':1, 'search_default_group_partner':1, 'search_default_done':1, 'search_default_out': 1, 'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
-    <menuitem action="action_stock_move_report_so" id="menu_action_stock_move_report_so" parent="base.next_id_64" sequence="8"/>
+    <menuitem action="action_stock_move_report_so" id="menu_action_stock_move_report_so" parent="base.next_id_64" sequence="25"/>
 
 
     <!--This views used in board_sale module -->
diff --git a/addons/sale_journal/report/sale_journal_report_view.xml b/addons/sale_journal/report/sale_journal_report_view.xml
index 19e93f58eb3..ae454f7674b 100644
--- a/addons/sale_journal/report/sale_journal_report_view.xml
+++ b/addons/sale_journal/report/sale_journal_report_view.xml
@@ -182,7 +182,8 @@
 			<field name="context">{'search_default_month':1, 'group_by_no_leaf':1,'group_by':[]}</field>
 		</record>
 
-		<menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61" action="action_sale_journal_picking_report_open_menu_all"/>
+		<menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61" 
+		          action="action_sale_journal_picking_report_open_menu_all" sequence="8"/>
 
 	</data>
 </openerp>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 86299968f4b..70b12997c54 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -134,7 +134,7 @@
             <field name="search_view_id" ref="view_sale_journal_search"/>
         </record>
 
-        <menuitem id="menu_definition_journal" name="Sales Journals" parent="base.menu_base_config"  action="action_definition_journal" sequence="60" />
+        <menuitem id="menu_definition_journal" name="Sales Journals" parent="product.prod_config_main"  action="action_definition_journal" sequence="70" />
 
     <!-- Inherit sales order form view -->
 
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index f0a03f9f2a5..74e069ac810 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -64,6 +64,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "product_view.xml",
         "partner_view.xml",
         "report/report_stock_move_view.xml",
+        "report/report_stock_picking_view.xml",
         "report/report_stock_view.xml",
         "security/stock_security.xml",
         "security/ir.model.access.csv",
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index 381644fcd32..ab4b2e16599 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -26,5 +26,6 @@ import picking
 import lot_overview
 import lot_overview_all
 import report_stock
+import report_stock_picking
 import report_stock_move
 
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 0f41c0e4b3b..a8ca0df98dc 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -124,7 +124,7 @@
         <field name="search_view_id"  ref="view_stock_search"/>
         <field name="context">{'contact_display': 'partner', 'search_default_month':1, 'search_default_group_product':1,'search_default_done':1,'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
-    <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="5"/>
+    <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
 
     <!-- Inventory Control -->
 
@@ -219,7 +219,7 @@
         <field name="search_view_id"  eval="False"/>
         <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'search_default_group_location':1,'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
-    <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="5"/>
+    <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4"/>
 
 
 </data>
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 83405f2c1bf..b8e5d4ff868 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -129,7 +129,8 @@
 	        <field name="act_window_id" ref="action_report_report_stock_picking"/>
 	    </record>
 
-        <menuitem name="Picking" action="action_report_report_stock_picking" id="menu_report_report_stock_pickings_tree" parent="next_id_61"/>
+        <menuitem name="Picking" action="action_report_report_stock_picking" 
+                id="menu_report_report_stock_pickings_tree" parent="stock.next_id_61" sequence="5"/>
 
   </data>
 </openerp>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index d95f49cbd70..4306c6216eb 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -3,9 +3,9 @@
 <data>
         <menuitem id="menu_stock_period_main"
                   name="Stock and Sales Periods"
-                  parent="base.menu_base_config"/>
+                  parent="base.menu_base_config" sequence="20"/>
 
-<!-- Creating periods section -->
+    <!-- Creating periods section -->
 
     <record id="view_stock_period_createlines_form" model="ir.ui.view">
             <field name="name">stock.period.createlines.form</field>
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 34812a38cee..17b7db6f71d 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -105,7 +105,8 @@
       <field name="target">new</field>
     </record>
 
-	<menuitem id="menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10" />
+    <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
+	<menuitem id="menu_base_config_plugins" name="Plugins" parent="base.menu_base_config_mail" sequence="10" />
 	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird" parent="menu_base_config_plugins" sequence="10" />
 
   </data>

From 6fd4f9e65da53119f5fb15fc05a8e75faa130c2f Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Thu, 17 Jun 2010 13:42:24 +0200
Subject: [PATCH 14/15] [IMP] stock views

bzr revid: nel@tinyerp.com-20100617114224-fdegrmygwfefxcpg
---
 addons/stock/stock_view.xml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6f5ef15f900..e2c79a6499a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -681,10 +681,13 @@
 
                                             <newline/>
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"
+                                            <button name="%(track_line)d" string="Split in production lots" 
+                                             states="draft,waiting,confirmed,assigned"
+                                            type="action" icon="terp-stock_effects-object-colorize"
                                               groups="base.group_extended" />
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                                states="draft,assigned,confirmed,done"
                                                 groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize" />
                                             <separator colspan="4" string="Move State"/>
@@ -798,8 +801,8 @@
                                     <field groups="base.group_extended" name="tracking_id"/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        groups="base.group_extended" 
-                                        states="draft,assigned,confirmed,done"/>
+                                        states="draft,assigned,confirmed,done"
+                                        groups="base.group_extended"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
                                         groups="base.group_extended" 
@@ -847,6 +850,7 @@
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" 
                                             groups="base.group_extended" 
+                                            states="draft,waiting,confirmed,assigned"
                                             type="action" icon="terp-stock_effects-object-colorize"/>
                                             <label/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
@@ -999,7 +1003,7 @@
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <button name="%(track_line)d" string="Split in production lots" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
-                                        states="assigned,confirmed,done"
+                                        states="draft,assigned,confirmed,done"
                                         groups="base.group_extended"/>
                                     <field name="tracking_id" groups="base.group_extended"/>
                                   <button name="%(split_into)d" string="Split Stock Moves" type="action"
@@ -1041,6 +1045,7 @@
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"
+                                                states="draft,assigned,confirmed,done"
                                                 groups="base.group_extended" 
                                              />
                                             <label/>
@@ -1388,7 +1393,7 @@
                     <field name="prodlot_id" groups="base.group_extended"/>
                     <button name="%(track_line)d" string="Split in Production Lots" type="action"
                         icon="gtk-justify-fill" 
-                        states="assigned,confirmed"
+                       states="draft,waiting,confirmed,assigned"
                         groups="base.group_extended"/>
                     <field groups="base.group_extended" name="tracking_id"/>
                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
@@ -1459,6 +1464,7 @@
                                   <label/>
                                 	<button name="%(track_line)d"
                                     groups="base.group_extended" 
+                                   states="draft,waiting,confirmed,assigned"
                                    string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
                                   <label/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
@@ -1550,7 +1556,7 @@
                     <field name="prodlot_id" groups="base.group_extended"/>
                     <button name="%(track_line)d" string="Split in production lots" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
-                        states="assigned,confirmed,done"
+                       states="draft,waiting,confirmed,assigned"
                         context="{'default_use_exist': picking_id.type=='in'}"
                         groups="base.group_extended"/>
                     <field name="tracking_id" groups="base.group_extended"/>
@@ -1606,6 +1612,7 @@
                             <newline/>
                               <label/>
 	                            <button name="%(track_line)d" string="Split in production lots" 
+                               states="draft,waiting,confirmed,assigned"
                               groups="base.group_extended" 
                               type="action" icon="terp-stock_effects-object-colorize"/>
                               <label/>

From b8bc3af4d81819234fda1904ead95f121968ad4d Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Fri, 18 Jun 2010 04:33:08 +0100
Subject: [PATCH 15/15] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100618033308-7p6kb07l11bx3hgc
---
 addons/account/i18n/it.po             |   2 +-
 addons/base_module_quality/i18n/it.po |   2 +-
 addons/board/i18n/nl_BE.po            |   2 +-
 addons/google_map/i18n/ru.po          |   2 +-
 addons/mrp_operations/i18n/hi.po      |   2 +-
 addons/mrp_repair/i18n/hi.po          |   2 +-
 addons/multi_company/i18n/et.po       |   8 +-
 addons/multi_company/i18n/it.po       |   2 +-
 addons/product/i18n/vi.po             |   2 +-
 addons/stock/i18n/es.po               | 125 ++++++++++----------------
 addons/stock/i18n/nl.po               |   2 +-
 addons/stock/i18n/pl.po               |   2 +-
 12 files changed, 60 insertions(+), 93 deletions(-)

diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index d2a543a0a3e..6cb23888049 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 3c18c0ec32e..c804964322a 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index b36d1a918a6..e2c3c12f7ee 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index 04619e44885..a49640e7293 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index 657860cae37..5deebdc4ed1 100644
--- a/addons/mrp_operations/i18n/hi.po
+++ b/addons/mrp_operations/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/hi.po b/addons/mrp_repair/i18n/hi.po
index 6136b1e992a..db96e91247a 100644
--- a/addons/mrp_repair/i18n/hi.po
+++ b/addons/mrp_repair/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/multi_company/i18n/et.po b/addons/multi_company/i18n/et.po
index 960a121dbda..207e057f662 100644
--- a/addons/multi_company/i18n/et.po
+++ b/addons/multi_company/i18n/et.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-08 11:46+0000\n"
-"PO-Revision-Date: 2010-05-07 15:09+0000\n"
-"Last-Translator: lyyser <logard.1961@gmail.com>\n"
+"PO-Revision-Date: 2010-06-17 16:39+0000\n"
+"Last-Translator: Timo Tambet <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-08 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
@@ -61,7 +61,7 @@ msgstr ""
 #. module: multi_company
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr ""
+msgstr "Vaikimisi kompanii"
 
 #. module: multi_company
 #: field:multi_company.default,object_id:0
diff --git a/addons/multi_company/i18n/it.po b/addons/multi_company/i18n/it.po
index 1899d197277..7bafb4a347e 100644
--- a/addons/multi_company/i18n/it.po
+++ b/addons/multi_company/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 93bb2e12631..3b8ccf75ba7 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 563a23a48e9..a7e23b3e396 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-18 13:11+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-06-17 23:43+0000\n"
+"Last-Translator: mikel <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-19 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -30,12 +29,12 @@ msgstr "Ubicación encadenada si fija"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE"
-msgstr "Guardar existencia"
+msgstr "STOCK_SAVE"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_15
 msgid "Sub Products"
-msgstr "Sub Producto"
+msgstr "Sub productos"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -45,7 +44,7 @@ msgstr "terp-account"
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
+msgstr "Nombre de modelo no válido en la definición de la acción."
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -104,7 +103,7 @@ msgstr "Rellenar inventario para una determinada ubicación"
 #: view:stock.picking:0
 #: field:stock.picking.move.wizard,picking_id:0
 msgid "Packing list"
-msgstr "Lista Picking"
+msgstr "Albarán"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -142,7 +141,7 @@ msgstr "Empresa"
 #. module: stock
 #: help:product.product,track_incoming:0
 msgid "Force to use a Production Lot during receptions"
-msgstr "Forzar a usar un lote de producción durante la recepción"
+msgstr "Fuerza a usar un lote de producción durante la recepción"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -160,12 +159,12 @@ msgstr "Lote de producción"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NEW"
-msgstr "Nueva existencia"
+msgstr "STOCK_NEW"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CANCEL"
-msgstr "Cancelar existencia"
+msgstr "STOCK_CANCEL"
 
 #. module: stock
 #: selection:stock.location,usage:0
@@ -190,7 +189,7 @@ msgstr "Valor stock real"
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
-msgstr "UOM"
+msgstr "UdM"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -207,17 +206,17 @@ msgstr "Hacer envíos parciales"
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "Packing result"
-msgstr "Resultado empaquetado"
+msgstr "Resultado albarán"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_QUIT"
-msgstr "Quitar existencias"
+msgstr "STOCK_QUIT"
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr "Localizacion de salidas"
+msgstr "Ubicación de salida"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -278,7 +277,7 @@ msgstr "Empaquetado"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Order(Origin)"
-msgstr "Orden (origen)"
+msgstr "Pedido (origen)"
 
 #. module: stock
 #: rml:lot.location:0
@@ -291,12 +290,12 @@ msgstr "Gran Total"
 #: view:stock.location:0
 #: field:stock.location,comment:0
 msgid "Additional Information"
-msgstr "Información Adicional"
+msgstr "Información adicional"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Refund"
-msgstr "Reembolso del cliente"
+msgstr "Factura rectificativa (abono) de cliente"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -350,12 +349,12 @@ msgstr "Clientes"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDERLINE"
-msgstr "Existencia bajo lineas"
+msgstr "STOCK_UNDERLINE"
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
 msgid "Move Lines"
-msgstr "Líneas de movimiento"
+msgstr "Líneas movimiento"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
@@ -401,7 +400,7 @@ msgstr "terp-graph"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PREFERENCES"
-msgstr "Existencias prioritarias"
+msgstr "STOCK_PREFERENCES"
 
 #. module: stock
 #: rml:lot.location:0
@@ -420,7 +419,7 @@ msgstr "Procesar ahora"
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr "Dirección de la ubicación"
+msgstr "Dirección ubicación"
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
@@ -451,7 +450,7 @@ msgstr "Propiedades de stock"
 #. module: stock
 #: wizard_button:stock.partial_picking,init,split:0
 msgid "Make Picking"
-msgstr "Empaquetar"
+msgstr "Realizar albarán"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
@@ -477,7 +476,7 @@ msgstr "Id producto"
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Ventas & Compras"
+msgstr "Ventas y Compras"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
@@ -558,12 +557,12 @@ msgstr "Reporte de inventario por lotes de producción"
 #. module: stock
 #: field:stock.location,stock_virtual:0
 msgid "Virtual Stock"
-msgstr "Existencia virtual"
+msgstr "Stock virtual"
 
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "View"
-msgstr "Ver"
+msgstr "Vista"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -594,7 +593,7 @@ msgstr "STOCK_GOTO_BOTTOM"
 #: model:ir.actions.act_window,name:stock.action_picking_form
 #: model:ir.ui.menu,name:stock.menu_action_picking_form
 msgid "New Reception Packing"
-msgstr "Nueva recepcion de paquete"
+msgstr "Nuevo albarán de entrada"
 
 #. module: stock
 #: wizard_field:stock.move.track,init,quantity:0
@@ -607,7 +606,7 @@ msgstr "Cantidad por lote"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Stock Moves"
-msgstr "Movimientos de existencias"
+msgstr "Movimientos de stock"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
@@ -647,7 +646,7 @@ msgstr "STOCK_DIALOG_QUESTION"
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
-msgstr "Manual de operación"
+msgstr "Operación manual"
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -750,7 +749,7 @@ msgstr "Revisiones de lote de producción"
 #. module: stock
 #: view:stock.picking:0
 msgid "Packing Done"
-msgstr "Paquete realizado"
+msgstr "Albarán realizado"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -764,7 +763,7 @@ msgstr "En espera"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree7
 #: model:ir.ui.menu,name:stock.menu_picking_waiting
 msgid "Available Packing"
-msgstr "Empaquetado disponible"
+msgstr "Albarán disponible"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
@@ -817,7 +816,7 @@ msgstr "STOCK_CONNECT"
 #: model:ir.ui.menu,name:stock.menu_action_picking_all
 #: wizard_field:stock.picking.make,init,pickings:0
 msgid "Packing"
-msgstr "Empaquetado/Albarán"
+msgstr "Albarán"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -923,7 +922,7 @@ msgstr "Fecha creación"
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
-msgstr "Enviar mercancías"
+msgstr "Envío mercancías"
 
 #. module: stock
 #: view:stock.picking:0
@@ -990,7 +989,7 @@ msgstr "STOCK_APPLY"
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "The packing has been successfully made !"
-msgstr "¡El paquete ha sido realizado correctamente!"
+msgstr "¡El albarán ha sido realizado correctamente!"
 
 #. module: stock
 #: field:stock.move,address_id:0
@@ -1133,7 +1132,7 @@ msgstr "STOCK_HARDDISK"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "Paquete relacionado"
+msgstr "Albarán relacionado"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1177,7 +1176,7 @@ msgstr "STOCK_COPY"
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Refund"
-msgstr "Factura de abono de proveedor"
+msgstr "Factura rectificativa (abono) de proveedor"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1193,7 +1192,7 @@ msgstr "Cuenta salida stock"
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr "Automático paso no añadido"
+msgstr "Mov. automático, paso no añadido"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
@@ -1302,7 +1301,7 @@ msgstr "Método entrega"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.partial_picking
 msgid "Partial packing"
-msgstr "Empaquetado parcial"
+msgstr "Albarán parcial"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1589,7 +1588,7 @@ msgstr "Cantidad (UdV)"
 #: model:ir.actions.act_window,name:stock.action_picking_tree5
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree5
 msgid "Packing to Process"
-msgstr "Paquetes a procesar"
+msgstr "Albaranes a procesar"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1599,7 +1598,7 @@ msgstr "STOCK_MEDIA_STOP"
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
-msgstr "Fijar disponible"
+msgstr "Cambiar a disponible"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.make_picking
@@ -1803,13 +1802,13 @@ msgstr "Altura (Z)"
 #: field:stock.inventory.line,product_uom:0
 #: field:stock.move,product_uom:0
 msgid "Product UOM"
-msgstr "UdM del producto"
+msgstr "UdM producto"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Variants"
-msgstr "Variante"
+msgstr "Variantes"
 
 #. module: stock
 #: field:stock.location,posx:0
@@ -1936,8 +1935,9 @@ msgstr ""
 "Se utiliza sólo si selecciona un tipo de ubicación encadenada.\n"
 "La opción 'Movimiento automático' creará un movimiento de stock después del "
 "actual que se validará automáticamente. Con 'Operación manual', el "
-"movimiento de stock debe ser validado por un trabajador. Con 'Automático "
-"paso no añadido', la ubicación se reemplaza en el movimiento original."
+"movimiento de stock debe ser validado por un trabajador. Con 'Mov. "
+"automático, paso no añadido', la ubicación se reemplaza en el movimiento "
+"original."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -2190,7 +2190,7 @@ msgstr "STOCK_JUSTIFY_CENTER"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8
 msgid "Confirmed Packing Waiting Availability"
-msgstr "Paquete confirmado esperando disponibilidad"
+msgstr "Albarán confirmado esperando disponibilidad"
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -2309,7 +2309,7 @@ msgstr "Cerrar"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Print Item Labels"
-msgstr "Imprimir etiquetas de elementos"
+msgstr "Imprimir etiquetas"
 
 #. module: stock
 #: view:stock.move:0
@@ -2428,36 +2428,3 @@ msgstr "Estado de movimientos"
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
 msgstr "Ubicaciones físicas"
-
-#~ msgid ""
-#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
-#~ "structured stock locations.\n"
-#~ "Thanks to the double entry management, the inventory controlling is powerful "
-#~ "and flexible:\n"
-#~ "* Moves history and planning,\n"
-#~ "* Different inventory methods (FIFO, LIFO, ...)\n"
-#~ "* Stock valuation (standard or average price, ...)\n"
-#~ "* Robustness faced with Inventory differences\n"
-#~ "* Automatic reordering rules (stock level, JIT, ...)\n"
-#~ "* Bar code supported\n"
-#~ "* Rapid detection of mistakes through double entry system\n"
-#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
-#~ "    "
-#~ msgstr ""
-#~ "El módulo de gestión de stocks de OpenERP puede gestionar multi-almacenes y "
-#~ "multi-ubicaciones jerárquicas de stock.\n"
-#~ "Gracias a la gestión de partida doble, el control de inventario es potente y "
-#~ "flexible:\n"
-#~ "* Historial de movimientos y planificación,\n"
-#~ "* Métodos de inventario diferentes (FIFO, LIFO ...)\n"
-#~ "* Valoración de existencias (estándar o precio medio ...)\n"
-#~ "* Robustez frente a las diferencias de inventario\n"
-#~ "* Reglas automáticas de abastecimiento (nivel de stock mínimo, JIT ...)\n"
-#~ "* Soporte a código de barras\n"
-#~ "* Detección rápida de errores a través de sistema de partida doble\n"
-#~ "* Trazabilidad (hacia arriba/abajo, lotes de producción, número de serie "
-#~ "...)\n"
-#~ "    "
-
-#~ msgid "Stock Management"
-#~ msgstr "Gestión de inventario"
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index bc826ef796d..b23167068e2 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 95d22fcaa6c..bf7f8757a7b 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock