From 81673e47a1ff221c7f94c64656ff2bea27c7ab83 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 24 Jul 2012 15:32:12 +0530
Subject: [PATCH 01/11] [IMP] purchase : Fix the broken view of 'Incoming
 Shipments'.

bzr revid: mdi@tinyerp.com-20120724100212-7k4po9ixgtmko6vq
---
 addons/purchase/stock_view.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 27318adc0f5..b64ef37303c 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -89,6 +89,26 @@
             <field name="context">{'search_default_purchase_id': active_id,'default_type': 'in'}</field>
             <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
         </record>
+        
+        <record id="act_purchase_order_2_stock_picking_tree" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="stock.view_picking_in_tree"/>
+            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
+        </record>
+        
+        <record id="act_purchase_order_2_stock_picking_form" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="stock.view_picking_in_form"/>
+            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
+        </record>
+        
+        <record id="act_purchase_order_2_stock_picking_calendar" model="ir.actions.act_window.view">
+            <field eval="3" name="sequence"/>
+            <field name="view_mode">calendar</field>
+            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
+        </record>
 
         <record id="purchase_order_2_stock_picking" model="ir.ui.view">
             <field name="name">Purchase Picking Inherited</field>

From 31a53d05be4603a7f4d70f86bb0acd67116140b5 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 24 Jul 2012 16:11:44 +0530
Subject: [PATCH 02/11] [IMP] stock : Invalid Object Architecture! :
 Insufficient fields to generate a Calendar View for stock.picking.out,
 missing a date_stop or a date_delay.

bzr revid: mdi@tinyerp.com-20120724104144-p13jrri8627eznml
---
 addons/stock/stock_view.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e90a2bb8162..e76ecc93862 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -946,6 +946,21 @@
         # Sending Products
         #
         -->
+        
+        <record model="ir.ui.view" id="stock_picking_out_calendar">
+            <field name="name">stock.picking.out.calendar</field>
+            <field name="model">stock.picking.out</field>
+            <field name="type">calendar</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Calendar View" date_start="min_date" date_stop="max_date" color="partner_id">
+                    <field name="origin"/>
+                    <field name="type"/>
+                    <field name="partner_id"/>
+                </calendar>
+            </field>
+        </record>
+        
         <record id="view_picking_out_tree" model="ir.ui.view">
             <field name="name">stock.picking.out.tree</field>
             <field name="model">stock.picking</field>
@@ -1055,6 +1070,7 @@
         <record id="action_picking_tree_out_view2_waiting_cal" model="ir.actions.act_window.view">
             <field eval="3" name="sequence"/>
             <field name="view_mode">calendar</field>
+            <field name="view_id" ref="stock_picking_out_calendar"/>
             <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="3"/>

From 0207ff3b89c47b27ec379e20aa59f3929a44ded5 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 24 Jul 2012 16:17:29 +0530
Subject: [PATCH 03/11] [IMP] stock : Invalid Object Architecture! :
 Insufficient fields to generate a Calendar View for stock.picking.in, missing
 a date_stop or a date_delay.

bzr revid: mdi@tinyerp.com-20120724104729-4963dxs7fm013i21
---
 addons/stock/stock_view.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e76ecc93862..b34f6ca0fe4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1080,6 +1080,21 @@
         # Incomming Shipments
         #
         -->
+        
+        <record model="ir.ui.view" id="stock_picking_in_calendar">
+            <field name="name">stock.picking.in.calendar</field>
+            <field name="model">stock.picking.in</field>
+            <field name="type">calendar</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Calendar View" date_start="min_date" date_stop="max_date" color="partner_id">
+                    <field name="origin"/>
+                    <field name="type"/>
+                    <field name="partner_id"/>
+                </calendar>
+            </field>
+        </record>
+        
         <record id="view_picking_in_tree" model="ir.ui.view">
             <field name="name">stock.picking.in.tree</field>
             <field name="model">stock.picking.in</field>
@@ -1183,6 +1198,7 @@
         <record id="action_invoice_tree5_view2_cal" model="ir.actions.act_window.view">
             <field eval="3" name="sequence"/>
             <field name="view_mode">calendar</field>
