diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 3744a9e4bab..c6a3df01cae 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -602,16 +602,15 @@ else if ($action == 'addline' && $user->rights->propal->creer) { // Set if we used free entry or predefined product $predef=''; $product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):''); + $price_ht = GETPOST('price_ht'); if (GETPOST('prod_entry_mode') == 'free') { $idprod=0; - $price_ht = GETPOST('price_ht'); $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); } else { $idprod=GETPOST('idprod', 'int'); - $price_ht = ''; $tva_tx = ''; } diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 62577387bbd..f9f0eed52fd 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -523,16 +523,15 @@ else if ($action == 'addline' && $user->rights->commande->creer) { // Set if we used free entry or predefined product $predef=''; $product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):''); + $price_ht = GETPOST('price_ht'); if (GETPOST('prod_entry_mode') == 'free') { $idprod=0; - $price_ht = GETPOST('price_ht'); $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); } else { $idprod=GETPOST('idprod', 'int'); - $price_ht = ''; $tva_tx = ''; } @@ -1391,7 +1390,7 @@ if ($action == 'create' && $user->rights->commande->creer) { $form->select_comptes($fk_account, 'fk_account', 0, '', 1); print ''; } - + // Delivery delay print '
| '; print $langs->trans('BankAccount'); @@ -2010,7 +2009,7 @@ if ($action == 'create' && $user->rights->commande->creer) { print ' | '; print '|
| ' . $langs->trans('AmountHT') . ' | '; print '' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . ' | '; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 2ea3baa6198..abbffbd5173 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1115,16 +1115,15 @@ else if ($action == 'addline' && $user->rights->facture->creer) // Set if we used free entry or predefined product $predef=''; $product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):''); + $price_ht = GETPOST('price_ht'); if (GETPOST('prod_entry_mode') == 'free') { $idprod=0; - $price_ht = GETPOST('price_ht'); $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); } else { $idprod=GETPOST('idprod', 'int'); - $price_ht = ''; $tva_tx = ''; } diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql index 9b81f0ca78d..9e1ca7bb6f9 100755 --- a/htdocs/install/mysql/migration/repair.sql +++ b/htdocs/install/mysql/migration/repair.sql @@ -115,7 +115,7 @@ ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseu -- Fix: deprecated tag to new one update llx_opensurvey_sondage set format = 'D' where format = 'D+'; update llx_opensurvey_sondage set format = 'A' where format = 'A+'; - +update llx_opensurvey_sondage set tms = now(); -- ALTER TABLE llx_facture_fourn ALTER COLUMN fk_cond_reglement DROP NOT NULL;