From 1789873eb305463647f14c0403e2c97e4c6a8633 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 5 Nov 2012 18:39:28 +0530
Subject: [PATCH 01/33] [IMP] rename supplier_invoice_number into Partner
 Reference

bzr revid: fka@tinyerp.com-20121105130928-vptvbbyh8w7thfc1
---
 addons/account/account_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index b01fc974bef..19bf90b9f2e 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -185,7 +185,7 @@ class account_invoice(osv.osv):
     _columns = {
         'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}),
-        'supplier_invoice_number': fields.char('Supplier Invoice Number', size=64, help="The reference of this invoice as provided by the supplier.", readonly=True, states={'draft':[('readonly',False)]}),
+        'supplier_invoice_number': fields.char('Partner Reference', size=64, help="The reference of this invoice as provided by the supplier.", readonly=True, states={'draft':[('readonly',False)]}),
         'type': fields.selection([
             ('out_invoice','Customer Invoice'),
             ('in_invoice','Supplier Invoice'),

From bbaa542a59bcd371fb037d748a13944f294cf350 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 5 Nov 2012 18:54:21 +0530
Subject: [PATCH 02/33] [IMP] rename into Payment Reference instead of Partner
 Reference in reference field

bzr revid: fka@tinyerp.com-20121105132421-alga34gdadubaz9a
---
 addons/account/account_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 19bf90b9f2e..9a746ba4845 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -195,7 +195,7 @@ class account_invoice(osv.osv):
 
         'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
         'internal_number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
-        'reference': fields.char('Invoice Reference', size=64, help="The partner reference of this invoice."),
+        'reference': fields.char('Invoice Reference', size=64, help="The Payment Reference of this invoice."),
         'reference_type': fields.selection(_get_reference_type, 'Payment Reference',
             required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'comment': fields.text('Additional Information'),

From fda1c3808b76e310c8b6192d1bf5d77aeb8fd0c7 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 5 Nov 2012 19:06:06 +0530
Subject: [PATCH 03/33] [IMP] remove groups

bzr revid: fka@tinyerp.com-20121105133606-p01xuppexwpcc250
---
 addons/account/account_invoice_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 2f722d07aeb..4feb97c2f5f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -168,10 +168,8 @@
                               context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
                               domain="[('supplier', '=', True)]"/>
                             <field name="fiscal_position" widget="selection"/>
-                            <group>
-                                <field name="origin"/>
-                                <field name="supplier_invoice_number"/>
-                            </group>
+                            <field name="origin"/>
+                            <field name="supplier_invoice_number"/>
                             <label for="reference_type"/>
                             <div>
                                 <field name="reference_type" class="oe_inline oe_edit_only"/>

From 031270611df1a971294266fb32aae2247c150211 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 6 Nov 2012 12:08:05 +0530
Subject: [PATCH 04/33] [IMP] stock: pass product_id to set related product in
 serial number form.

bzr revid: tpa@tinyerp.com-20121106063805-boh9w9rcpyk8yr2t
---
 addons/stock/wizard/stock_change_product_qty_view.xml | 2 +-
 addons/stock/wizard/stock_partial_picking_view.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index 20114301ab2..51639aca103 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -10,7 +10,7 @@
                         <field name="new_quantity" />
                         <field name="product_id" invisible="1"/>
                         <field name="location_id" groups="stock.group_locations"/>
-                        <field name="prodlot_id" groups="stock.group_tracking_lot"/>
+                        <field name="prodlot_id" context="{'product_id':product_id}" groups="stock.group_tracking_lot"/>
                     </group>
                     <footer>
                         <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 98f599da48b..5d43b4d9508 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -23,7 +23,7 @@
                             <field name="quantity" />
                             <field name="product_uom" groups="product.group_uom"/>
                             <field name="tracking" invisible="1"/>
-                            <field name="prodlot_id" domain="[('product_id', '=', product_id)]" invisible="context.get('hide_tracking',False)" attrs="{'required':[('tracking','=',True)]}" groups="stock.group_production_lot"/>
+                            <field name="prodlot_id" context="{'product_id':product_id}" domain="[('product_id', '=', product_id)]" invisible="context.get('hide_tracking',False)" attrs="{'required':[('tracking','=',True)]}" groups="stock.group_production_lot"/>
                             <!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
                             <field name="update_cost" invisible="1"/>
                             <field name="cost"  invisible="1"/>

From d3de140d40954dc0e669c9ece65bdcfa387cc28d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 6 Nov 2012 15:01:33 +0530
Subject: [PATCH 05/33] [FIX] On changing customer/supplier/partner in delivery
 orders/incoming shipments/internal moves respectively,gives traceback.

bzr revid: tpa@tinyerp.com-20121106093133-aenwqy71020gtydc
---
 addons/stock/stock.py     |  2 +-
 addons/warning/warning.py | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9fb0c9b68aa..aef7d98c488 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -730,7 +730,7 @@ class stock_picking(osv.osv):
                 model,view_id = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
         return super(stock_picking,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
 
-    def onchange_partner_in(self, cr, uid, context=None, partner_id=None):
+    def onchange_partner_in(self, cr, uid, ids, partner_id=None, context=None):
         return {}
 
     def action_explode(self, cr, uid, moves, context=None):
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 9e6c2a0a2b8..f917c039d62 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -149,7 +149,7 @@ account_invoice()
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
 
-    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+    def onchange_partner_in(self, cr, uid, ids, partner_id=None, context=None):
         if not partner_id:
             return {}
         partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
@@ -165,7 +165,7 @@ class stock_picking(osv.osv):
                 'title': title,
                 'message': message
             }
-        result =  super(stock_picking, self).onchange_partner_in(cr, uid, context, partner_id)
+        result =  super(stock_picking, self).onchange_partner_in(cr, uid, ids, partner_id, context)
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
@@ -179,7 +179,7 @@ stock_picking()
 class stock_picking_in(osv.osv):
     _inherit = 'stock.picking.in'
 
-    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+    def onchange_partner_in(self, cr, uid, ids, partner_id=None, context=None):
         if not partner_id:
             return {}
         partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
@@ -195,7 +195,7 @@ class stock_picking_in(osv.osv):
                 'title': title,
                 'message': message
             }
-        result =  super(stock_picking_in, self).onchange_partner_in(cr, uid, context, partner_id)
+        result =  super(stock_picking_in, self).onchange_partner_in(cr, uid, ids, partner_id, context)
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
@@ -205,7 +205,7 @@ class stock_picking_in(osv.osv):
 class stock_picking_out(osv.osv):
     _inherit = 'stock.picking.out'
 
-    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+    def onchange_partner_in(self, cr, uid, ids, partner_id=None, context=None):
         if not partner_id:
             return {}
         partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
@@ -221,7 +221,7 @@ class stock_picking_out(osv.osv):
                 'title': title,
                 'message': message
             }
-        result =  super(stock_picking_out, self).onchange_partner_in(cr, uid, context, partner_id)
+        result =  super(stock_picking_out, self).onchange_partner_in(cr, uid, ids, partner_id, context)
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']

From a20daf7dfb4673099a38c22c8da41361bf93f59b Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 6 Nov 2012 15:01:57 +0530
Subject: [PATCH 06/33] [Fix]: Rename in delivery report

bzr revid: aja@tinyerp.com-20121106093157-2hnhhv4murw4b9mh
---
 addons/stock/report/picking.rml | 6 +++---
 addons/stock/stock_report.xml   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 5f395c9f005..48aa5cffba0 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -201,7 +201,7 @@
           <para style="terp_tblheader_General_Centre">Recipient</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Expected Shipping Date </para>
+          <para style="terp_tblheader_General_Centre">Scheduled Date</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Weight</para>
@@ -236,10 +236,10 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Lot</para>
+          <para style="terp_tblheader_Details_Centre">Serial Number</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Status</para>
+          <para style="terp_tblheader_Details_Centre">State</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Location</para>
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 540e6a8f902..c548317a3ba 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -3,7 +3,7 @@
     <data>
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Stock Level Forecast"/>
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking Slip" rml="stock/report/picking.rml"/>
-        <report id="report_picking_list_in" model="stock.picking.in" name="stock.picking.list" string="Receipt Slip" rml="stock/report/picking.rml"/>
+        <report id="report_picking_list_in" model="stock.picking.in" name="stock.picking.list" string="Delivery Slip" rml="stock/report/picking.rml"/>
         <report id="report_picking_list_out" model="stock.picking.out" name="stock.picking.list" string="Delivery Slip" rml="stock/report/picking.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Inventory Overview" rml="stock/report/lot_overview.rml"/>

From c8bf3916770ffada70ff380bcf8946e722eff54f Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 6 Nov 2012 15:09:04 +0530
Subject: [PATCH 07/33] [IMP] remove tab & change Account template form view

bzr revid: fka@tinyerp.com-20121106093904-x9g8pdd2wsxbc97x
---
 addons/account/account_view.xml | 37 ++++++++++++++-------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 19128b42d6e..3a0d1ec4e72 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2074,28 +2074,23 @@
             <field name="model">account.account.template</field>
             <field name="arch" type="xml">
                 <form string="Account Template" version="7.0">
-                    <notebook>
-                        <page string="General Information">
-                            <group col="4">
-                                <field name="name"/>
-                                <field name="code"/>
-                                <newline/>
-                                <field name="parent_id"/>
-                                <field name="shortcut"/>
-                                <field name="type"/>
-                                <field name="user_type"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="code"/>
+                        <newline/>
+                        <field name="parent_id"/>
+                        <field name="shortcut"/>
+                        <field name="type"/>
+                        <field name="user_type"/>
 
-                                <field name="currency_id" groups="base.group_multi_currency"/>
-                                <field name="reconcile"/>
-                                <field name="chart_template_id"/>
-                            </group>
-                            <separator string="Default Taxes"/>
-                            <field name="tax_ids"/>
-                        </page>
-                        <page string="Notes">
-                            <field name="note"/>
-                        </page>
-                    </notebook>
+                        <field name="currency_id" groups="base.group_multi_currency"/>
+                        <field name="reconcile"/>
+                        <field name="chart_template_id"/>
+                    </group>
+                    <separator string="Default Taxes"/>
+                    <field name="tax_ids"/>
+                    <separator string="Notes"/>
+                    <field name="note"/>
                 </form>
             </field>
         </record>

From c684d4d8e276369d96e842b295fe2485dc049cc5 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 6 Nov 2012 15:16:50 +0530
Subject: [PATCH 08/33] [IMP] stock:improve typo

bzr revid: tpa@tinyerp.com-20121106094650-a11a7qwl2lm96ou3
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c63c385967e..f90d011829f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1246,7 +1246,7 @@
                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                             <field name="date" groups="base.group_no_one"/>
                         </group>
-                        <group string="Tracability"
+                        <group string="Traceability"
                             groups="stock.group_tracking_lot">
                             <label for="tracking_id" groups="stock.group_tracking_lot"/>
                             <div groups="stock.group_tracking_lot">

From 09791c2676d3141045d1e24f40a98807f3b671d3 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 6 Nov 2012 15:33:00 +0530
Subject: [PATCH 09/33] [FIX] Its not possible to search records by
 Reference/Source fields from stock moves list view.

bzr revid: tpa@tinyerp.com-20121106100300-bknvkfwujg1xea4h
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f90d011829f..d9c78705cc1 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1352,7 +1352,7 @@
             <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <field name="origin" domain="['|',('origin','ilike',self),('picking_id','ilike',self)]" string="Reference"/>
+                    <field name="origin" string="Reference"/>
                     <field name="date" groups="base.group_no_one"/>
 
                     <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>

From 7c263eb8b6c3c5a5b007458ac72caf809caf171c Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 6 Nov 2012 15:42:13 +0530
Subject: [PATCH 10/33] [REM]: Remove  recipient from report

bzr revid: aja@tinyerp.com-20121106101213-kvn880ory0bmmdpx
---
 addons/stock/report/picking.rml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 48aa5cffba0..1fc798fe5a4 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -162,12 +162,12 @@
           <para style="terp_default_Bold_9">Customer Address : [[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para>
           <para style="terp_default_Bold_9">Warehouse Address : [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
           <para style="terp_default_9">[[ (picking.partner_id and picking.partner_id.id and picking.partner_id.title.name) or '' ]] [[ picking.partner_id and picking.partner_id.id and picking.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id,'delivery') ]]</para>
+          <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Contact Address :</para>
           <para style="terp_default_9">[[ picking.partner_id and picking.partner_id.title.name or '' ]] [[ picking.partner_id and picking.partner_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id,'default') ]] </para>
+          <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]] </para>
         </td>
       </tr>
     </blockTable>
@@ -189,7 +189,7 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="100.0,100.0,108.0,107.0,109.0" style="Header_Order_Reference_Tbl">
+    <blockTable colWidths="100.0,154.0,161.0,109.0" style="Header_Order_Reference_Tbl">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Journal</para>
@@ -198,17 +198,14 @@
           <para style="terp_tblheader_General_Centre">Order(Origin)</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Recipient</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Scheduled Date</para>
+          <para style="terp_tblheader_General_Centre">Schedule Date</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Weight</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="100.0,100.0,108.0,107.0,109.0" style="Content_Order_Reference_Table">
+    <blockTable colWidths="100.0,154.0,162.0,109.0" style="Content_Order_Reference_Table">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ picking.stock_journal_id.name]]</para>
@@ -216,9 +213,6 @@
         <td>
           <para style="terp_default_Centre_8">[[ picking.origin or '']]</para>
         </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ (picking.partner_id and picking.partner_id.title.name) or '' ]] [[ (picking.partner_id and picking.partner_id.name) or '' ]] </para>