+            <field name="view_id" ref="stock_picking_in_calendar"/>
             <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"/>

From 1910f0decea6ac0da6099ab9aba30f2d8ba58da1 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 25 Jul 2012 12:28:25 +0530
Subject: [PATCH 04/11] [IMP] purchase : Added tag in kanban for 'Purchases',
 Added Button 'RFQs and Purchases' on the form and Removed 'RFQs and
 Purchases' from sidebar of supplier.

bzr revid: mdi@tinyerp.com-20120725065825-b2ceoexvrrwcxetk
---
 addons/purchase/partner.py        |  9 ++++++
 addons/purchase/partner_view.xml  | 49 +++++++++++++++++++++++++++++++
 addons/purchase/purchase_view.xml |  8 -----
 3 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 86cce749a21..d3f3e3e24d4 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -24,6 +24,13 @@ from osv import fields, osv
 class res_partner(osv.osv):
     _name = 'res.partner'
     _inherit = 'res.partner'
+    
+    def _purchase_order_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for partner in self.browse(cr, uid, ids, context):
+            res[partner.id] = len(partner.purchase_order_ids)
+        return res
+    
     _columns = {
         'property_product_pricelist_purchase': fields.property(
           'product.pricelist',
@@ -33,6 +40,8 @@ class res_partner(osv.osv):
           string="Purchase Pricelist", 
           view_load=True,
           help="This pricelist will be used, instead of the default one, for purchases from the current partner"),
+        'purchase_order_count': fields.function(_purchase_order_count, string='# of Purchase Order', type='integer'),
+        'purchase_order_ids': fields.one2many('purchase.order','partner_id','Purchase Order')
     }
 res_partner()
 
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 96981db1502..d155f210ca8 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -13,6 +13,55 @@
                 </field>
             </field>
         </record>
+        
+    <record id="act_res_partner_2_purchase_order" model="ir.actions.act_window">
+            <field name="name">RFQs and Purchases</field>
+            <field name="res_model">purchase.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="context">{'search_default_partner_id': active_id}</field>
+            <field name="groups_id" eval="[(4, ref('purchase.group_purchase_user'))]"/>
+            <field name="help">
+                This supplier has no RFQ or Purchase Order. Click here to create a new RFQ.
+                &lt;p&gt;
+                The "Quotation" is the first step of the Purchases flow. Manage your purchases from quotation to invoice.
+                &lt;p&gt;
+                You will be able to buy products (manage receptions) as well as services (create projects).
+            </field>
+        </record>
+
+        <!-- Partner kanban view inherited -->
+        <record model="ir.ui.view" id="purchase_partner_kanban_view">
+            <field name="name">res.partner.kanban.purchaseorder.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="base.res_partner_kanban_view"/>
+            <field name="arch" type="xml">
+                <field name="mobile" position="after">
+                    <field name="purchase_order_count"/>
+                </field>
+                <xpath expr="//h4[@class='oe_partner_heading']" position="after">
+                    <a name="%(purchase.act_res_partner_2_purchase_order)d" type="action" t-if="record.purchase_order_count.value>0" class="oe_tag">
+                        <t t-esc="record.purchase_order_count.value"/> Purchases
+                    </a>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="res_partner_view_purchase_buttons" model="ir.ui.view">
+            <field name="name">res.partner.view.purchase.buttons</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="priority" eval="20"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button name="%(purchase.act_res_partner_2_purchase_order)d" type="action"
+                        string="RFQs and Purchases"
+                        groups="purchase.group_purchase_user"/>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ebc7df729b5..985e311a6a2 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -510,14 +510,6 @@
             </field>
         </record>
 
-        <act_window
-            context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
-            id="act_res_partner_2_purchase_order"
-            name="RFQs and Purchases"
-            groups="purchase.group_purchase_user"
-            res_model="purchase.order"
-            src_model="res.partner"/>
-
         <act_window
             context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
             id="action_purchase_line_product_tree"

From 20d79d06e0812f02e7c5b8a1462fe51a026b6bc6 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 25 Jul 2012 16:16:34 +0530
Subject: [PATCH 05/11] [IMP] account, purchase : Added 'Supplier Invoices'
 button on 'Supplier' form view and its related changes.

