From 96aee6eed4926ee4dfc00f4250587d47014d9a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 15:48:59 +0200
Subject: [PATCH 01/20] Update ajax.lib.php

---
 htdocs/core/lib/ajax.lib.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 4bc6da083aa..2f9732a0876 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -460,21 +460,18 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0,
 }
 
 /**
- *  On/off button for product tosell or tobuy
+ *  On/off button for object
  *
- *  @param  int     $id         Id product to set
- *  @param  string  $code       Name of constant : status or status_buy
+ *  @param  int     $object     Object to set
+ *  @param  string  $code       Name of constant : status or status_buy for product by example
  *  @param  array   $input      Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))
  *  @return void
  */
-function ajax_productonoff($id, $code, $input=array())
+function ajax_object_onoff($object, $code, $input=array())
 {
     require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
     global $conf, $langs, $db;
 
-    $object = new Product($db);
-    $object->fetch($id);
-
     $out= '<script type="text/javascript">
         $(function() {
             var input = '.json_encode($input).';
@@ -484,7 +481,7 @@ function ajax_productonoff($id, $code, $input=array())
                 $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", {
                     action: \'set'.$code.'\',
                     value: \'1\',
-                    id: \''.$id.'\'
+                    id: \''.$object->id.'\'
                 },
                 function() {
                     $("#set_'.$code.'").hide();
@@ -512,7 +509,7 @@ function ajax_productonoff($id, $code, $input=array())
                 $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", {
                     action: \'set'.$code.'\',
                     value: \'0\',
-                    id: \''.$id.'\'
+                    id: \''.$object->id.'\'
                 },
                 function() {
                     $("#del_'.$code.'").hide();

From 98db599c69baee91da2f766cf36d0093a5892987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 15:51:05 +0200
Subject: [PATCH 02/20] Update card.php

---
 htdocs/product/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 5644e41df1c..914ef4c7d8e 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1421,7 +1421,7 @@ else
             // Status (to sell)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_productonoff($object->id, 'status');
+                print ajax_productonoff($object, 'status');
             } else {
                 print $object->getLibStatut(2,0);
             }
@@ -1430,7 +1430,7 @@ else
             // Status (to buy)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_productonoff($object->id, 'status_buy');
+                print ajax_productonoff($object, 'status_buy');
             } else {
                 print $object->getLibStatut(2,1);
             }

From 3a49965820138a7ff59fe5f7ecf2f1f819c6c137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 15:52:37 +0200
Subject: [PATCH 03/20] Update product.php

---
 htdocs/product/stock/product.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index ae8afe696bc..4938ec3e033 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -279,7 +279,7 @@ if ($id > 0 || $ref)
         // Status (to sell)
         print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-            print ajax_productonoff($product->id, 'status');
+            print ajax_object_onoff($product, 'status');
         } else {
             print $product->getLibStatut(2,0);
         }
@@ -288,7 +288,7 @@ if ($id > 0 || $ref)
         // Status (to buy)
         print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-            print ajax_productonoff($product->id, 'status_buy');
+            print ajax_object_onoff($product, 'status_buy');
         } else {
             print $product->getLibStatut(2,1);
         }

From b80b45c086da9efcc324afdb884a2291a3ea2a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 15:55:10 +0200
Subject: [PATCH 04/20] Update card.php

---
 htdocs/product/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 914ef4c7d8e..cd75ab3e2bb 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1421,7 +1421,7 @@ else
             // Status (to sell)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_productonoff($object, 'status');
+                print ajax_object_onoff($object, 'status');
             } else {
                 print $object->getLibStatut(2,0);
             }
@@ -1430,7 +1430,7 @@ else
             // Status (to buy)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_productonoff($object, 'status_buy');
+                print ajax_object_onoff($object, 'status_buy');
             } else {
                 print $object->getLibStatut(2,1);
             }

From 2107a61bbefbe0f1f82cb4820febf809ebf14dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 16:32:32 +0200
Subject: [PATCH 05/20] Update ajax.lib.php

For use in a list of object
---
 htdocs/core/lib/ajax.lib.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 2f9732a0876..46442460feb 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -477,15 +477,15 @@ function ajax_object_onoff($object, $code, $input=array())
             var input = '.json_encode($input).';
 
             // Set constant