-        </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
         </td>

From 6293aa38a4d56a57557ee2dc7893f5ff88be2b35 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 6 Nov 2012 16:05:23 +0530
Subject: [PATCH 11/33] [ADD]: Add email or phone of partner in address

bzr revid: aja@tinyerp.com-20121106103523-l0eb673k56dnzsjq
---
 addons/stock/report/picking.rml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 1fc798fe5a4..4e4abb72b0e 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -163,11 +163,13 @@
           <para style="terp_default_Bold_9">Warehouse Address : [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
           <para style="terp_default_9">[[ (picking.partner_id and picking.partner_id.id and picking.partner_id.title.name) or '' ]] [[ picking.partner_id and picking.partner_id.id and picking.partner_id.name ]]</para>
           <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]]</para>
+          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Contact Address :</para>
           <para style="terp_default_9">[[ picking.partner_id and picking.partner_id.title.name or '' ]] [[ picking.partner_id and picking.partner_id.name or '' ]]</para>
           <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]] </para>
+          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email]]</para>
         </td>
       </tr>
     </blockTable>

From d421c189faa5d4fc5c38c2a41e4873c7afd3a84f Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 6 Nov 2012 16:58:44 +0530
Subject: [PATCH 12/33] [IMP] make changes into purchase as per requirement