bzr revid: mdi@tinyerp.com-20120725104634-2cj4g3zp5mrow6do
---
 addons/account/account_invoice.py |  2 +-
 addons/purchase/partner_view.xml  | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 6a0a29cb2fe..b1c5db23df6 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -306,7 +306,7 @@ class account_invoice(osv.osv):
             if view_type == 'form':
                 if partner['supplier'] and not partner['customer']:
                     view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.supplier.form')])
-                else:
+                elif partner['customer'] and not partner['supplier']:
                     view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.form')])
         if view_id and isinstance(view_id, (list, tuple)):
             view_id = view_id[0]
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index d155f210ca8..87b40f398e6 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -47,6 +47,22 @@
                 </xpath>
             </field>
         </record>
+        
+    <record id="act_res_partner_2_supplier_invoices" model="ir.actions.act_window">
+            <field name="name">Supplier Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="domain">[('type','=','in_invoice')]</field>
+            <field name="context">{'search_default_partner_id': active_id, 'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}</field>
+            <field name="help">
+                Click here to create Supplier invoice.
+                &lt;p&gt;
+                You can control the invoice from your supplier according to what you purchased or received.
+                &lt;p&gt;
+                OpenERP can also generate draft invoices automatically from purchase orders or receipts.
+            </field>
+        </record>
 
         <record id="res_partner_view_purchase_buttons" model="ir.ui.view">
             <field name="name">res.partner.view.purchase.buttons</field>
@@ -59,6 +75,8 @@
                     <button name="%(purchase.act_res_partner_2_purchase_order)d" type="action"
                         string="RFQs and Purchases"
                         groups="purchase.group_purchase_user"/>
+                    <button name="%(purchase.act_res_partner_2_supplier_invoices)d" type="action"
+                        string="Supplier Invoices"/>
                 </xpath>
             </field>
         </record>

From da5a67deb5a727dc4ea21d4fce854d4a17ba3a1d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 25 Jul 2012 16:25:29 +0530
Subject: [PATCH 06/11] [IMP] stock : On 'Receive Product' form, all part of
 Tracability must go to the group 'Manage Logistic Serial Numbers'.

bzr revid: mdi@tinyerp.com-20120725105529-71yq5jgcpkhnrvio
---
 addons/stock/stock_view.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b34f6ca0fe4..8a51a369474 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1302,10 +1302,10 @@
                             <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="Tracability" groups="stock.group_tracking_lot">
                             <label for="tracking_id"/>
                             <div>
-                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
+                                <field name="tracking_id" class="oe_inline"/>
                                 <button name="%(split_into)d" string="New Pack" type="action"
                                       groups="product.group_stock_packaging"
                                       icon="terp-stock_effects-object-colorize"
@@ -1313,12 +1313,11 @@
                             </div>
                             <label for="prodlot_id"/>
                             <div>
-                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                <field name="prodlot_id"
                                     context="{'location_id':location_id, 'product_id':product_id}"
                                     domain="[('product_id','=?',product_id)]" class="oe_inline"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
                                 <button name="%(track_line)d"
-                                    groups="stock.group_tracking_lot"
                                     states="draft,waiting,confirmed,assigned"
                                     string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
                             </div>

From 2cfcc1cf0313ca7a201dc20f82256c76d12184a0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 26 Jul 2012 14:47:11 +0530
Subject: [PATCH 07/11] [IMP] purchase : Added OpenChatter notification after
 module installation.

bzr revid: mdi@tinyerp.com-20120726091711-q3jrnsv8yp6anl69
---
 addons/purchase/purchase_data.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 9d7399abab0..4556ee0bac9 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -6,12 +6,11 @@
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Module Purchase Management has been installed</value>
-            <value>From the top menu Purchases, create purchase orders to buy
-                products from your suppliers, encode supplier invoices and
-                manage your payments.
+            <value>Welcome to OpenERP
+                You can click on the top menu Purchases to manage your
+                suppliers, your request for quotations and control supplier invoicing.
 
-                You can also manage purchase requisitions, see the Purchase
-                Settings.
+                To configure your purchase application, you can add purchase's options in settings menu.
             </value>
         </function>
 

From 62e24913edbe827fae7ad8db4af9595e5733a77c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 27 Jul 2012 12:50:53 +0530
Subject: [PATCH 08/11] [IMP] purchase : Remove the class 'oe_tag'.

bzr revid: mdi@tinyerp.com-20120727072053-cya7s1d31t1bz9ea
---
 addons/purchase/partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index c201d125574..81eaac92827 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -43,8 +43,8 @@
                 <field name="mobile" position="after">
                     <field name="purchase_order_count"/>
                 </field>
-                <xpath expr="//h4[@class='oe_partner_heading']" position="after">
-                    <a name="%(purchase.act_res_partner_2_purchase_order)d" type="action" t-if="record.purchase_order_count.value>0" class="oe_tag">
+                <xpath expr="//div[@class='oe_kanban_partner_links']" position="inside">
+                    <a name="%(purchase.act_res_partner_2_purchase_order)d" type="action" t-if="record.purchase_order_count.value>0">
                         <t t-esc="record.purchase_order_count.value"/> Purchases
                     </a>
                 </xpath>

From df01cb6bc1b807957ec44c857411b8e738588b32 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 30 Jul 2012 10:26:26 +0530
Subject: [PATCH 09/11] [IMP] purchase : Improved the code.

bzr revid: mdi@tinyerp.com-20120730045626-016flwiiqh3b43cg
---
 addons/purchase/partner.py     | 2 +-
 addons/purchase/stock_view.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index d3f3e3e24d4..71b55514fba 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -27,7 +27,7 @@ class res_partner(osv.osv):
     
     def _purchase_order_count(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
-        for partner in self.browse(cr, uid, ids, context):
+        for partner in self.browse(cr, uid, ids, context=context):
             res[partner.id] = len(partner.purchase_order_ids)
         return res
     
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index b64ef37303c..ce6f1e8c349 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -107,6 +107,7 @@
         <record id="act_purchase_order_2_stock_picking_calendar" model="ir.actions.act_window.view">
             <field eval="3" name="sequence"/>
             <field name="view_mode">calendar</field>
+            <field name="view_id" ref="stock.stock_picking_in_calendar"/>
             <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
         </record>
 

From e827996af0f47e240d935d2bc307fb21204e9fff Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 1 Aug 2012 11:08:14 +0530
Subject: [PATCH 10/11] [IMP] purchase : Improved OpenChatter notification
 after module installation.

bzr revid: mdi@tinyerp.com-20120801053814-hupn8mnqbopyrx3b
---
 addons/purchase/purchase_data.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 4556ee0bac9..977b1e12d19 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -6,9 +6,8 @@
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>Module Purchase Management has been installed</value>
-            <value>Welcome to OpenERP
-                You can click on the top menu Purchases to manage your
-                suppliers, your request for quotations and control supplier invoicing.
+            <value>You can &lt;b&gt;click on the top menu Purchases&lt;/b&gt; to manage your
+                suppliers, request for quotations and control supplier invoices.
 
                 To configure your purchase application, you can add purchase's options in settings menu.
             </value>

From 176ef8c1cebcb6c86a8995da67593f72b9b85526 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 3 Aug 2012 11:03:37 +0530
Subject: [PATCH 11/11] [IMP] purchase : Override the copy method.

bzr revid: mdi@tinyerp.com-20120803053337-fvh5bzgztl815eh6
---
 addons/purchase/partner.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 71b55514fba..2edcf5ec0d8 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -24,13 +24,21 @@ from osv import fields, osv
 class res_partner(osv.osv):
     _name = 'res.partner'
     _inherit = 'res.partner'
-    
+
     def _purchase_order_count(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         for partner in self.browse(cr, uid, ids, context=context):
             res[partner.id] = len(partner.purchase_order_ids)
         return res
-    
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+
+        default.update({'purchase_order_ids': []})
+
+        super(res_partner, self).copy(cr, uid, id, default=default, context=context)
+
     _columns = {
         'property_product_pricelist_purchase': fields.property(
           'product.pricelist',