diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 2db8652e9bd..c0139889604 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -162,10 +162,10 @@ if ($action == 'update') {
 						$sql .= " SET accountancy_code_buy = ".$accounting->account_number;
 					}
 					if ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
-						$sql .= " SET accountancy_code_buy = ".$accounting->account_number;
+						$sql .= " SET accountancy_code_buy_intra = ".$accounting->account_number;
 					}
 					if ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
-						$sql .= " SET accountancy_code_buy = ".$accounting->account_number;
+						$sql .= " SET accountancy_code_buy_export = ".$accounting->account_number;
 					}
 					if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 						$sql .= " SET accountancy_code_sell = ".$accounting->account_number;
@@ -593,12 +593,12 @@ if ($result)
 		    print length_accountg($obj->accountancy_code_buy);
 		    if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
-			print length_accountg($obj->accountancy_code_buy_intra);
-			if ($obj->accountancy_code_sell && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
-		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
-			print length_accountg($obj->accountancy_code_buy_export);
-			if ($obj->accountancy_code_sell && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
-		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
+            print length_accountg($obj->accountancy_code_buy_intra);
+            if ($obj->accountancy_code_buy_intra && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+        } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+            print length_accountg($obj->accountancy_code_buy_export);
+            if ($obj->accountancy_code_buy_export && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+        } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
             print length_accountg($obj->accountancy_code_sell);
             if ($obj->accountancy_code_sell && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
         } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index c69f9a3c7a7..2c8ad2432a3 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -487,8 +487,8 @@ if ($result) {
 		}
 		if (empty($objp->code_buy_l) && empty($objp->code_buy_p)) $code_buy_p_notset = 'color:red';
 
-		// $objp->code_sell_l is now default code of product/service
-		// $objp->code_sell_p is now code of product/service
+		// $objp->code_buy_l is now default code of product/service
+		// $objp->code_buy_p is now code of product/service
 
 		print '<tr class="oddeven">';