bzr revid: rma@tinyerp.com-20121106112844-wt4xnn3o90w08pxk
---
 addons/purchase/purchase.py       | 5 ++++-
 addons/purchase/purchase_view.xml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 53e70dd4fb7..c5bf1ac78af 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -220,7 +220,7 @@ class purchase_order(osv.osv):
     _defaults = {
         'date_order': fields.date.context_today,
         'state': 'draft',
-        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order'),
+        'name': lambda obj, cr, uid, context: '/',
         'shipped': 0,
         'invoice_method': 'order',
         'invoiced': 0,
@@ -237,6 +237,9 @@ class purchase_order(osv.osv):
     _order = "name desc"
 
     def create(self, cr, uid, vals, context=None):
+        if ('name' not in vals) or (vals.get('name')=='/'):
+            seq_obj_name =  self._name
+            vals['name'] = self.pool.get('ir.sequence').get(cr, uid, seq_obj_name)
         order =  super(purchase_order, self).create(cr, uid, vals, context=context)
         if order:
             self.create_send_note(cr, uid, [order], context=context)
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 7e94a0b5a8e..9d3af517c4a 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -263,7 +263,7 @@
                             </group>
                             <div class="oe_clear"/>
                             <label for="notes"/>
-                            <field name="notes" class="oe_inline"/>
+                            <field name="notes"/>
                         </page>
                         <page string="Incoming Shipments &amp; Invoices">
                             <group>

From 23f864cbb94e8ca6edc0f0bc3242304ddd971524 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 6 Nov 2012 17:04:11 +0530
Subject: [PATCH 13/33] [IMP] make correct format for quotation request report

bzr revid: rma@tinyerp.com-20121106113411-zc3sh455k4i43wx2
---
 addons/purchase/report/request_quotation.rml | 71 +++++++++++---------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 66fd58060b8..8cb848f8557 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="Request for Quotation.pdf">
-  <template title="Request for Quotation" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="18.0" y1="42.0" width="535" height="758"/>
+      <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,7 +10,11 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Address_Detail">
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
@@ -33,6 +37,7 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -69,30 +74,26 @@
     <images/>
   </stylesheet>
   <story>
-  <pto>
-  <pto_header>
-    <blockTable colWidths="371.0,98.0,61.0" repeatRows="1" style="Table_Product_Header_Title">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Expected Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Qty</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
     <para style="terp_default_9">[[repeatIn(objects,'order')]]</para>
     <para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para>
-    <blockTable colWidths="250.0,59.0,221.0" style="Table_Address_Detail">
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="250.0,59.0,221.0" style="Tableau1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Expected Delivery address:</para>
-          <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
-          <para style="terp_default_9">[[ order.dest_address_id and display_address(order.dest_address_id) ]] </para>
+          <blockTable colWidths="250.0" style="Tableau2">
+            <tr>
+              <td>
+                <para style="terp_default_Bold_9">Expected Delivery address:</para>
+                <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
+                <para style="P1">[[ order.dest_address_id and display_address(order.dest_address_id) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
           <para style="terp_default_9">
@@ -100,18 +101,18 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ display_address(order.partner_id) ]] </para>
+          <para style="terp_default_9">[[ (order .partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ (order .partner_id and order.partner_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ order.partner_id and display_address(order .partner_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tel.: [[ (order.partner_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax: [[ (order.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">TVA: [[ (order.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Tel.: [[ (order.partner_id and order.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax: [[ (order.partner_id and order.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="P1">TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
     <para style="terp_header">Request for Quotation : [[order.name]]</para>
@@ -132,7 +133,7 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_2">[[repeatIn(order.order_line,'order_line')]]</para>
+      <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para>
       <blockTable colWidths="370.0,100.0,39.0,20.0" style="Table_Product_Line">
         <tr>
           <td>
@@ -148,6 +149,11 @@
             <para style="terp_default_Right_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para>
           </td>
         </tr>
+        <tr>
+          <td>
+            <para style="terp_default_8_italic">[[ format(order_line.notes or removeParentNode('tr')) ]]</para>
+          </td>
+        </tr>
       </blockTable>
     </section>
     <para style="terp_default_9">
@@ -165,6 +171,5 @@
       <font color="white"> </font>
     </para>
     <para style="terp_default_9">[[ user.signature or '' ]]</para>
-  </pto>
   </story>
-</document>
\ No newline at end of file
+</document>

From 6f4d8e1408b6831015b146908edc7a54cc2b56ca Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 6 Nov 2012 19:06:16 +0530
Subject: [PATCH 14/33] [IMP] add the view_invoice field in purchase order

bzr revid: rma@tinyerp.com-20121106133616-qq1cg1o25l1uzn97
---
 addons/purchase/purchase.py       | 25 +++++++++++++++++++++++--
 addons/purchase/purchase_view.xml |  7 +++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index c5bf1ac78af..e5eeb545ba1 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -189,7 +189,7 @@ class purchase_order(osv.osv):
         'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'),
         'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"),
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
-        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,
+        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]},
             help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n" \
                 "Based on generated invoice: create a draft invoice you can validate later.\n" \
                 "Bases on incoming shipments: let you create an invoice when receptions are validated."
@@ -214,7 +214,7 @@ class purchase_order(osv.osv):
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
         'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
         'create_uid':  fields.many2one('res.users', 'Responsible'),
-        'company_id': fields.many2one('res.company','Company',required=True,select=1),
+        'company_id': fields.many2one('res.company','Company',required=True,select=1, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal'),
     }
     _defaults = {
@@ -504,7 +504,28 @@ class purchase_order(osv.osv):
         if res:
             self.invoice_send_note(cr, uid, ids, res, context)
         return res
+    def action_view_invoice(self, cr, uid, ids, context=None):
+        '''
+        This function returns an action that display existing invoices of given sale order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
+        '''
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
 
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree1')
+        id = result and result[1] or False
+        result = act_obj.read(cr, uid, [id], context=context)[0]
+        #compute the number of invoices to display
+        inv_ids = []
+        for po in self.browse(cr, uid, ids, context=context):
+            inv_ids += [invoice.id for invoice in po.invoice_ids]
+        #choose the view_mode accordingly
+        if len(inv_ids)>1:
+            result['domain'] = "[('id','in',["+','.join(map(str, inv_ids))+"])]"
+        else:
+            res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
+            result['views'] = [(res and res[1] or False, 'form')]
+            result['res_id'] = inv_ids and inv_ids[0] or False
+        return result
     def invoice_done(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'approved'}, context=context)
         self.invoice_done_send_note(cr, uid, ids, context=context)
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9d3af517c4a..cc39e75af30 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -208,6 +208,8 @@
                     <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
+                    <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}"
+                             groups="base.group_user"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
                     <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,sent,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
@@ -262,8 +264,7 @@
                                 <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                             </group>
                             <div class="oe_clear"/>
-                            <label for="notes"/>
-                            <field name="notes"/>
+                            <field name="notes" class="oe_inline" placeholder="Terms and conditions..."/>
                         </page>
                         <page string="Incoming Shipments &amp; Invoices">
                             <group>
@@ -282,8 +283,6 @@
                                     <field name="date_approve" groups="base.group_no_one"/>
                                 </group>
                             </group>
-                            <separator string="Invoices"/>
-                            <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
                         </page>
                     </notebook>
                 </sheet>

From a4c321e6892dcf2a6e13021070a1e24584290fcd Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 7 Nov 2012 10:39:33 +0530
Subject: [PATCH 15/33] [REM]:Remove whitespace from product description code
 in bracket

bzr revid: aja@tinyerp.com-20121107050933-iu856szkvo6pekjk
---
 addons/stock/report/picking.py  | 4 ++++
 addons/stock/report/picking.rml | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 29a53fba7a2..2956c5954eb 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -29,7 +29,11 @@ class picking(report_sxw.rml_parse):
         super(picking, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
+            'get_productdesc':self.get_productdesc
         })
+    def get_productdesc(self,code):
+        code = '[' + code.product_id.default_code + ']'
+        return [code]
 
 report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 4e4abb72b0e..688f879f14e 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -251,7 +251,8 @@
       <blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
-            <para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </para>
+            <para style="terp_default_2">[[ repeatIn(get_productdesc(move_lines),'desc') ]]</para>
+            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ desc ]] </font><font>[[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font></para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>

From 3e4fd766c6e1e4a0bdd1fd2645484d45a2711619 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 7 Nov 2012 11:14:33 +0530
Subject: [PATCH 16/33] [IMP] remove menu Customers / Journal Items

bzr revid: fka@tinyerp.com-20121107054433-gyd4q4fqncmm70pl
---
 addons/account/test/account_validate_account_move.yml | 10 +++++-----
 addons/account/wizard/account_move_journal_view.xml   | 11 -----------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index df58da6dfea..188df14c234 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -32,8 +32,8 @@
     import time
     date = self._get_date(cr, uid, {'lang': u'en_US', 'normal_view': False, 'active_model': 'ir.ui.menu',
       'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'journal_id': 1, 'view_mode': False,
-      'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_eaction_account_moves_sale')],
-      'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')})
+      'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_action_account_moves_all')],
+      'search_default_posted': 0, 'active_id': ref('menu_action_account_moves_all')})
     partner = self.onchange_partner_id(cr, uid, [], False, ref('base.res_partner_12'), ref('account.cash'), debit=0, credit=2000, date=date, journal=False)
     account = self.onchange_account_id(cr, uid, [], account_id=ref('account.a_recv'), partner_id= ref('base.res_partner_12'))
     vals = {
@@ -62,11 +62,11 @@
   !python {model: account.move.line}: |
     ids = self._balance_search(cr, uid, self, 'balance', [('balance', '=', 2000.0)], None, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
     'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False, 'visible_id': 1,
-    'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')})
+    'active_ids': [ref('menu_action_account_moves_all')], 'search_default_posted': 0, 'active_id': ref('menu_action_account_moves_all')})
     bal = self._balance(cr, uid, ids[0][2], 'balance', None,{'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
       'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False,
-      'visible_id': 1, 'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0,
-      'active_id': ref('menu_eaction_account_moves_sale')})
+      'visible_id': 1, 'active_ids': [ref('menu_action_account_moves_all')], 'search_default_posted': 0,
+      'active_id': ref('menu_action_account_moves_all')})
     assert bal, 'Balance has not been computed correctly'
 -
   I check that Initially account move state is "Draft"
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 17250e74c9d..80ebbe47f95 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -12,17 +12,6 @@
             </field>
         </record>
 