-            $("#set_'.$code.'").click(function() {
+            $("#set_'.$code.'_'.$object->id.'").click(function() {
                 $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", {
                     action: \'set'.$code.'\',
                     value: \'1\',
                     id: \''.$object->id.'\'
                 },
                 function() {
-                    $("#set_'.$code.'").hide();
-                    $("#del_'.$code.'").show();
+                    $("#set_'.$code.'_'.$object->id.'").hide();
+                    $("#del_'.$code.'_'.$object->id.'").show();
                     // Enable another element
                     if (input.disabled && input.disabled.length > 0) {
                         $.each(input.disabled, function(key,value) {
@@ -505,15 +505,15 @@ function ajax_object_onoff($object, $code, $input=array())
             });
 
             // Del constant
-            $("#del_'.$code.'").click(function() {
+            $("#del_'.$code.'_'.$object->id.'").click(function() {
                 $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", {
                     action: \'set'.$code.'\',
                     value: \'0\',
                     id: \''.$object->id.'\'
                 },
                 function() {
-                    $("#del_'.$code.'").hide();
-                    $("#set_'.$code.'").show();
+                    $("#del_'.$code.'_'.$object->id.'").hide();
+                    $("#set_'.$code.'_'.$object->id.'").show();
                     // Disable another element
                     if (input.disabled && input.disabled.length > 0) {
                         $.each(input.disabled, function(key,value) {
@@ -534,12 +534,12 @@ function ajax_object_onoff($object, $code, $input=array())
         });
     </script>';
     if ($code=='status') {
-        $out.= '<span id="set_'.$code.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans("ProductStatusNotOnSell"),'switch_off').'</span>';
-        $out.= '<span id="del_'.$code.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans("ProductStatusOnSell"),'switch_on').'</span>';
+        $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans("ProductStatusNotOnSell"),'switch_off').'</span>';
+        $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans("ProductStatusOnSell"),'switch_on').'</span>';
     }
     if ($code=='status_buy') {
-    $out.= '<span id="set_'.$code.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans("ProductStatusNotOnBuy"),'switch_off').'</span>';
-    $out.= '<span id="del_'.$code.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans("ProductStatusOnBuy"),'switch_on').'</span>';
+    $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans("ProductStatusNotOnBuy"),'switch_off').'</span>';
+    $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans("ProductStatusOnBuy"),'switch_on').'</span>';
     }
     return $out;
 }

From 830ec9c9cb2f9d5684ac5f0cc7d6ec06e6ef3d0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 16:36:28 +0200
Subject: [PATCH 06/20] Update list.php

---
 htdocs/product/list.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index ebcd3245e7d..7e817d69725 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -507,11 +507,25 @@ else
     				}
     			}
 
-    			// Status (to buy)
-    			print '<td align="center" class="nowrap">'.$product_static->LibStatut($objp->tosell,5,0).'</td>';
-
+                $product_static->status_buy = $objp->tobuy;
+                $product_static->status     = $objp->tosell;
                 // Status (to sell)
-                print '<td align="center" class="nowrap">'.$product_static->LibStatut($objp->tobuy,5,1).'</td>';
+                print '<td align="right" nowrap="nowrap">';
+                if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
+                    print ajax_object_onoff($product_static, 'status');
+                } else {
+                    print $product_static->LibStatut($objp->tosell,5,0);
+                }
+                print '</td>';
+
+                // Status (to buy)
+                print '<td align="right" nowrap="nowrap">';
+                if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
+                    print ajax_object_onoff($product_static, 'status_buy');
+                } else {
+                    print $product_static->LibStatut($objp->tobuy,5,1);
+                }
+                print '</td>';
 
                 print '<td>&nbsp;</td>';
 

From dd5ea670e2e5bdb30dd0b7bab7df181ef8620abf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 17:11:02 +0200
Subject: [PATCH 07/20] Update ajax.lib.php