-        <record id="action_account_moves_sale" model="ir.actions.act_window">
-            <field name="name">Journal Items</field>
-            <field name="res_model">account.move.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'sale','view_mode':False}</field>
-            <field name="target">new</field>
-            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account receivable".</field>
-        </record>
-        <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale"
-            parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/>
 
         <record id="action_account_moves_purchase" model="ir.actions.act_window">
             <field name="name">Journal Items</field>

From 527b02bc1a43b91e0a79493ea88553f22bfa0625 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 7 Nov 2012 11:25:00 +0530
Subject: [PATCH 17/33] [IMP] remove menu Supplier/Journal Items

bzr revid: fka@tinyerp.com-20121107055500-3k49sa0i116naklp
---
 .../account/wizard/account_move_journal_view.xml  | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 80ebbe47f95..dcec50598e0 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -13,21 +13,6 @@
         </record>
 
 
-        <record id="action_account_moves_purchase" model="ir.actions.act_window">
-            <field name="name">Journal Items</field>
-            <field name="res_model">account.move.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'purchase','view_mode':False}</field>
-            <field name="target">new</field>
-            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
-        </record>
-        <menuitem action="action_account_moves_purchase"
-            id="menu_eaction_account_moves_purchase"
-            parent="menu_finance_payables"
-            icon="STOCK_JUSTIFY_FILL"
-            sequence="16"
-            groups="group_account_user,group_account_manager"/>
 
         <record id="action_account_moves_bank" model="ir.actions.act_window">
             <field name="name">Journal Items</field>

From ab92877f406250cfa8e1a1f9e3cd2cc64e06bd6f Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 7 Nov 2012 11:39:12 +0530
Subject: [PATCH 18/33] [IMP]: Improve code in delivery report

bzr revid: aja@tinyerp.com-20121107060912-qyrl4zgoqnbvwbjy
---
 addons/stock/report/picking.py  | 10 ++++++----
 addons/stock/report/picking.rml |  7 ++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 2956c5954eb..71a45b06a35 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -29,11 +29,13 @@ class picking(report_sxw.rml_parse):
         super(picking, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
-            'get_productdesc':self.get_productdesc
+            'get_product_desc':self.get_product_desc
         })
-    def get_productdesc(self,code):
-        code = '[' + code.product_id.default_code + ']'
-        return [code]
+    def get_product_desc(self,move_line):
+        desc = move_line.product_id.name
+        if move_line.product_id.default_code:
+            desc = '[' + move_line.product_id.default_code + ']' + ' ' + desc
+        return [desc]
 
 report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 688f879f14e..dfb202b75ff 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -251,8 +251,8 @@
       <blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
-            <para style="terp_default_2">[[ repeatIn(get_productdesc(move_lines),'desc') ]]</para>
-            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ desc ]] </font><font>[[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font></para>
+            <para style="terp_default_2">[[ repeatIn(get_product_desc(move_lines),'desc') ]]</para>
+            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ desc ]] </font></para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
@@ -277,7 +277,8 @@
       <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Table1">
         <tr>
           <td>