---
 htdocs/core/lib/ajax.lib.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 46442460feb..0057f976a75 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -469,7 +469,6 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0,
  */
 function ajax_object_onoff($object, $code, $input=array())
 {
-    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
     global $conf, $langs, $db;
 
     $out= '<script type="text/javascript">
@@ -478,7 +477,7 @@ function ajax_object_onoff($object, $code, $input=array())
 
             // Set constant
             $("#set_'.$code.'_'.$object->id.'").click(function() {
-                $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", {
+                $.get( "'.DOL_URL_ROOT.'/core/ajax/objectonoff.php", {
                     action: \'set'.$code.'\',
                     value: \'1\',
                     id: \''.$object->id.'\'
@@ -506,7 +505,7 @@ function ajax_object_onoff($object, $code, $input=array())
 
             // Del constant
             $("#del_'.$code.'_'.$object->id.'").click(function() {
-                $.get( "'.DOL_URL_ROOT.'/core/ajax/productonoff.php", {
+                $.get( "'.DOL_URL_ROOT.'/core/ajax/objectonoff.php", {
                     action: \'set'.$code.'\',
                     value: \'0\',
                     id: \''.$object->id.'\'

From 489045d71570def7fb9920df95571d8d5a8a74f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 17:11:47 +0200
Subject: [PATCH 08/20] Rename productonoff.php to objectonoff.php

---
 htdocs/core/ajax/{productonoff.php => objectonoff.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename htdocs/core/ajax/{productonoff.php => objectonoff.php} (100%)

diff --git a/htdocs/core/ajax/productonoff.php b/htdocs/core/ajax/objectonoff.php
similarity index 100%
rename from htdocs/core/ajax/productonoff.php
rename to htdocs/core/ajax/objectonoff.php

From 8bb0ce0f7fc106f2bfd912c4f4912ee4b983461e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 17:17:41 +0200
Subject: [PATCH 09/20] Update ajax.lib.php

---
 htdocs/core/lib/ajax.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 0057f976a75..6c24b1eac6f 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -469,7 +469,7 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0,
  */
 function ajax_object_onoff($object, $code, $input=array())
 {
-    global $conf, $langs, $db;
+    global $langs;
 
     $out= '<script type="text/javascript">
         $(function() {

From eefb211be797f15e1addc70d5c5abdb39a652f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 18:48:13 +0200
Subject: [PATCH 10/20] Update ajax.lib.php

---
 htdocs/core/lib/ajax.lib.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 6c24b1eac6f..84e1a536465 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -464,10 +464,12 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0,
  *
  *  @param  int     $object     Object to set
  *  @param  string  $code       Name of constant : status or status_buy for product by example
+ *  @param  string  $text_on    Text if on
+ *  @param  string  $text_off   Text if off
  *  @param  array   $input      Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))
  *  @return void
  */
-function ajax_object_onoff($object, $code, $input=array())
+function ajax_object_onoff($object, $code, $text_on, $text_off, $input=array())
 {
     global $langs;
 
@@ -532,14 +534,9 @@ function ajax_object_onoff($object, $code, $input=array())
             });
         });
     </script>';
-    if ($code=='status') {
-        $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans("ProductStatusNotOnSell"),'switch_off').'</span>';
-        $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans("ProductStatusOnSell"),'switch_on').'</span>';
-    }
-    if ($code=='status_buy') {
-    $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans("ProductStatusNotOnBuy"),'switch_off').'</span>';
-    $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans("ProductStatusOnBuy"),'switch_on').'</span>';
-    }
+    $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans($text_off),'switch_off').'</span>';
+    $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans($text_on),'switch_on').'</span>';
+
     return $out;
 }
 

From 446e73d8b80e5b977d484d2a70c5ebda5f9ff600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 18:49:47 +0200
Subject: [PATCH 11/20] Update card.php

---
 htdocs/product/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index cd75ab3e2bb..eadb701e4a8 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1421,7 +1421,7 @@ else
             // Status (to sell)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_object_onoff($object, 'status');
+                print ajax_object_onoff($object, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
             } else {
                 print $object->getLibStatut(2,0);
             }
@@ -1430,7 +1430,7 @@ else
             // Status (to buy)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_object_onoff($object, 'status_buy');
+                print ajax_object_onoff($object, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
             } else {
                 print $object->getLibStatut(2,1);
             }

From 3ab8e13157008752c5a8c3a87ab01e2da3c8baba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 18:51:25 +0200
Subject: [PATCH 12/20] Update list.php

---
 htdocs/product/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 7e817d69725..e77115eb72f 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -512,7 +512,7 @@ else
                 // Status (to sell)
                 print '<td align="right" nowrap="nowrap">';
                 if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                    print ajax_object_onoff($product_static, 'status');
+                    print ajax_object_onoff($product_static, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
                 } else {
                     print $product_static->LibStatut($objp->tosell,5,0);
                 }
@@ -521,7 +521,7 @@ else
                 // Status (to buy)
                 print '<td align="right" nowrap="nowrap">';
                 if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                    print ajax_object_onoff($product_static, 'status_buy');
+                    print ajax_object_onoff($product_static, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
                 } else {
                     print $product_static->LibStatut($objp->tobuy,5,1);
                 }

From 3144fd6845a8e3b0d36759b2459babf9dcd66322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 18:52:16 +0200
Subject: [PATCH 13/20] Update product.php

---
 htdocs/product/stock/product.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 4938ec3e033..dd507883674 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -279,7 +279,7 @@ if ($id > 0 || $ref)
         // Status (to sell)
         print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-            print ajax_object_onoff($product, 'status');
+            print ajax_object_onoff($product, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
         } else {
             print $product->getLibStatut(2,0);
         }
@@ -288,7 +288,7 @@ if ($id > 0 || $ref)
         // Status (to buy)
         print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-            print ajax_object_onoff($product, 'status_buy');
+            print ajax_object_onoff($product, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
         } else {
             print $product->getLibStatut(2,1);
         }

From a1bedcc26351f0e8da140cf0ec16de7b4cb41a34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 22:46:13 +0200
Subject: [PATCH 14/20] Update ajax.lib.php

---
 htdocs/core/lib/ajax.lib.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 84e1a536465..709911faaec 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -462,14 +462,15 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0,
 /**
  *  On/off button for object
  *
- *  @param  int     $object     Object to set
+ *  @param  int     $object     Id product to set
  *  @param  string  $code       Name of constant : status or status_buy for product by example
+ *  @param  string  $field      Name of database field : tosell or tobuy for product by example
  *  @param  string  $text_on    Text if on
  *  @param  string  $text_off   Text if off
  *  @param  array   $input      Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))
  *  @return void
  */
-function ajax_object_onoff($object, $code, $text_on, $text_off, $input=array())
+function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input=array())
 {
     global $langs;
 
@@ -480,8 +481,10 @@ function ajax_object_onoff($object, $code, $text_on, $text_off, $input=array())
             // Set constant
             $("#set_'.$code.'_'.$object->id.'").click(function() {
                 $.get( "'.DOL_URL_ROOT.'/core/ajax/objectonoff.php", {
-                    action: \'set'.$code.'\',
+                    action: \'set\',
+                    field: \''.$field.'\',
                     value: \'1\',
+                    element: \''.$object->element.'\',
                     id: \''.$object->id.'\'
                 },
                 function() {
@@ -508,8 +511,10 @@ function ajax_object_onoff($object, $code, $text_on, $text_off, $input=array())
             // Del constant
             $("#del_'.$code.'_'.$object->id.'").click(function() {
                 $.get( "'.DOL_URL_ROOT.'/core/ajax/objectonoff.php", {
-                    action: \'set'.$code.'\',
+                    action: \'set\',
+                    field: \''.$field.'\',
                     value: \'0\',
+                    element: \''.$object->element.'\',
                     id: \''.$object->id.'\'
                 },
                 function() {

From 5b9a134d6970cdbe476d581de952ebbc78160651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 22:47:12 +0200
Subject: [PATCH 15/20] Update objectonoff.php

---
 htdocs/core/ajax/objectonoff.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index 05eebc7a65f..6ac5abd3bbb 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -32,9 +32,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 $action=GETPOST('action','alpha');
 $id=GETPOST('id', 'int');
 $value=GETPOST('value', 'int');
+$field=GETPOST('field', 'alpha');
+$element=GETPOST('element', 'alpha');
 
 $object = new GenericObject($db);
-
 /*
  * View
  */
@@ -44,9 +45,5 @@ top_httphead();
 print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
 
 // Registering new values
-if (! empty($action) && ! empty($id) && $user->rights->produit->creer) {
-    if ($action == 'setstatus') 
-        $object->setValueFrom('tosell', $value, 'product', $id);
-    else if ($action == 'setstatus_buy') 
-        $object->setValueFrom('tobuy', $value, 'product', $id);
-}
+if (($action == 'set') && ! empty($id))
+    $object->setValueFrom($field, $value, $element, $id);

From 5e946d646659e20d005aa8e6b4c35320f9f88a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 22:49:07 +0200
Subject: [PATCH 16/20] Update card.php

---
 htdocs/product/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index eadb701e4a8..889c782808b 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1421,7 +1421,7 @@ else
             // Status (to sell)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_object_onoff($object, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
+                print ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
             } else {
                 print $object->getLibStatut(2,0);
             }
@@ -1430,7 +1430,7 @@ else
             // Status (to buy)
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                print ajax_object_onoff($object, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
+                print ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
             } else {
                 print $object->getLibStatut(2,1);
             }

From 8133b67878ed7067b7af91ca5bba1c0d4f6741de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 22:50:17 +0200
Subject: [PATCH 17/20] Update product.php

---
 htdocs/product/stock/product.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index dd507883674..7885553095e 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -279,7 +279,7 @@ if ($id > 0 || $ref)
         // Status (to sell)
         print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-            print ajax_object_onoff($product, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
+            print ajax_object_onoff($product, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
         } else {
             print $product->getLibStatut(2,0);
         }
@@ -288,7 +288,7 @@ if ($id > 0 || $ref)
         // Status (to buy)
         print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
         if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-            print ajax_object_onoff($product, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
+            print ajax_object_onoff($product, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
         } else {
             print $product->getLibStatut(2,1);
         }

From 761fc32cc1123cc11d8a24363ab3eaf4ca370741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 22:51:24 +0200
Subject: [PATCH 18/20] Update list.php

---
 htdocs/product/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index e77115eb72f..76049fd1ef3 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -512,7 +512,7 @@ else
                 // Status (to sell)
                 print '<td align="right" nowrap="nowrap">';
                 if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                    print ajax_object_onoff($product_static, 'status', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
+                    print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
                 } else {
                     print $product_static->LibStatut($objp->tosell,5,0);
                 }
@@ -521,7 +521,7 @@ else
                 // Status (to buy)
                 print '<td align="right" nowrap="nowrap">';
                 if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
-                    print ajax_object_onoff($product_static, 'status_buy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
+                    print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
                 } else {
                     print $product_static->LibStatut($objp->tobuy,5,1);
                 }

From a14d07930a2f9acbf635e2008af0896d0e38ec07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 18 Oct 2014 22:52:54 +0200
Subject: [PATCH 19/20] Update soc.php

---
 htdocs/societe/soc.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index a0b9bda1c8e..b49a1678b00 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1698,7 +1698,11 @@ else
         // Status
         print '<tr><td>'.$langs->trans("Status").'</td>';
         print '<td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">';
-        print $object->getLibStatut(2);
+        if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer) {
+            print ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
+        } else {
+            print $object->getLibStatut(2);
+        }
         print '</td>';
         print $htmllogobar; $htmllogobar='';
         print '</tr>';

From ba9d2c3690e4c5f65fc3ca35f9930200ea15ac46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 23 Oct 2014 11:02:16 +0200
Subject: [PATCH 20/20] Update card.php

---
 htdocs/product/card.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 889c782808b..9f2f0685beb 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1436,12 +1436,16 @@ else
             }
             print '</td></tr>';
 
-			// Batch number management (to batch)
-			if ($conf->productbatch->enabled) {
-				print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Lot").')</td><td colspan="2">';
-				print $object->getLibStatut(2,2);
-				print '</td></tr>';
-			}
+            // Batch number management (to batch)
+            if ($conf->productbatch->enabled) {
+                print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Lot").')</td><td colspan="2">';
+                if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer) {
+                    print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch');
+                } else {
+                    print $object->getLibStatut(2,2);
+                }
+                print '</td></tr>';
+            }
 
             // Description
             print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description)?$object->description:dol_nl2br($object->description,1,true)).'</td></tr>';