-            <para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para>
+           <para style="terp_default_2">[[ repeatIn(get_product_desc(move_lines),'desc') ]]</para>
+            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ desc ]] </font></para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>

From 60d0aaf197e2896b9ac55ed0626823d8307c153c Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 7 Nov 2012 11:47:59 +0530
Subject: [PATCH 19/33] [IMP] remove menu Bank & Cash/Journal Items to
 Reconcile

bzr revid: fka@tinyerp.com-20121107061759-8c9tx71iphqty2qs
---
 addons/account/account_view.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 3a0d1ec4e72..83d7234352d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1549,12 +1549,6 @@
                 </p>
             </field>
         </record>
-        <menuitem
-             name="Journal Items to Reconcile"
-             action="action_account_manual_reconcile"
-             id="menu_manual_reconcile_bank"
-             sequence="20"
-             parent="account.menu_finance_bank_and_cash"/>
 
         <menuitem
              name="Manual Reconciliation"

From 2bf1f7cbf6610d286e46274e26cb9bd03d15318e Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 7 Nov 2012 11:52:27 +0530
Subject: [PATCH 20/33] [IMP] remove menu Bank & Cash/Journal Items

bzr revid: fka@tinyerp.com-20121107062227-z2jhpbtmo4uyl139
---
 .../wizard/account_move_journal_view.xml      | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index dcec50598e0..5d80cf319c5 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -12,25 +12,5 @@
             </field>
         </record>
 
-
-
-        <record id="action_account_moves_bank" model="ir.actions.act_window">
-            <field name="name">Journal Items</field>
-            <field name="res_model">account.move.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'bank','view_mode':False}</field>
-            <field name="target">new</field>
-            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments.</field>
-        </record>
-
-        <menuitem
-            action="action_account_moves_bank"
-            icon="STOCK_JUSTIFY_FILL"
-            id="menu_action_account_moves_bank"
-            parent="account.menu_finance_bank_and_cash"
-            sequence="16"
-            groups="group_account_user,group_account_manager"
-        />
     </data>
 </openerp>

From c218cdbf5151763d77cead3da668b37cd3887c86 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 7 Nov 2012 12:04:07 +0530
Subject: [PATCH 21/33] [IMP] remove menu Periodical Processing/Recurring
 Entries/Manual Recurring

bzr revid: fka@tinyerp.com-20121107063407-62cijw8g4ordrp4b
---
 addons/account/wizard/account_use_model_view.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 7e3e70af202..8d1445f0f90 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -19,18 +19,6 @@
             </field>
         </record>
 
-        <record id="action_view_account_use_model" model="ir.actions.act_window">
-            <field name="name">Manual Recurring</field>
-            <field name="res_model">account.use.model</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-               <field name="view_id" ref="view_account_use_model"/>
-               <field name="target">new</field>
-               <field name="context">{'model_line':'model_line'}</field>
-        </record>
-
-        <menuitem name="Manual Recurring" action="action_view_account_use_model" id="menu_action_manual_recurring" sequence="10" parent="account.menu_finance_recurrent_entries"/>
-
         <record id="view_account_use_model_create_entry" model="ir.ui.view">
             <field name="name">account.use.model.create.entry.form</field>
             <field name="model">account.use.model</field>

From 2b3a20ca946c64e8d035dbdacf8d4dd5b00b3791 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 7 Nov 2012 12:27:36 +0530
Subject: [PATCH 22/33] [IMP] remove menu Periodical Processing/Billing/Invoice
 Task Work

bzr revid: fka@tinyerp.com-20121107065736-mch6d00g2j1t1y69
---
 .../hr_timesheet_invoice_view.xml             | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index b3ec10e59c2..58dca6bd2d5 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -127,31 +127,6 @@
             </field>
         </record>
 
-        <!-- Menus -->
-        <record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
-            <field name="name">Invoice Tasks Work</field>
-            <field name="res_model">account.analytic.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[]</field>
-            <field name="context">{'search_default_to_invoice': 1}</field>
-            <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>            
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to add some tasks work to be invoiced.
-              </p><p>
-                This list shows every task you can invoice to the customer.
-                Select the lines and invoice from the '<i>more...</i>' contextual
-                menu to generate invoices automatically.
-              </p>
-            </field>
-        </record>
-        <menuitem
-            action="action_hr_analytic_timesheet_open_tree"
-            id="menu_hr_analytic_timesheet_tree"
-            parent="account.menu_finance_periodical_processing_billing"
-            sequence="1"/>
-
         <record id="view_hr_timesheet_invoice_factor_search" model="ir.ui.view">
             <field name="name">hr_timesheet_invoice.factor.search</field>
             <field name="model">hr_timesheet_invoice.factor</field>

From 4ec0cba357ea86b321056fe41ef4af9e72e821f4 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 7 Nov 2012 12:50:07 +0530
Subject: [PATCH 23/33] [IMP] move menu Configuration/Financial
 Accounting/Templates--> Configuration/Accounts/Templates

bzr revid: fka@tinyerp.com-20121107072007-1vuawud0als0z6tf
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 83d7234352d..7dcae233d59 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2049,7 +2049,7 @@
         <menuitem
             id="account_template_folder"
             name="Templates"
-            parent="menu_finance_accounting"
+            parent="account_account_menu"
             groups="account.group_account_manager"/>
         <menuitem
             id="account_template_taxes"

From b46e7bd961c7d30cb0627fc480a0981d891c84a8 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 7 Nov 2012 13:05:44 +0530
Subject: [PATCH 24/33] [IMP] move menu Configuration/Misc/Recurring Models -->
 Periodical Processing/Recurring Entries/Models

bzr revid: fka@tinyerp.com-20121107073544-4sx3l0j9giww8dhe
---
 addons/account/account_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7dcae233d59..4eefc664e87 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1702,8 +1702,8 @@
             <field name="search_view_id" ref="view_model_search"/>
         </record>
         <menuitem
-            action="action_model_form" id="menu_action_model_form" sequence="5"
-            parent="account.menu_configuration_misc"/>
+            action="action_model_form" name="Models" id="menu_action_model_form" sequence="5"
+            parent="account.menu_finance_recurrent_entries"/>
 
         <!--
             # Payment Terms

From b408081195d7925e8a4e272673c7edde5485abce Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 7 Nov 2012 14:39:44 +0530
Subject: [PATCH 25/33] [FIX] Uncaught TypeError: Cannot read property 'attrs'
 of undefined

bzr revid: fka@tinyerp.com-20121107090944-wvkq0e22v1jxyn2s
---
 addons/account/account_move_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 67a55d8f451..c4d710faf64 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1029,7 +1029,7 @@ class account_move_line(osv.osv):
             'move_id': 40,
         }
 
-        document = etree.Element('tree', string=title, editable="top",
+        document = etree.Element('tree', string=title, 
                                  on_write="on_create_write",
                                  colors="red:state=='draft';black:state=='valid'")
         fields_get = self.fields_get(cr, uid, flds, context)

From ed25f5a9043cfde2caf6e14d526f39d6c76ff683 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 7 Nov 2012 15:29:05 +0530
Subject: [PATCH 26/33] [FIX] Uncaught TypeError: Cannot call method
 'get_domain' of undefined

bzr revid: fka@tinyerp.com-20121107095905-vhmqhu6zgiompby0
---
 addons/account/account_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4eefc664e87..068af3b4f0b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1218,6 +1218,7 @@
             <field name="model">account.move.line</field>
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
                     <separator/>

From b18a7259b97f0172b4d7233d5549f0b857826291 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 7 Nov 2012 18:07:44 +0530
Subject: [PATCH 27/33] [IMP]: Improve code in delivery slip report

bzr revid: aja@tinyerp.com-20121107123744-yejs40zxjp1do1o3
---
 addons/stock/report/picking.py  |  2 +-
 addons/stock/report/picking.rml | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 71a45b06a35..711abbf6259 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -35,7 +35,7 @@ class picking(report_sxw.rml_parse):
         desc = move_line.product_id.name
         if move_line.product_id.default_code:
             desc = '[' + move_line.product_id.default_code + ']' + ' ' + desc
-        return [desc]
+        return desc
 
 report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index dfb202b75ff..f522f2b5f56 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -163,13 +163,13 @@
           <para style="terp_default_Bold_9">Warehouse Address : [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
           <para style="terp_default_9">[[ (picking.partner_id and picking.partner_id.id and picking.partner_id.title.name) or '' ]] [[ picking.partner_id and picking.partner_id.id and picking.partner_id.name ]]</para>
           <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]]</para>
-          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email]]</para>
+          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email or or removeParentNode('para')]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Contact Address :</para>
           <para style="terp_default_9">[[ picking.partner_id and picking.partner_id.title.name or '' ]] [[ picking.partner_id and picking.partner_id.name or '' ]]</para>
           <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]] </para>
-          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email]]</para>
+          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]]</para>
         </td>
       </tr>
     </blockTable>
@@ -251,8 +251,7 @@
       <blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
-            <para style="terp_default_2">[[ repeatIn(get_product_desc(move_lines),'desc') ]]</para>
-            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ desc ]] </font></para>
+            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ get_product_desc(move_lines) ]] </font></para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
@@ -277,8 +276,7 @@
       <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Table1">
         <tr>
           <td>
-           <para style="terp_default_2">[[ repeatIn(get_product_desc(move_lines),'desc') ]]</para>
-            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ desc ]] </font></para>
+            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ get_product_desc(move_lines) ]] </font></para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>

From 48162fbbea7fb52288261da002d5672144c29183 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Thu, 8 Nov 2012 14:36:36 +0530
Subject: [PATCH 28/33] [IMP] make changes in view invoicce button

bzr revid: rma@tinyerp.com-20121108090636-wyeme07331yp0akb
---
 addons/purchase/purchase.py       | 2 +-
 addons/purchase/purchase_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index e5eeb545ba1..13a28c29acd 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -506,7 +506,7 @@ class purchase_order(osv.osv):
         return res
     def action_view_invoice(self, cr, uid, ids, context=None):
         '''
-        This function returns an action that display existing invoices of given sale order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
+        This function returns an action that display existing invoices of given purchase order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
         '''
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index cc39e75af30..80cd2202dc7 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -208,7 +208,7 @@
                     <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
-                    <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}"
+                    <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight" attrs="{'invisible': [ ('state','!=', 'done')]}"
                              groups="base.group_user"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
                     <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel"/>

From 7377e48bbd67887bd7f219a9287da3472e1763b4 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 9 Nov 2012 12:45:28 +0530
Subject: [PATCH 29/33] [IMP] change the read only for destination location

bzr revid: rma@tinyerp.com-20121109071528-la7r8x5jtelv5f8c
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index dfc42f46494..2801df1a2b6 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -176,7 +176,7 @@ class purchase_order(osv.osv):
                 "Otherwise, keep empty to deliver to your own company."
         ),
         'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse'),
-        'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')], states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
+        'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')], states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]} ),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
         'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True),
         'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The status of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' status. Then the order has to be confirmed by the user, the status switch to 'Confirmed'. Then the supplier must confirm the order to change the status to 'Approved'. When the purchase order is paid and received, the status becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the status becomes in exception.", select=True),

From f502b905c5f15feb0dfe1aa1d595d4a5f7944dde Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 9 Nov 2012 12:55:06 +0530
Subject: [PATCH 30/33] [IMP] stock: improved search view.

bzr revid: tpa@tinyerp.com-20121109072506-ogbqzaz5wdu4gyq1
---
 addons/stock/stock_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d9c78705cc1..91a9987a986 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1352,7 +1352,8 @@
             <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <field name="origin" string="Reference"/>
+                    <field name="picking_id" string="Reference"/>
+                    <field name="origin" string="Source"/>
                     <field name="date" groups="base.group_no_one"/>
 
                     <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>

From 45d295d0ef4adf210e5b5323e727b4bd29c7b1e0 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 9 Nov 2012 14:59:30 +0530
Subject: [PATCH 31/33] [IMP] Rename Reference Type

bzr revid: fka@tinyerp.com-20121109092930-i8o1yu3lkk09tz21
---
 addons/l10n_ch/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 9e8d3f0d57b..3a65e9a0d2b 100644
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -67,7 +67,7 @@ class account_invoice(osv.osv):
     _columns = {
         ### BVR reference type BVR or FREE
         'reference_type': fields.selection(_get_reference_type,
-            'Reference Type', required=True),
+            'Payment Reference', required=True),
         ### Partner bank link between bank and partner id
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
             help='The partner bank account to pay\nKeep empty to use the default'

From 3633d0fb022fdb64755c8ebd42a54f412c80ae7f Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 9 Nov 2012 15:07:31 +0530
Subject: [PATCH 32/33] [IMP] put placeholder in note

bzr revid: fka@tinyerp.com-20121109093731-39dykanh2an7jlmd
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f41a002257e..3334005e592 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2085,7 +2085,7 @@
                     <separator string="Default Taxes"/>
                     <field name="tax_ids"/>
                     <separator string="Notes"/>
-                    <field name="note"/>
+                    <field name="note" placeholder="Internal notes..."/>
                 </form>
             </field>
         </record>

From f4ab81afb8285a8157258232c5fb2a6745ae7f72 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Mon, 12 Nov 2012 18:02:32 +0530
Subject: [PATCH 33/33] [FIX] purchase: On Delivery Invoice Option Shoud End
 the PO to done on delivery Done same as Sale Process

bzr revid: jam@tinyerp.com-20121112123232-5p53gft4ijxiw5rh
---
 addons/purchase/purchase_workflow.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 212ce304e07..00fb5517568 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -145,7 +145,7 @@
         <record id="trans_router_invoice_no_order" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
             <field name="act_to" ref="act_invoice_end"/>
-            <field name="condition">invoice_method&lt;&gt;'order' and invoiced</field>
+            <field name="condition">invoice_method&lt;&gt;'order'</field>
         </record>
         <record id="trans_except_picking_picking_done" model="workflow.transition">
             <field name="act_from" ref="act_except_picking"/>