From 6bd6be09125cb6a602fe55e9283ee82471989e07 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Nov 2015 18:23:42 +0100
Subject: [PATCH] Debug and rename experimental module "supplier proposal".
Still work to do: Must fix the PDF to be compliant with a request quotation
to a supplier (so no need to show vat, unit price, ...).
---
htdocs/admin/boxes.php | 20 +-
htdocs/admin/company.php | 12 +-
htdocs/admin/dict.php | 2 +-
htdocs/admin/ihm.php | 70 ++---
...ricesupplier.php => supplier_proposal.php} | 102 +++----
htdocs/admin/user.php | 2 +-
htdocs/core/ajax/selectsearchbox.php | 4 +-
htdocs/core/class/commonobject.class.php | 10 +-
htdocs/core/class/conf.class.php | 3 +-
htdocs/core/class/html.form.class.php | 4 +-
htdocs/core/class/html.formactions.class.php | 2 +-
htdocs/core/class/html.formfile.class.php | 16 +-
htdocs/core/class/html.formmail.class.php | 6 +-
...p => html.formsupplier_proposal.class.php} | 8 +-
htdocs/core/lib/functions2.lib.php | 8 +-
...lier.lib.php => supplier_proposal.lib.php} | 32 +-
htdocs/core/lib/usergroups.lib.php | 153 ++++++++--
htdocs/core/menus/standard/eldy.lib.php | 23 +-
...lass.php => modSupplierProposal.class.php} | 100 +++---
...generic_supplier_proposal_odt.modules.php} | 48 +--
.../modules/supplier_proposal/doc}/index.html | 0
.../doc/pdf_aurore.modules.php | 42 +--
.../modules/supplier_proposal}/index.html | 0
.../mod_supplier_proposal_marbre.php} | 12 +-
.../mod_supplier_proposal_saphir.php} | 18 +-
.../modules_supplier_proposal.php} | 18 +-
.../tpl/document_actions_post_headers.tpl.php | 2 +-
htdocs/core/tpl/notes.tpl.php | 2 +-
htdocs/core/tpl/objectline_create.tpl.php | 19 +-
htdocs/core/tpl/objectline_edit.tpl.php | 6 +-
htdocs/core/tpl/objectline_view.tpl.php | 4 +-
.../interface_90_all_Demo.class.php-NORUN | 22 +-
htdocs/fourn/card.php | 6 +-
.../class/fournisseur.commande.class.php | 2 +-
htdocs/fourn/commande/card.php | 18 +-
htdocs/index.php | 5 +-
.../supplier_proposal}/index.html | 0
.../template_supplier_proposal.odt} | Bin
.../install/mysql/migration/3.8.0-3.9.0.sql | 6 +
...supplier.sql => llx_supplier_proposal.sql} | 2 +-
... => llx_supplier_proposal_extrafields.sql} | 2 +-
...erdet.sql => llx_supplier_proposaldet.sql} | 4 +-
... llx_supplier_proposaldet_extrafields.sql} | 2 +-
htdocs/langs/ar_SA/admin.lang | 14 +-
htdocs/langs/ar_SA/main.lang | 2 +-
htdocs/langs/ar_SA/other.lang | 2 +-
htdocs/langs/bg_BG/admin.lang | 14 +-
htdocs/langs/bg_BG/main.lang | 2 +-
htdocs/langs/bg_BG/other.lang | 2 +-
htdocs/langs/bn_BD/admin.lang | 14 +-
htdocs/langs/bn_BD/main.lang | 2 +-
htdocs/langs/bn_BD/other.lang | 2 +-
htdocs/langs/bs_BA/admin.lang | 14 +-
htdocs/langs/bs_BA/main.lang | 2 +-
htdocs/langs/bs_BA/other.lang | 2 +-
htdocs/langs/ca_ES/admin.lang | 14 +-
htdocs/langs/ca_ES/main.lang | 2 +-
htdocs/langs/ca_ES/other.lang | 2 +-
htdocs/langs/cs_CZ/admin.lang | 14 +-
htdocs/langs/cs_CZ/main.lang | 2 +-
htdocs/langs/cs_CZ/other.lang | 2 +-
htdocs/langs/da_DK/admin.lang | 14 +-
htdocs/langs/da_DK/main.lang | 2 +-
htdocs/langs/da_DK/other.lang | 2 +-
htdocs/langs/de_DE/admin.lang | 14 +-
htdocs/langs/de_DE/main.lang | 2 +-
htdocs/langs/de_DE/other.lang | 2 +-
htdocs/langs/el_GR/admin.lang | 14 +-
htdocs/langs/el_GR/main.lang | 2 +-
htdocs/langs/el_GR/other.lang | 2 +-
htdocs/langs/en_US/admin.lang | 16 +-
htdocs/langs/en_US/companies.lang | 2 +
htdocs/langs/en_US/main.lang | 2 +-
htdocs/langs/en_US/other.lang | 2 +-
...cesupplier.lang => supplier_proposal.lang} | 38 +--
htdocs/langs/es_ES/admin.lang | 14 +-
htdocs/langs/es_ES/main.lang | 2 +-
htdocs/langs/es_ES/other.lang | 2 +-
htdocs/langs/et_EE/admin.lang | 14 +-
htdocs/langs/et_EE/main.lang | 2 +-
htdocs/langs/et_EE/other.lang | 2 +-
htdocs/langs/eu_ES/admin.lang | 14 +-
htdocs/langs/eu_ES/main.lang | 2 +-
htdocs/langs/eu_ES/other.lang | 2 +-
htdocs/langs/fa_IR/admin.lang | 14 +-
htdocs/langs/fa_IR/main.lang | 2 +-
htdocs/langs/fa_IR/other.lang | 2 +-
htdocs/langs/fi_FI/admin.lang | 14 +-
htdocs/langs/fi_FI/main.lang | 2 +-
htdocs/langs/fi_FI/other.lang | 2 +-
htdocs/langs/fr_CA/main.lang | 2 +-
htdocs/langs/fr_FR/admin.lang | 14 +-
htdocs/langs/fr_FR/askpricesupplier.lang | 36 +--
htdocs/langs/fr_FR/main.lang | 2 +-
htdocs/langs/fr_FR/other.lang | 2 +-
htdocs/langs/he_IL/admin.lang | 14 +-
htdocs/langs/he_IL/main.lang | 2 +-
htdocs/langs/he_IL/other.lang | 2 +-
htdocs/langs/hr_HR/admin.lang | 14 +-
htdocs/langs/hr_HR/main.lang | 2 +-
htdocs/langs/hr_HR/other.lang | 2 +-
htdocs/langs/hu_HU/admin.lang | 14 +-
htdocs/langs/hu_HU/main.lang | 2 +-
htdocs/langs/hu_HU/other.lang | 2 +-
htdocs/langs/id_ID/admin.lang | 14 +-
htdocs/langs/id_ID/main.lang | 2 +-
htdocs/langs/id_ID/other.lang | 2 +-
htdocs/langs/is_IS/admin.lang | 14 +-
htdocs/langs/is_IS/main.lang | 2 +-
htdocs/langs/is_IS/other.lang | 2 +-
htdocs/langs/it_IT/admin.lang | 14 +-
htdocs/langs/it_IT/main.lang | 2 +-
htdocs/langs/it_IT/other.lang | 2 +-
htdocs/langs/ja_JP/admin.lang | 14 +-
htdocs/langs/ja_JP/main.lang | 2 +-
htdocs/langs/ja_JP/other.lang | 2 +-
htdocs/langs/ka_GE/admin.lang | 14 +-
htdocs/langs/ka_GE/main.lang | 2 +-
htdocs/langs/ka_GE/other.lang | 2 +-
htdocs/langs/kn_IN/admin.lang | 14 +-
htdocs/langs/kn_IN/main.lang | 2 +-
htdocs/langs/kn_IN/other.lang | 2 +-
htdocs/langs/ko_KR/admin.lang | 14 +-
htdocs/langs/ko_KR/main.lang | 2 +-
htdocs/langs/ko_KR/other.lang | 2 +-
htdocs/langs/lo_LA/admin.lang | 14 +-
htdocs/langs/lo_LA/main.lang | 2 +-
htdocs/langs/lo_LA/other.lang | 2 +-
htdocs/langs/lt_LT/admin.lang | 14 +-
htdocs/langs/lt_LT/main.lang | 2 +-
htdocs/langs/lt_LT/other.lang | 2 +-
htdocs/langs/lv_LV/admin.lang | 14 +-
htdocs/langs/lv_LV/main.lang | 2 +-
htdocs/langs/lv_LV/other.lang | 2 +-
htdocs/langs/mk_MK/admin.lang | 14 +-
htdocs/langs/mk_MK/main.lang | 2 +-
htdocs/langs/mk_MK/other.lang | 2 +-
htdocs/langs/nb_NO/admin.lang | 14 +-
htdocs/langs/nb_NO/main.lang | 2 +-
htdocs/langs/nb_NO/other.lang | 2 +-
htdocs/langs/nl_NL/admin.lang | 14 +-
htdocs/langs/nl_NL/main.lang | 2 +-
htdocs/langs/nl_NL/other.lang | 2 +-
htdocs/langs/pl_PL/admin.lang | 14 +-
htdocs/langs/pl_PL/main.lang | 2 +-
htdocs/langs/pl_PL/other.lang | 2 +-
htdocs/langs/pt_BR/admin.lang | 8 +-
htdocs/langs/pt_BR/main.lang | 2 +-
htdocs/langs/pt_BR/other.lang | 2 +-
htdocs/langs/pt_PT/admin.lang | 14 +-
htdocs/langs/pt_PT/main.lang | 2 +-
htdocs/langs/pt_PT/other.lang | 2 +-
htdocs/langs/ro_RO/admin.lang | 14 +-
htdocs/langs/ro_RO/main.lang | 2 +-
htdocs/langs/ro_RO/other.lang | 2 +-
htdocs/langs/ru_RU/admin.lang | 14 +-
htdocs/langs/ru_RU/main.lang | 2 +-
htdocs/langs/ru_RU/other.lang | 2 +-
htdocs/langs/sk_SK/admin.lang | 14 +-
htdocs/langs/sk_SK/main.lang | 2 +-
htdocs/langs/sk_SK/other.lang | 2 +-
htdocs/langs/sl_SI/admin.lang | 14 +-
htdocs/langs/sl_SI/main.lang | 2 +-
htdocs/langs/sl_SI/other.lang | 2 +-
htdocs/langs/sq_AL/admin.lang | 14 +-
htdocs/langs/sq_AL/main.lang | 2 +-
htdocs/langs/sq_AL/other.lang | 2 +-
htdocs/langs/sr_RS/admin.lang | 14 +-
htdocs/langs/sr_RS/main.lang | 2 +-
htdocs/langs/sr_RS/other.lang | 2 +-
htdocs/langs/sv_SE/admin.lang | 14 +-
htdocs/langs/sv_SE/main.lang | 2 +-
htdocs/langs/sv_SE/other.lang | 2 +-
htdocs/langs/sw_SW/admin.lang | 14 +-
htdocs/langs/sw_SW/main.lang | 2 +-
htdocs/langs/sw_SW/other.lang | 2 +-
htdocs/langs/th_TH/admin.lang | 14 +-
htdocs/langs/th_TH/main.lang | 2 +-
htdocs/langs/th_TH/other.lang | 2 +-
htdocs/langs/tr_TR/admin.lang | 14 +-
htdocs/langs/tr_TR/main.lang | 2 +-
htdocs/langs/tr_TR/other.lang | 2 +-
htdocs/langs/uk_UA/admin.lang | 14 +-
htdocs/langs/uk_UA/main.lang | 2 +-
htdocs/langs/uk_UA/other.lang | 2 +-
htdocs/langs/uz_UZ/admin.lang | 14 +-
htdocs/langs/uz_UZ/main.lang | 2 +-
htdocs/langs/uz_UZ/other.lang | 2 +-
htdocs/langs/vi_VN/admin.lang | 14 +-
htdocs/langs/vi_VN/main.lang | 2 +-
htdocs/langs/vi_VN/other.lang | 2 +-
htdocs/langs/zh_CN/admin.lang | 14 +-
htdocs/langs/zh_CN/main.lang | 2 +-
htdocs/langs/zh_CN/other.lang | 2 +-
htdocs/langs/zh_TW/admin.lang | 14 +-
htdocs/langs/zh_TW/main.lang | 2 +-
htdocs/langs/zh_TW/other.lang | 2 +-
htdocs/product/class/product.class.php | 2 +-
htdocs/societe/class/societe.class.php | 2 +-
.../admin/supplier_proposal_extrafields.php} | 14 +-
.../supplier_proposaldet_extrafields.php} | 14 +-
.../card.php | 158 +++++-----
.../class}/index.html | 0
.../class/supplier_proposal.class.php} | 288 +++++++++---------
.../document.php | 24 +-
.../index.php | 74 ++---
.../info.php | 16 +-
.../list.php | 42 +--
.../note.php | 22 +-
.../tpl}/index.html | 0
.../tpl/linkedobjectblock.tpl.php | 8 +-
...plier.png => object_supplier_proposal.png} | Bin
htdocs/theme/eldy/style.css.php | 34 +--
htdocs/theme/md/img/object_printer.png | Bin 0 -> 296 bytes
...plier.png => object_supplier_proposal.png} | Bin
htdocs/theme/md/style.css.php | 50 +--
htdocs/user/admin/group_extrafields.php | 2 +-
htdocs/user/admin/user_extrafields.php | 2 +-
218 files changed, 1343 insertions(+), 1200 deletions(-)
rename htdocs/admin/{askpricesupplier.php => supplier_proposal.php} (80%)
rename htdocs/core/class/{html.formaskpricesupplier.class.php => html.formsupplier_proposal.class.php} (93%)
rename htdocs/core/lib/{askpricesupplier.lib.php => supplier_proposal.lib.php} (72%)
rename htdocs/core/modules/{modAskPriceSupplier.class.php => modSupplierProposal.class.php} (65%)
rename htdocs/core/modules/{askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php => supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php} (88%)
rename htdocs/{comm/askpricesupplier/class => core/modules/supplier_proposal/doc}/index.html (100%)
rename htdocs/core/modules/{askpricesupplier => supplier_proposal}/doc/pdf_aurore.modules.php (97%)
rename htdocs/{comm/askpricesupplier/tpl => core/modules/supplier_proposal}/index.html (100%)
rename htdocs/core/modules/{askpricesupplier/mod_askpricesupplier_marbre.php => supplier_proposal/mod_supplier_proposal_marbre.php} (90%)
rename htdocs/core/modules/{askpricesupplier/mod_askpricesupplier_saphir.php => supplier_proposal/mod_supplier_proposal_saphir.php} (83%)
rename htdocs/core/modules/{askpricesupplier/modules_askpricesupplier.php => supplier_proposal/modules_supplier_proposal.php} (88%)
rename htdocs/{core/modules/askpricesupplier/doc => install/doctemplates/supplier_proposal}/index.html (100%)
rename htdocs/install/doctemplates/{askpricesupplier/template_askpricesupplier.odt => supplier_proposal/template_supplier_proposal.odt} (100%)
rename htdocs/install/mysql/tables/{llx_askpricesupplier.sql => llx_supplier_proposal.sql} (98%)
rename htdocs/install/mysql/tables/{llx_askpricesupplier_extrafields.sql => llx_supplier_proposal_extrafields.sql} (95%)
rename htdocs/install/mysql/tables/{llx_askpricesupplierdet.sql => llx_supplier_proposaldet.sql} (95%)
rename htdocs/install/mysql/tables/{llx_askpricesupplierdet_extrafields.sql => llx_supplier_proposaldet_extrafields.sql} (95%)
rename htdocs/langs/en_US/{askpricesupplier.lang => supplier_proposal.lang} (64%)
rename htdocs/{comm/admin/askpricesupplier_extrafields.php => supplier_proposal/admin/supplier_proposal_extrafields.php} (92%)
rename htdocs/{comm/admin/askpricesupplierdet_extrafields.php => supplier_proposal/admin/supplier_proposaldet_extrafields.php} (92%)
rename htdocs/{comm/askpricesupplier => supplier_proposal}/card.php (91%)
rename htdocs/{core/modules/askpricesupplier => supplier_proposal/class}/index.html (100%)
rename htdocs/{comm/askpricesupplier/class/askpricesupplier.class.php => supplier_proposal/class/supplier_proposal.class.php} (88%)
rename htdocs/{comm/askpricesupplier => supplier_proposal}/document.php (81%)
rename htdocs/{comm/askpricesupplier => supplier_proposal}/index.php (79%)
rename htdocs/{comm/askpricesupplier => supplier_proposal}/info.php (81%)
rename htdocs/{comm/askpricesupplier => supplier_proposal}/list.php (90%)
rename htdocs/{comm/askpricesupplier => supplier_proposal}/note.php (80%)
rename htdocs/{install/doctemplates/askpricesupplier => supplier_proposal/tpl}/index.html (100%)
rename htdocs/{comm/askpricesupplier => supplier_proposal}/tpl/linkedobjectblock.tpl.php (85%)
rename htdocs/theme/eldy/img/{object_askpricesupplier.png => object_supplier_proposal.png} (100%)
create mode 100644 htdocs/theme/md/img/object_printer.png
rename htdocs/theme/md/img/{object_askpricesupplier.png => object_supplier_proposal.png} (100%)
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 5b6d64801b5..9e09bf87b1d 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -48,7 +48,8 @@ $boxes = array();
if ($action == 'addconst')
{
- dolibarr_set_const($db, "MAIN_BOXES_MAXLINES",$_POST["MAIN_BOXES_MAXLINES"],'',0,'',$conf->entity);
+ dolibarr_set_const($db, "MAIN_BOXES_MAXLINES", $_POST["MAIN_BOXES_MAXLINES"],'',0,'',$conf->entity);
+ dolibarr_set_const($db, "MAIN_ACTIVATE_FILECACHE", $_POST["MAIN_ACTIVATE_FILECACHE"],'chaine',0,'',$conf->entity);
}
if ($action == 'add') {
@@ -456,8 +457,8 @@ $var=false;
print '<tr class="liste_titre">';
print '<td class="liste_titre">'.$langs->trans("Parameter").'</td>';
print '<td class="liste_titre">'.$langs->trans("Value").'</td>';
-print '<td class="liste_titre"></td>';
print '</tr>';
+
print '<tr '.$bc[$var].'>';
print '<td>';
print $langs->trans("MaxNbOfLinesForBoxes");
@@ -465,12 +466,21 @@ print '</td>'."\n";
print '<td>';
print '<input type="text" class="flat" size="6" name="MAIN_BOXES_MAXLINES" value="'.$conf->global->MAIN_BOXES_MAXLINES.'">';
print '</td>';
-print '<td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Save").'" name="Button">';
-print '</td>'."\n";
print '</tr>';
+// Activate FileCache - Developement
+if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+ $var=!$var;
+ print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("EnableFileCache").'</td><td>';
+ print $form->selectyesno('MAIN_ACTIVATE_FILECACHE',$conf->global->MAIN_ACTIVATE_FILECACHE,1);
+ print '</td>';
+ print '</tr>';
+}
+
print '</table>';
+
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'" name="Button"></div>';
+
print '</form>';
print "\n".'<!-- End Other Const -->'."\n";
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index b239a431121..be7756e5900 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -965,7 +965,7 @@ else
$var=true;
$var=!$var;
- print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
+ print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
print '<td colspan="2">';
print "<table>";
print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
@@ -974,7 +974,7 @@ else
print "</td></tr>\n";
$var=!$var;
- print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
+ print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
print '<td colspan="2">';
print "<table>";
print "<tr><td><label=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
@@ -1000,7 +1000,7 @@ else
$var=true;
$var=!$var;
- print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
+ print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
print '<td colspan="2">';
print "<table>";
print "<tr><td></label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1028,7 +1028,7 @@ else
print "</td></tr>\n";
$var=!$var;
- print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
+ print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
print '<td colspan="2">';
print "<table>";
print "<tr><td><label for=\"no_lt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1051,7 +1051,7 @@ else
$var=true;
$var=!$var;
- print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
+ print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
print '<td colspan="2">';
print "<table>";
print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
@@ -1080,7 +1080,7 @@ else
print "</td></tr>\n";
$var=!$var;
- print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
+ print "<tr ".$bc[$var]."><td width=\"160\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off")?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
print '<td colspan="2">';
print "<table>";
print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 099c41f4685..973c1b9c961 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -486,7 +486,7 @@ if ($id == 25)
'shipping_send' => $langs->trans('MailToSendShipment'),
'fichinter_send' => $langs->trans('MailToSendIntervention'),
- 'askpricesupplier_send' => $langs->trans('MailToSendSupplierRequestForQuotation'),
+ 'supplier_proposal_send' => $langs->trans('MailToSendSupplierRequestForQuotation'),
'order_supplier_send' => $langs->trans('MailToSendSupplierOrder'),
'invoice_supplier_send' => $langs->trans('MailToSendSupplierInvoice'),
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 6907e30f979..99c79995352 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -56,24 +56,28 @@ if (empty($conf->use_javascript_ajax))
$searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name','Module310Name','Module400Name');
}
+
+/*
+ * Action
+ */
+
+if ($action == 'cancel')
+{
+ $action='';
+}
+
if ($action == 'update')
{
dolibarr_set_const($db, "MAIN_LANG_DEFAULT", $_POST["main_lang_default"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_MULTILANGS", $_POST["main_multilangs"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT", $_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_SIZE_SHORTLISTE_LIMIT", $_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", $_POST["main_disable_javascript"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", $_POST["MAIN_BUTTON_HIDE_UNAUTHORIZED"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_START_WEEK", $_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", $_POST["MAIN_DEFAULT_WORKING_DAYS"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", $_POST["MAIN_DEFAULT_WORKING_HOURS"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_SHOW_LOGO", $_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_ACTIVATE_FILECACHE", $_POST["MAIN_ACTIVATE_FILECACHE"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", $_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_THEME", $_POST["main_theme"],'chaine',0,'',$conf->entity);
- $val=(join(',',(colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array()))));
+ $val=(join(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array()))));
+ if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKBODY', $conf->entity);
+ else dolibarr_set_const($db, 'THEME_ELDY_BACKBODY', join(',',colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array())),'chaine',0,'',$conf->entity);
+
+ $val=(join(',',(colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array()))));
if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TOPMENU_BACK1', $conf->entity);
else dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', join(',',colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array())),'chaine',0,'',$conf->entity);
@@ -81,7 +85,14 @@ if ($action == 'update')
if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKTITLE1', $conf->entity);
else dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', join(',',colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array())),'chaine',0,'',$conf->entity);
- /*
+ if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_del_const($db, "THEME_ELDY_USE_HOVER", $conf->entity);
+ else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity);
+
+ $val=(join(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array()))));
+ if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTLINK', $conf->entity);
+ else dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', join(',',colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array())),'chaine',0,'',$conf->entity);
+
+ /*
dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT", $_POST["MAIN_SEARCHFORM_CONTACT"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE", $_POST["MAIN_SEARCHFORM_SOCIETE"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE", $_POST["MAIN_SEARCHFORM_PRODUITSERVICE"],'chaine',0,'',$conf->entity);
@@ -91,15 +102,22 @@ if ($action == 'update')
dolibarr_set_const($db, "MAIN_SEARCHFORM_EMPLOYEE", $_POST["MAIN_SEARCHFORM_EMPLOYEE"],'chaine',0,'',$conf->entity);
*/
+ dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT", $_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "MAIN_SIZE_SHORTLISTE_LIMIT", $_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", $_POST["main_disable_javascript"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", $_POST["MAIN_BUTTON_HIDE_UNAUTHORIZED"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "MAIN_START_WEEK", $_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", $_POST["MAIN_DEFAULT_WORKING_DAYS"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", $_POST["MAIN_DEFAULT_WORKING_HOURS"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "MAIN_SHOW_LOGO", $_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", $_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity);
+
dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK", $_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0); // Param for all entities
dolibarr_set_const($db, "MAIN_MOTD", dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_HOME", dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_HELP_DISABLELINK", $_POST["MAIN_HELP_DISABLELINK"],'chaine',0,'',0); // Param for all entities
dolibarr_set_const($db, "MAIN_BUGTRACK_ENABLELINK", $_POST["MAIN_BUGTRACK_ENABLELINK"],'chaine',0,'',$conf->entity);
- if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_del_const($db, "THEME_ELDY_USE_HOVER", $conf->entity);
- else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity);
-
// This one is not always defined
if (isset($_POST["MAIN_USE_PREVIEW_TABS"])) dolibarr_set_const($db, "MAIN_USE_PREVIEW_TABS", $_POST["MAIN_USE_PREVIEW_TABS"],'chaine',0,'',$conf->entity);
@@ -199,16 +217,6 @@ if ($action == 'edit') // Edit
print '<td width="20"> </td>';
print '</tr>';
- // Activate FileCache - Developement
- if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
- $var=!$var;
- print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("EnableFileCache").'</td><td>';
- print $form->selectyesno('MAIN_ACTIVATE_FILECACHE',$conf->global->MAIN_ACTIVATE_FILECACHE,1);
- print '</td>';
- print '<td width="20"> </td>';
- print '</tr>';
- }
-
// Max size of lists
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td><input class="flat" name="main_size_liste_limit" size="4" value="' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '"></td>';
@@ -328,10 +336,11 @@ if ($action == 'edit') // Edit
print '<br><div class="center">';
print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+ print ' ';
+ print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel">'.$langs->trans("Cancel").'</a>';
print '</div>';
print '</form>';
- print '<br>';
}
else // Show
{
@@ -393,14 +402,6 @@ else // Show
print '<td width="20"> </td>';
print "</tr>";
- // Activate FileCache - Developement
- if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
- $var=!$var;
- print '<tr '.$bc[$var].'><td>'.$langs->trans("EnableFileCache").'</td><td>' . yn($conf->global->MAIN_ACTIVATE_FILECACHE) . '</td>';
- print '<td width="20"> </td>';
- print "</tr>";
- }
-
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
print '<td width="20"> </td>';
@@ -505,7 +506,6 @@ else // Show
print '<div class="tabsAction">';
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
print '</div>';
- print '<br>';
}
diff --git a/htdocs/admin/askpricesupplier.php b/htdocs/admin/supplier_proposal.php
similarity index 80%
rename from htdocs/admin/askpricesupplier.php
rename to htdocs/admin/supplier_proposal.php
index 9afcd1a8f62..64122636a08 100644
--- a/htdocs/admin/askpricesupplier.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -25,12 +25,12 @@
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
$langs->load("admin");
$langs->load("errors");
$langs->load('other');
-$langs->load('askpricesupplier');
+$langs->load('supplier_proposal');
if (! $user->admin) accessforbidden();
@@ -38,7 +38,7 @@ $action = GETPOST('action','alpha');
$value = GETPOST('value','alpha');
$label = GETPOST('label','alpha');
$scandir = GETPOST('scandir','alpha');
-$type='askpricesupplier';
+$type='supplier_proposal';
/*
* Actions
@@ -46,9 +46,9 @@ $type='askpricesupplier';
$error=0;
if ($action == 'updateMask')
{
- $maskconstaskpricesupplier=GETPOST('maskconstaskpricesupplier','alpha');
- $maskaskpricesupplier=GETPOST('maskaskpricesupplier','alpha');
- if ($maskconstaskpricesupplier) $res = dolibarr_set_const($db,$maskconstaskpricesupplier,$maskaskpricesupplier,'chaine',0,'',$conf->entity);
+ $maskconstsupplier_proposal=GETPOST('maskconstsupplier_proposal','alpha');
+ $masksupplier_proposal=GETPOST('masksupplier_proposal','alpha');
+ if ($maskconstsupplier_proposal) $res = dolibarr_set_const($db,$maskconstsupplier_proposal,$masksupplier_proposal,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
@@ -66,15 +66,15 @@ if ($action == 'specimen')
{
$modele=GETPOST('module','alpha');
- $askpricesupplier = new AskPriceSupplier($db);
- $askpricesupplier->initAsSpecimen();
+ $supplier_proposal = new SupplierProposal($db);
+ $supplier_proposal->initAsSpecimen();
// Search template files
$file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
foreach($dirmodels as $reldir)
{
- $file=dol_buildpath($reldir."core/modules/askpricesupplier/doc/pdf_".$modele.".modules.php");
+ $file=dol_buildpath($reldir."core/modules/supplier_proposal/doc/pdf_".$modele.".modules.php");
if (file_exists($file))
{
$filefound=1;
@@ -89,9 +89,9 @@ if ($action == 'specimen')
$module = new $classname($db);
- if ($module->write_file($askpricesupplier,$langs) > 0)
+ if ($module->write_file($supplier_proposal,$langs) > 0)
{
- header("Location: ".DOL_URL_ROOT."/document.php?modulepart=askpricesupplier&file=SPECIMEN.pdf");
+ header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_proposal&file=SPECIMEN.pdf");
return;
}
else
@@ -107,11 +107,11 @@ if ($action == 'specimen')
}
}
-if ($action == 'set_ASKPRICESUPPLIER_DRAFT_WATERMARK')
+if ($action == 'set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK')
{
- $draft = GETPOST('ASKPRICESUPPLIER_DRAFT_WATERMARK','alpha');
+ $draft = GETPOST('SUPPLIER_PROPOSAL_DRAFT_WATERMARK','alpha');
- $res = dolibarr_set_const($db, "ASKPRICESUPPLIER_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
+ $res = dolibarr_set_const($db, "SUPPLIER_PROPOSAL_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
if (! $error)
@@ -124,11 +124,11 @@ if ($action == 'set_ASKPRICESUPPLIER_DRAFT_WATERMARK')
}
}
-if ($action == 'set_ASKPRICESUPPLIER_FREE_TEXT')
+if ($action == 'set_SUPPLIER_PROPOSAL_FREE_TEXT')
{
- $freetext = GETPOST('ASKPRICESUPPLIER_FREE_TEXT'); // No alpha here, we want exact string
+ $freetext = GETPOST('SUPPLIER_PROPOSAL_FREE_TEXT'); // No alpha here, we want exact string
- $res = dolibarr_set_const($db, "ASKPRICESUPPLIER_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
+ $res = dolibarr_set_const($db, "SUPPLIER_PROPOSAL_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
@@ -142,9 +142,9 @@ if ($action == 'set_ASKPRICESUPPLIER_FREE_TEXT')
}
}
-if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER')
+if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
{
- $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER",$value,'chaine',0,'',$conf->entity);
+ $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL",$value,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
@@ -198,15 +198,15 @@ else if ($action == 'del')
$ret = delDocumentModel($value, $type);
if ($ret > 0)
{
- if ($conf->global->ASKPRICESUPPLIER_ADDON_PDF == "$value") dolibarr_del_const($db, 'ASKPRICESUPPLIER_ADDON_PDF',$conf->entity);
+ if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PROPOSAL_ADDON_PDF',$conf->entity);
}
}
else if ($action == 'setdoc')
{
- if (dolibarr_set_const($db, "ASKPRICESUPPLIER_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
+ if (dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
{
- $conf->global->ASKPRICESUPPLIER_ADDON_PDF = $value;
+ $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF = $value;
}
// On active le modele
@@ -222,7 +222,7 @@ else if ($action == 'setmod')
// TODO Verifier si module numerotation choisi peut etre active
// par appel methode canBeActivated
- dolibarr_set_const($db, "ASKPRICESUPPLIER_ADDON",$value,'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON",$value,'chaine',0,'',$conf->entity);
}
@@ -233,23 +233,23 @@ else if ($action == 'setmod')
$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
-llxHeader('',$langs->trans("AskPriceSupplierSetup"));
+llxHeader('',$langs->trans("SupplierProposalSetup"));
$form=new Form($db);
//if ($mesg) print $mesg;
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SupplierProposalSetup"),$linkback,'title_setup');
-$head = askpricesupplier_admin_prepare_head();
+$head = supplier_proposal_admin_prepare_head();
-dol_fiche_head($head, 'general', $langs->trans("CommRequests"), 0, 'askpricesupplier');
+dol_fiche_head($head, 'general', $langs->trans("CommRequests"), 0, 'supplier_proposal');
/*
* Module numerotation
*/
-print load_fiche_titre($langs->trans("AskPriceSupplierNumberingModules"),'','');
+print load_fiche_titre($langs->trans("SupplierProposalNumberingModules"),'','');
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -263,7 +263,7 @@ print '</tr>'."\n";
clearstatcache();
foreach ($dirmodels as $reldir)
{
- $dir = dol_buildpath($reldir."core/modules/askpricesupplier/");
+ $dir = dol_buildpath($reldir."core/modules/supplier_proposal/");
if (is_dir($dir))
{
@@ -274,7 +274,7 @@ foreach ($dirmodels as $reldir)
while (($file = readdir($handle))!==false)
{
- if (substr($file, 0, 21) == 'mod_askpricesupplier_' && substr($file, dol_strlen($file)-3, 3) == 'php')
+ if (substr($file, 0, 21) == 'mod_supplier_proposal_' && substr($file, dol_strlen($file)-3, 3) == 'php')
{
$file = substr($file, 0, dol_strlen($file)-4);
@@ -302,7 +302,7 @@ foreach ($dirmodels as $reldir)
print '</td>'."\n";
print '<td align="center">';
- if ($conf->global->ASKPRICESUPPLIER_ADDON == "$file")
+ if ($conf->global->SUPPLIER_PROPOSAL_ADDON == "$file")
{
print img_picto($langs->trans("Activated"),'switch_on');
}
@@ -314,13 +314,13 @@ foreach ($dirmodels as $reldir)
}
print '</td>';
- $askpricesupplier=new AskPriceSupplier($db);
- $askpricesupplier->initAsSpecimen();
+ $supplier_proposal=new SupplierProposal($db);
+ $supplier_proposal->initAsSpecimen();
// Info
$htmltooltip='';
$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
- $nextval=$module->getNextValue($mysoc,$askpricesupplier);
+ $nextval=$module->getNextValue($mysoc,$supplier_proposal);
if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
$htmltooltip.=''.$langs->trans("NextValue").': ';
if ($nextval) {
@@ -351,7 +351,7 @@ print "</table><br>\n";
* Document templates generators
*/
-print load_fiche_titre($langs->trans("AskPriceSupplierPDFModules"),'','');
+print load_fiche_titre($langs->trans("SupplierProposalPDFModules"),'','');
// Load array def with activated templates
$def = array();
@@ -394,7 +394,7 @@ foreach ($dirmodels as $reldir)
{
foreach (array('','/doc') as $valdir)
{
- $dir = dol_buildpath($reldir."core/modules/askpricesupplier".$valdir);
+ $dir = dol_buildpath($reldir."core/modules/supplier_proposal".$valdir);
if (is_dir($dir))
{
@@ -452,7 +452,7 @@ foreach ($dirmodels as $reldir)
// Defaut
print "<td align=\"center\">";
- if ($conf->global->ASKPRICESUPPLIER_ADDON_PDF == "$name")
+ if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$name")
{
print img_picto($langs->trans("Default"),'on');
}
@@ -526,10 +526,10 @@ print "</tr>";
$var=! $var;
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_ASKPRICESUPPLIER_FREE_TEXT">';
+print '<input type="hidden" name="action" value="set_SUPPLIER_PROPOSAL_FREE_TEXT">';
print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("FreeLegalTextOnAskPriceSupplier").' ('.$langs->trans("AddCRIfTooLong").')<br>';
-$variablename='ASKPRICESUPPLIER_FREE_TEXT';
+print $langs->trans("FreeLegalTextOnSupplierProposal").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+$variablename='SUPPLIER_PROPOSAL_FREE_TEXT';
if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
{
print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
@@ -548,10 +548,10 @@ print '</form>';
$var=!$var;
print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print "<input type=\"hidden\" name=\"action\" value=\"set_ASKPRICESUPPLIER_DRAFT_WATERMARK\">";
+print "<input type=\"hidden\" name=\"action\" value=\"set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK\">";
print '<tr '.$bc[$var].'><td colspan="2">';
-print $langs->trans("WatermarkOnDraftAskPriceSupplier").'<br>';
-print '<input size="50" class="flat" type="text" name="ASKPRICESUPPLIER_DRAFT_WATERMARK" value="'.$conf->global->ASKPRICESUPPLIER_DRAFT_WATERMARK.'">';
+print $langs->trans("WatermarkOnDraftSupplierProposal").'<br>';
+print '<input size="50" class="flat" type="text" name="SUPPLIER_PROPOSAL_DRAFT_WATERMARK" value="'.$conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK.'">';
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td></tr>\n";
@@ -561,20 +561,20 @@ if ($conf->banque->enabled)
{
$var=!$var;
print '<tr '.$bc[$var].'><td>';
- print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER").'</td><td> </td><td align="right">';
+ print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td> </td><td align="right">';
if (! empty($conf->use_javascript_ajax))
{
- print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER');
+ print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL');
}
else
{
- if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER))
+ if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL))
{
- print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER&value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+ print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
}
else
{
- print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER&value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+ print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
}
}
print '</td></tr>';
@@ -583,7 +583,7 @@ else
{
$var=!$var;
print '<tr '.$bc[$var].'><td>';
- print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER").'</td><td> </td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
+ print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td> </td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
}
print '</table>';
@@ -601,7 +601,7 @@ print "<tr class=\"liste_titre\">\n";
print " <td>".$langs->trans("Name")."</td>\n";
print " <td>".$langs->trans("Value")."</td>\n";
print "</tr>\n";
-print "<tr ".$bc[false].">\n <td width=\"140\">".$langs->trans("PathDirectory")."</td>\n <td>".$conf->askpricesupplier->dir_output."</td>\n</tr>\n";
+print "<tr ".$bc[false].">\n <td width=\"140\">".$langs->trans("PathDirectory")."</td>\n <td>".$conf->supplier_proposal->dir_output."</td>\n</tr>\n";
print "</table>\n<br>";
$db->close();
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 85ea8501107..f76762c8334 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -100,7 +100,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
$head=user_admin_prepare_head();
-dol_fiche_head($head,'card', $langs->trans("User"), 0, 'user');
+dol_fiche_head($head,'card', $langs->trans("MenuUsersAndGroups"), 0, 'user');
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 10694adf8d7..6c91974b4a4 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -94,9 +94,9 @@ if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM
{
$arrayresult['searchintosupplierorder']=array('text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php?search_all='.urlencode($search_boxvalue));
}
-if (! empty($conf->askpricesupplier->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->askpricesupplier->lire)
+if (! empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire)
{
- $arrayresult['searchintosupplierpropal']=array('text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/askpricesupplier/list.php?sall='.urlencode($search_boxvalue));
+ $arrayresult['searchintosupplierpropal']=array('text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php?sall='.urlencode($search_boxvalue));
}
if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e4bb572a3eb..934eb672c7c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2183,7 +2183,7 @@ abstract class CommonObject
if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';
if ($this->element == 'propal') $fieldttc='total';
if ($this->element == 'expensereport') $fieldtva='total_tva';
- if ($this->element == 'askpricesupplier') $fieldttc='total';
+ if ($this->element == 'supplier_proposal') $fieldttc='total';
if (empty($nodatabaseupdate))
{
@@ -2394,8 +2394,8 @@ abstract class CommonObject
else if ($objecttype == 'propal') {
$classpath = 'comm/propal/class';
}
- else if ($objecttype == 'askpricesupplier') {
- $classpath = 'comm/askpricesupplier/class';
+ else if ($objecttype == 'supplier_proposal') {
+ $classpath = 'supplier_proposal/class';
}
else if ($objecttype == 'shipping') {
$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
@@ -3046,9 +3046,9 @@ abstract class CommonObject
// Description
print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
- if ($this->element == 'askpricesupplier')
+ if ($this->element == 'supplier_proposal')
{
- print '<td class="linerefsupplier" align="right"><span id="title_fourn_ref">'.$langs->trans("AskPriceSupplierRefFourn").'</span></td>';
+ print '<td class="linerefsupplier" align="right"><span id="title_fourn_ref">'.$langs->trans("SupplierProposalRefFourn").'</span></td>';
}
// VAT
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 5d70b2d2eea..3aac36f3f37 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -193,6 +193,7 @@ class Conf
{
$modulename=strtolower($reg[1]);
if ($modulename == 'propale') $modulename='propal';
+ if ($modulename == 'supplierproposal') $modulename='supplier_proposal';
if (! isset($this->$modulename) || ! is_object($this->$modulename)) $this->$modulename=new stdClass();
$this->$modulename->enabled=true;
$this->modules[]=$modulename; // Add this module in list of enabled modules
@@ -451,7 +452,7 @@ class Conf
$this->maxfilesize = (empty($this->global->MAIN_UPLOAD_DOC) ? 0 : $this->global->MAIN_UPLOAD_DOC * 1024);
// Define list of limited modules
- if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,askpricesupplier,facture,categorie,commande,fournisseur,contact,propal,projet,contrat,societe,ficheinter,expedition,agenda,adherent'; // '' means 'all'. Note that contact is added here as it should be a module later.
+ if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,supplier_proposal,facture,categorie,commande,fournisseur,contact,propal,projet,contrat,societe,ficheinter,expedition,agenda,adherent'; // '' means 'all'. Note that contact is added here as it should be a module later.
// Enable select2
if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') $this->global->MAIN_USE_JQUERY_MULTISELECT='select2';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 49d5265e0f8..9f56fe507bb 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4895,9 +4895,9 @@ class Form
$tplpath = 'comm/'.$element;
if (empty($conf->propal->enabled)) continue; // Do not show if module disabled
}
- else if ($objecttype == 'askpricesupplier') {
+ else if ($objecttype == 'supplier_proposal') {
$tplpath = 'comm/'.$element;
- if (empty($conf->askpricesupplier->enabled)) continue; // Do not show if module disabled
+ if (empty($conf->supplier_proposal->enabled)) continue; // Do not show if module disabled
}
else if ($objecttype == 'shipping' || $objecttype == 'shipment') {
$tplpath = 'expedition';
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index a5404135982..94a642efce3 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -171,7 +171,7 @@ class FormActions
if ($typeelement == 'invoice') $title=$langs->trans('ActionsOnBill');
elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
elseif ($typeelement == 'propal') $title=$langs->trans('ActionsOnPropal');
- elseif ($typeelement == 'askpricesupplier') $title=$langs->trans('ActionsOnAskPriceSupplier');
+ elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
elseif ($typeelement == 'order') $title=$langs->trans('ActionsOnOrder');
elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order') $title=$langs->trans('ActionsOnOrder');
elseif ($typeelement == 'project') $title=$langs->trans('ActionsOnProject');
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index b4f1bef9ccd..689f5c1d8a5 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -285,7 +285,7 @@ class FormFile
}
$printer=0;
- if (in_array($modulepart,array('facture','askpricesupplier','propal','proposal','order','commande','expedition', 'commande_fournisseur'))) // The direct print feature is implemented only for such elements
+ if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur'))) // The direct print feature is implemented only for such elements
{
$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled))?true:false;
}
@@ -329,13 +329,13 @@ class FormFile
$modellist=ModelePDFPropales::liste_modeles($this->db);
}
}
- else if ($modulepart == 'askpricesupplier')
+ else if ($modulepart == 'supplier_proposal')
{
if (is_array($genallowed)) $modellist=$genallowed;
else
{
- include_once DOL_DOCUMENT_ROOT.'/core/modules/askpricesupplier/modules_askpricesupplier.php';
- $modellist=ModelePDFAskPriceSupplier::liste_modeles($this->db);
+ include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
+ $modellist=ModelePDFSupplierProposal::liste_modeles($this->db);
}
}
else if ($modulepart == 'commande')
@@ -992,10 +992,10 @@ class FormFile
include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
$object_instance=new Propal($this->db);
}
- else if ($modulepart == 'askpricesupplier')
+ else if ($modulepart == 'supplier_proposal')
{
- include_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php';
- $object_instance=new AskPriceSupplier($this->db);
+ include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+ $object_instance=new SupplierProposal($this->db);
}
else if ($modulepart == 'order')
{
@@ -1058,7 +1058,7 @@ class FormFile
if ($modulepart == 'invoice') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); }
if ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); if (is_numeric($ref)) { $id=$ref; $ref=''; } } // $ref may be also id with old supplier invoices
if ($modulepart == 'propal') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); }
- if ($modulepart == 'askpricesupplier') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); }
+ if ($modulepart == 'supplier_proposal') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); }
if ($modulepart == 'order') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); }
if ($modulepart == 'order_supplier') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); }
if ($modulepart == 'contract') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); }
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 08474776512..34668e23c90 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -524,7 +524,7 @@ class FormMail extends Form
$showinfobcc='';
if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
- if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_ASKPRICESUPPLIER_TO) && ! empty($this->param['models']) && $this->param['models'] == 'askpricesupplier_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_ASKPRICESUPPLIER_TO;
+ if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;
if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
if ($showinfobcc) $out.=' + '.$showinfobcc;
@@ -544,7 +544,7 @@ class FormMail extends Form
{
$defaultvaluefordeliveryreceipt=0;
if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $defaultvaluefordeliveryreceipt=1;
- if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ASKPRICESUPPLIER) && ! empty($this->param['models']) && $this->param['models'] == 'askpricesupplier_send') $defaultvaluefordeliveryreceipt=1;
+ if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $defaultvaluefordeliveryreceipt=1;
if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $defaultvaluefordeliveryreceipt=1;
if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $defaultvaluefordeliveryreceipt=1;
$out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:$defaultvaluefordeliveryreceipt), 1);
@@ -786,7 +786,7 @@ class FormMail extends Form
if ($type_template=='facture_send') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }
elseif ($type_template=='facture_relance') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
elseif ($type_template=='propal_send') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendProposal"); }
- elseif ($type_template=='askpricesupplier_send') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendAskPriceSupplier"); }
+ elseif ($type_template=='supplier_proposal_send') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); }
elseif ($type_template=='order_send') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendOrder"); }
elseif ($type_template=='order_supplier_send') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
elseif ($type_template=='invoice_supplier_send') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
diff --git a/htdocs/core/class/html.formaskpricesupplier.class.php b/htdocs/core/class/html.formsupplier_proposal.class.php
similarity index 93%
rename from htdocs/core/class/html.formaskpricesupplier.class.php
rename to htdocs/core/class/html.formsupplier_proposal.class.php
index 770c88ac844..d317778e1a0 100644
--- a/htdocs/core/class/html.formaskpricesupplier.class.php
+++ b/htdocs/core/class/html.formsupplier_proposal.class.php
@@ -25,7 +25,7 @@
/**
* Class to manage generation of HTML components for proposal management
*/
-class FormAskPriceSupplier
+class FormSupplierProposal
{
var $db;
var $error;
@@ -49,18 +49,18 @@ class FormAskPriceSupplier
* @param int $short Use short labels
* @return void
*/
- function selectAskPriceSupplierStatus($selected='',$short=0)
+ function selectSupplierProposalStatus($selected='',$short=0)
{
global $langs;
$sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
$sql .= " WHERE active = 1";
- dol_syslog(get_class($this)."::selectAskPriceSupplierStatus", LOG_DEBUG);
+ dol_syslog(get_class($this)."::selectSupplierProposalStatus", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
- print '<select class="flat" name="askpricesupplier_statut">';
+ print '<select class="flat" name="supplier_proposal_statut">';
print '<option value=""> </option>';
$num = $this->db->num_rows($resql);
$i = 0;
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 651e4ea54ac..8bc635f74a8 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1608,8 +1608,8 @@ function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='')
if ($objecttype == 'propal') {
$classpath = 'comm/propal/class';
}
- if ($objecttype == 'askpricesupplier') {
- $classpath = 'comm/askpricesupplier/class';
+ if ($objecttype == 'supplier_proposal') {
+ $classpath = 'supplier_proposal/class';
}
if ($objecttype == 'shipping') {
$classpath = 'expedition/class';
@@ -1842,8 +1842,8 @@ function getElementProperties($element_type)
if ($element_type == 'propal') {
$classpath = 'comm/propal/class';
}
- if ($element_type == 'askpricesupplier') {
- $classpath = 'comm/askpricesupplier/class';
+ if ($element_type == 'supplier_proposal') {
+ $classpath = 'supplier_proposal/class';
}
if ($element_type == 'shipping') {
$classpath = 'expedition/class';
diff --git a/htdocs/core/lib/askpricesupplier.lib.php b/htdocs/core/lib/supplier_proposal.lib.php
similarity index 72%
rename from htdocs/core/lib/askpricesupplier.lib.php
rename to htdocs/core/lib/supplier_proposal.lib.php
index eec34ea9133..f73ae6727d7 100644
--- a/htdocs/core/lib/askpricesupplier.lib.php
+++ b/htdocs/core/lib/supplier_proposal.lib.php
@@ -29,17 +29,17 @@
* @param object $object Object related to tabs
* @return array Array of tabs to show
*/
-function askpricesupplier_prepare_head($object)
+function supplier_proposal_prepare_head($object)
{
global $langs, $conf, $user;
- $langs->load("askpricesupplier");
+ $langs->load("supplier_proposal");
$langs->load("compta");
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/card.php?id='.$object->id;
- $head[$h][1] = $langs->trans('AskPriceSupplierCard');
+ $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$object->id;
+ $head[$h][1] = $langs->trans('SupplierProposalCard');
$head[$h][2] = 'comm';
$h++;
@@ -48,14 +48,14 @@ function askpricesupplier_prepare_head($object)
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname); to remove a tab
- complete_head_from_modules($conf,$langs,$object,$head,$h,'askpricesupplier');
+ complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_proposal');
if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
{
$nbNote = 0;
if(!empty($object->note_private)) $nbNote++;
if(!empty($object->note_public)) $nbNote++;
- $head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/note.php?id='.$object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$object->id;
$head[$h][1] = $langs->trans('Notes');
if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
$head[$h][2] = 'note';
@@ -63,20 +63,20 @@ function askpricesupplier_prepare_head($object)
}
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $upload_dir = $conf->askpricesupplier->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->supplier_proposal->dir_output . "/" . dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
- $head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/document.php?id='.$object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents');
if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
$head[$h][2] = 'document';
$h++;
- $head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/info.php?id='.$object->id;
+ $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/info.php?id='.$object->id;
$head[$h][1] = $langs->trans('Info');
$head[$h][2] = 'info';
$h++;
- complete_head_from_modules($conf,$langs,$object,$head,$h,'askpricesupplier','remove');
+ complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_proposal','remove');
return $head;
}
@@ -86,14 +86,14 @@ function askpricesupplier_prepare_head($object)
*
* @return array head array with tabs
*/
-function askpricesupplier_admin_prepare_head()
+function supplier_proposal_admin_prepare_head()
{
global $langs, $conf, $user;
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT.'/admin/askpricesupplier.php';
+ $head[$h][0] = DOL_URL_ROOT.'/admin/supplier_proposal.php';
$head[$h][1] = $langs->trans("Miscellaneous");
$head[$h][2] = 'general';
$h++;
@@ -102,19 +102,19 @@ function askpricesupplier_admin_prepare_head()
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
- complete_head_from_modules($conf,$langs,null,$head,$h,'askpricesupplier_admin');
+ complete_head_from_modules($conf,$langs,null,$head,$h,'supplier_proposal_admin');
- $head[$h][0] = DOL_URL_ROOT.'/comm/admin/askpricesupplier_extrafields.php';
+ $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposal_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFields");
$head[$h][2] = 'attributes';
$h++;
- $head[$h][0] = DOL_URL_ROOT.'/comm/admin/askpricesupplierdet_extrafields.php';
+ $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposaldet_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsLines");
$head[$h][2] = 'attributeslines';
$h++;
- complete_head_from_modules($conf,$langs,null,$head,$h,'askpricesupplier_admin','remove');
+ complete_head_from_modules($conf,$langs,null,$head,$h,'supplier_proposal_admin','remove');
return $head;
}
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 526f6e48185..b653cfbf5c0 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -382,46 +382,51 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print '</td></tr>';
- // Use Hover
- $var=!$var;
+ // BackgroundColor
if ($foruserprofile)
- {
- /* Must first change option to choose color of highlight insteado of yes or no.
- print '<tr '.$bc[$var].'>';
- print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
- print '<td><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
- print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
- print '<td><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
- print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
- print '</td>';
- print '</tr>';
- */
- }
- else
- {
- print '<tr '.$bc[$var].'>';
- print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
- print '<td colspan="'.($colspan-1).'">';
- //print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
- //print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+ {
+ /*$var=!$var;
+ print '<tr '.$bc[$var].'>';
+ print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+ print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
+ print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+ print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo
+ print '> '.$langs->trans("UsePersonalValue").'</td>';
+ print '<td>';
if ($edit)
{
- if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
- else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
- print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' ';
+ print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
+ }
+ else
+ {
+ $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
+ if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; width: 40px; background-color: #'.$color.'" value="'.$color.'">';
+ else print '';
+ }
+ if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+ print '</td>';*/
+ }
+ else
+ {
+ $var=!$var;
+ print '<tr '.$bc[$var].'>';
+ print '<td>'.$langs->trans("BackgroundColor").'</td>';
+ print '<td colspan="'.($colspan-1).'">';
+ //var_dump($conf->global->THEME_ELDY_BACKBODY);
+ if ($edit)
+ {
+ print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),''),'THEME_ELDY_BACKBODY','formcolor',1).' ';
}
else
{
- if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
- else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+ $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),'');
if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; width: 40px; background-color: #'.$color.'" value="'.$color.'">';
- else print $langs->trans("None");
+ else print $langs->trans("Default");
}
- print ' ('.$langs->trans("Default").': <strong>edf4fb</strong>, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
- print '</td>';
- print '</tr>';
- }
-
+ print ' ('.$langs->trans("Default").': <strong>ffffff</strong>, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+ print '</td>';
+ }
+
// TopMenuBackgroundColor
if ($foruserprofile)
{
@@ -492,6 +497,90 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print '</tr>';
}
+ // Use Hover
+ $var=!$var;
+ if ($foruserprofile)
+ {
+ /* Must first change option to choose color of highlight instead of yes or no.
+ print '<tr '.$bc[$var].'>';
+ print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
+ print '<td><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
+ print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+ print '<td><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+ print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+ print '</td>';
+ print '</tr>';
+ */
+ }
+ else
+ {
+ print '<tr '.$bc[$var].'>';
+ print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
+ print '<td colspan="'.($colspan-1).'">';
+ //print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+ //print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+ if ($edit)
+ {
+ if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
+ else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+ print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' ';
+ }
+ else
+ {
+ if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
+ else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+ if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; width: 40px; background-color: #'.$color.'" value="'.$color.'">';
+ else print $langs->trans("None");
+ }
+ print ' ('.$langs->trans("Default").': <strong>edf4fb</strong>, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+ print '</td>';
+ print '</tr>';
+ }
+
+ // TopMenuBackgroundColor
+ if ($foruserprofile)
+ {
+ /*$var=!$var;
+ print '<tr '.$bc[$var].'>';
+ print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+ print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
+ print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+ print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo
+ print '> '.$langs->trans("UsePersonalValue").'</td>';
+ print '<td>';
+ if ($edit)
+ {
+ print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
+ }
+ else
+ {
+ $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
+ if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; width: 40px; background-color: #'.$color.'" value="'.$color.'">';
+ else print '';
+ }
+ if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+ print '</td>';*/
+ }
+ else
+ {
+ $var=!$var;
+ print '<tr '.$bc[$var].'>';
+ print '<td>'.$langs->trans("LinkColor").'</td>';
+ print '<td colspan="'.($colspan-1).'">';
+ if ($edit)
+ {
+ print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' ';
+ }
+ else
+ {
+ $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
+ if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; width: 40px; background-color: #'.$color.'" value="'.$color.'">';
+ else print $langs->trans("Default");
+ }
+ print ' ('.$langs->trans("Default").': <strong>000078</strong>, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+ print '</td>';
+ }
+
print '</table>';
}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 2ac7135c5db..d26e8e44078 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -672,11 +672,11 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
{
$langs->load("companies");
- // Propal
+ // Customer proposal
if (! empty($conf->propal->enabled))
{
$langs->load("propal");
- $newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Prop"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals');
+ $newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Prop"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals', 100);
$newmenu->add("/comm/propal.php?action=create&leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);
$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire);
if (empty($leftmenu) || $leftmenu=="propals") $newmenu->add("/comm/propal/list.php?leftmenu=propals&viewstatut=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);
@@ -692,7 +692,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
if (! empty($conf->commande->enabled))
{
$langs->load("orders");
- $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+ $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200);
$newmenu->add("/commande/card.php?action=create&leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
@@ -708,7 +708,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
if (! empty($conf->fournisseur->enabled))
{
$langs->load("orders");
- $newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers",$langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers');
+ $newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers",$langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);
$newmenu->add("/fourn/commande/card.php?action=create&leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
@@ -729,7 +729,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
if (! empty($conf->contrat->enabled))
{
$langs->load("contracts");
- $newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("Contracts"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts');
+ $newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("Contracts"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts', 2000);
$newmenu->add("/contrat/card.php?action=create&leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer);
$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);
$newmenu->add("/contrat/services.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);
@@ -743,7 +743,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
if (! empty($conf->ficheinter->enabled))
{
$langs->load("interventions");
- $newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 200);
+ $newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 2200);
$newmenu->add("/fichinter/card.php?action=create&leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer, '', '', '', 201);
$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202);
}
@@ -1400,6 +1400,17 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
//var_dump($menu_array);exit;
if (! is_array($menu_array)) return 0;
+ // TODO Use the position property in menu_array to reorder the $menu_array
+ //var_dump($menu_array);
+ /*$new_menu_array = array();
+ $level=0; $cusor=0; $position=0;
+ $nbentry = count($menu_array);
+ while (findNextEntryForLevel($menu_array, $cursor, $position, $level))
+ {
+
+ $cursor++;
+ }*/
+
// Show menu
$invert=empty($conf->global->MAIN_MENU_INVERT)?"":"invert";
if (empty($noout))
diff --git a/htdocs/core/modules/modAskPriceSupplier.class.php b/htdocs/core/modules/modSupplierProposal.class.php
similarity index 65%
rename from htdocs/core/modules/modAskPriceSupplier.class.php
rename to htdocs/core/modules/modSupplierProposal.class.php
index 7c536e33a6f..98320a6f08b 100644
--- a/htdocs/core/modules/modAskPriceSupplier.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -21,11 +21,11 @@
*/
/**
- * \defgroup askpricesupplier Module askpricesupplier
+ * \defgroup supplier_proposal Module supplier_proposal
* \brief Module to request supplier price proposals
- * \file htdocs/core/modules/modAskPriceSupplier.class.php
- * \ingroup askpricesupplier
- * \brief File to describe and activate module AskPriceSupplier
+ * \file htdocs/core/modules/modSupplierProposal.class.php
+ * \ingroup supplier_proposal
+ * \brief File to describe and activate module SupplierProposal
*/
include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
@@ -33,7 +33,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
/**
* Class to describe and enable module AskPriceSupllier
*/
-class modAskPriceSupplier extends DolibarrModules
+class modSupplierProposal extends DolibarrModules
{
/**
@@ -50,43 +50,43 @@ class modAskPriceSupplier extends DolibarrModules
$this->family = "products";
$this->name = preg_replace('/^mod/i','',get_class($this));
- $this->description = "askpricesupplierDESC";
+ $this->description = "supplier_proposalDESC";
$this->version = 'experimental';
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 0;
- $this->picto='askpricesupplier';
+ $this->picto='supplier_proposal';
$this->dirs = array();
// Dependancies
$this->depends = array('modFournisseur');
$this->requiredby = array();
- $this->config_page_url = array("askpricesupplier.php");
- $this->langfiles = array("askpricesupplier");
+ $this->config_page_url = array("supplier_proposal.php");
+ $this->langfiles = array("supplier_proposal");
// Constants
$this->const = array();
$r=0;
- $this->const[$r][0] = "ASKPRICESUPPLIER_ADDON_PDF";
+ $this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "aurore";
$this->const[$r][3] = 'Name of submodule to generate PDF for supplier quotation request';
$this->const[$r][4] = 0;
$r++;
- $this->const[$r][0] = "ASKPRICESUPPLIER_ADDON";
+ $this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON";
$this->const[$r][1] = "chaine";
- $this->const[$r][2] = "mod_askpricesupplier_marbre";
+ $this->const[$r][2] = "mod_supplier_proposal_marbre";
$this->const[$r][3] = 'Name of submodule to number supplier quotation request';
$this->const[$r][4] = 0;
$r++;
- $this->const[$r][0] = "ASKPRICESUPPLIER_ADDON_PDF_ODT_PATH";
+ $this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH";
$this->const[$r][1] = "chaine";
- $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/askpricesupplier";
+ $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/supplier_proposal";
$this->const[$r][3] = "";
$this->const[$r][4] = 0;
@@ -95,7 +95,7 @@ class modAskPriceSupplier extends DolibarrModules
// Permissions
$this->rights = array();
- $this->rights_class = 'askpricesupplier';
+ $this->rights_class = 'supplier_proposal';
$r=0;
$r++;
@@ -142,40 +142,40 @@ class modAskPriceSupplier extends DolibarrModules
$this->menu[$r]=array(
'fk_menu'=>'fk_mainmenu=commercial', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'type'=>'left', // This is a Left menu entry
- 'titre'=>'askpricesupplierMENU_LEFT_TITLE',
- 'leftmenu'=>'askpricesuppliersubmenu',
- 'url'=>'/comm/askpricesupplier/index.php',
- 'langs'=>'askpricesupplier', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
- 'enabled'=>'$conf->askpricesupplier->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
- 'perms'=>'$user->rights->askpricesupplier->lire', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+ 'titre'=>'supplier_proposalMENU_LEFT_TITLE',
+ 'leftmenu'=>'supplier_proposalsubmenu',
+ 'url'=>'/supplier_proposal/index.php',
+ 'langs'=>'supplier_proposal', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+ 'enabled'=>'$conf->supplier_proposal->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+ 'perms'=>'$user->rights->supplier_proposal->lire', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
- 'position'=>30
+ 'position'=>300
);
$r++;
$this->menu[$r]=array(
- 'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=askpricesuppliersubmenu',
+ 'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
'type'=>'left',
- 'titre'=>'askpricesupplierMENU_LEFT_TITLE_NEW',
- 'url'=>'/comm/askpricesupplier/card.php?action=create',
- 'langs'=>'askpricesupplier',
- 'enabled'=>'$conf->askpricesupplier->enabled',
- 'perms'=>'$user->rights->askpricesupplier->creer',
+ 'titre'=>'supplier_proposalMENU_LEFT_TITLE_NEW',
+ 'url'=>'/supplier_proposal/card.php?action=create',
+ 'langs'=>'supplier_proposal',
+ 'enabled'=>'$conf->supplier_proposal->enabled',
+ 'perms'=>'$user->rights->supplier_proposal->creer',
'user'=>2,
- 'position'=>31
+ 'position'=>301
);
$r++;
$this->menu[$r]=array(
- 'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=askpricesuppliersubmenu',
+ 'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
'type'=>'left',
- 'titre'=>'askpricesupplierMENU_LEFT_TITLE_LIST',
- 'url'=>'/comm/askpricesupplier/list.php',
- 'langs'=>'askpricesupplier',
- 'enabled'=>'$conf->askpricesupplier->enabled',
- 'perms'=>'$user->rights->askpricesupplier->lire',
+ 'titre'=>'supplier_proposalMENU_LEFT_TITLE_LIST',
+ 'url'=>'/supplier_proposal/list.php',
+ 'langs'=>'supplier_proposal',
+ 'enabled'=>'$conf->supplier_proposal->enabled',
+ 'perms'=>'$user->rights->supplier_proposal->lire',
'user'=>2,
- 'position'=>32
+ 'position'=>302
);
$r++;
}
@@ -197,9 +197,9 @@ class modAskPriceSupplier extends DolibarrModules
$this->remove($options);
//ODT template
- $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/askpricesupplier/template_askpricesupplier.odt';
- $dirodt=DOL_DATA_ROOT.'/doctemplates/askpricesupplier';
- $dest=$dirodt.'/template_askpricesupplier.odt';
+ $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/supplier_proposal/template_supplier_proposal.odt';
+ $dirodt=DOL_DATA_ROOT.'/doctemplates/supplier_proposal';
+ $dest=$dirodt.'/template_supplier_proposal.odt';
if (file_exists($src) && ! file_exists($dest))
{
@@ -216,9 +216,29 @@ class modAskPriceSupplier extends DolibarrModules
$sql = array(
"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
- "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','askpricesupplier',".$conf->entity.")",
+ "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','supplier_proposal',".$conf->entity.")",
);
return $this->_init($sql, $options);
}
+
+
+
+ /**
+ * Function called when module is disabled.
+ * Remove from database constants, boxes and permissions from Dolibarr database.
+ * Data directories are not deleted
+ *
+ * @param string $options Options when enabling module ('', 'noboxes')
+ * @return int 1 if OK, 0 if KO
+ */
+ public function remove($options = '')
+ {
+ $sql = array(
+ "DELETE FROM ".MAIN_DB_PREFIX."rights_def WHERE module = 'askpricesupplier'"
+ );
+
+ return $this->_remove($sql, $options);
+ }
+
}
\ No newline at end of file
diff --git a/htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
similarity index 88%
rename from htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
rename to htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index ddc995cc69a..a19e634f6cd 100644
--- a/htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -23,7 +23,7 @@
* \brief File of class to build ODT documents for third parties
*/
-require_once DOL_DOCUMENT_ROOT.'/core/modules/askpricesupplier/modules_askpricesupplier.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
/**
* Class to build documents using ODF templates generator
*/
-class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier
+class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
{
var $emetteur; // Objet societe qui emet
@@ -57,7 +57,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier
$this->db = $db;
$this->name = "ODT templates";
$this->description = $langs->trans("DocumentModelOdt");
- $this->scandir = 'ASKPRICESUPPLIER_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
+ $this->scandir = 'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
// Dimension page pour format A4
$this->type = 'odt';
@@ -105,19 +105,19 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier
$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
- $texte.= '<input type="hidden" name="param1" value="ASKPRICESUPPLIER_ADDON_PDF_ODT_PATH">';
- if ($conf->global->MAIN_ASKPRICESUPPLIER_CHOOSE_ODT_DOCUMENT > 0)
+ $texte.= '<input type="hidden" name="param1" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH">';
+ if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0)
{
- $texte.= '<input type="hidden" name="param2" value="ASKPRICESUPPLIER_ADDON_PDF_ODT_DEFAULT">';
- $texte.= '<input type="hidden" name="param3" value="ASKPRICESUPPLIER_ADDON_PDF_ODT_TOBILL">';
- $texte.= '<input type="hidden" name="param4" value="ASKPRICESUPPLIER_ADDON_PDF_ODT_CLOSED">';
+ $texte.= '<input type="hidden" name="param2" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT">';
+ $texte.= '<input type="hidden" name="param3" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL">';
+ $texte.= '<input type="hidden" name="param4" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED">';
}
$texte.= '<table class="nobordernopadding" width="100%">';
// List of directories area
$texte.= '<tr><td>';
$texttitle=$langs->trans("ListOfDirectories");
- $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_PATH)));
+ $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH)));
$listoffiles=array();
foreach($listofdir as $key=>$tmpdir)
{
@@ -141,7 +141,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier
$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
$texte.= '<textarea class="flat" cols="60" name="value1">';
- $texte.=$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_PATH;
+ $texte.=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH;
$texte.= '</textarea>';
$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
@@ -152,27 +152,27 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier
{
$texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
- if ($conf->global->MAIN_ASKPRICESUPPLIER_CHOOSE_ODT_DOCUMENT > 0)
+ if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0)
{
// Model for creation
- $liste=ModelePDFAskPriceSupplier::liste_modeles($this->db);
+ $liste=ModelePDFSupplierProposal::liste_modeles($this->db);
$texte.= '<table width="50%;">';
$texte.= '<tr>';
- $texte.= '<td width="60%;">'.$langs->trans("DefaultModelAskPriceSupplierCreate").'</td>';
+ $texte.= '<td width="60%;">'.$langs->trans("DefaultModelSupplierProposalCreate").'</td>';
$texte.= '<td colspan="">';
- $texte.= $form->selectarray('value2',$liste,$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_DEFAULT);
+ $texte.= $form->selectarray('value2',$liste,$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT);
$texte.= "</td></tr>";
$texte.= '<tr>';
- $texte.= '<td width="60%;">'.$langs->trans("DefaultModelAskPriceSupplierToBill").'</td>';
+ $texte.= '<td width="60%;">'.$langs->trans("DefaultModelSupplierProposalToBill").'</td>';
$texte.= '<td colspan="">';
- $texte.= $form->selectarray('value3',$liste,$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_TOBILL);
+ $texte.= $form->selectarray('value3',$liste,$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL);
$texte.= "</td></tr>";
$texte.= '<tr>';
- $texte.= '<td width="60%;">'.$langs->trans("DefaultModelAskPriceSupplierClosed").'</td>';
+ $texte.= '<td width="60%;">'.$langs->trans("DefaultModelSupplierProposalClosed").'</td>';
$texte.= '<td colspan="">';
- $texte.= $form->selectarray('value4',$liste,$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_CLOSED);
+ $texte.= $form->selectarray('value4',$liste,$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED);
$texte.= "</td></tr>";
$texte.= '</table>';
}
@@ -230,13 +230,13 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier
$outputlangs->load("companies");
$outputlangs->load("bills");
- if ($conf->askpricesupplier->dir_output)
+ if ($conf->supplier_proposal->dir_output)
{
// If $object is id instead of object
if (! is_object($object))
{
$id = $object;
- $object = new AskPriceSupplier($this->db);
+ $object = new SupplierProposal($this->db);
$result=$object->fetch($id);
if ($result < 0)
{
@@ -245,7 +245,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier
}
}
- $dir = $conf->askpricesupplier->dir_output;
+ $dir = $conf->supplier_proposal->dir_output;
$objectref = dol_sanitizeFileName($object->ref);
if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
$file = $dir . "/" . $objectref . ".odt";
@@ -285,7 +285,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier
//print "file=".$file;
//print "conf->propal->dir_temp=".$conf->propal->dir_temp;
- dol_mkdir($conf->askpricesupplier->dir_temp);
+ dol_mkdir($conf->supplier_proposal->dir_temp);
// If BILLING contact defined on invoice, we use it
@@ -324,7 +324,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier
// Line of free text
$newfreetext='';
- $paramfreetext='ASKPRICESUPPLIER_FREE_TEXT';
+ $paramfreetext='SUPPLIER_PROPOSAL_FREE_TEXT';
if (! empty($conf->global->$paramfreetext))
{
$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
@@ -336,7 +336,7 @@ class doc_generic_askpricesupplier_odt extends ModelePDFAskPriceSupplier
$odfHandler = new odf(
$srctemplatepath,
array(
- 'PATH_TO_TMP' => $conf->askpricesupplier->dir_temp,
+ 'PATH_TO_TMP' => $conf->supplier_proposal->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_LEFT' => '{',
'DELIMITER_RIGHT' => '}'
diff --git a/htdocs/comm/askpricesupplier/class/index.html b/htdocs/core/modules/supplier_proposal/doc/index.html
similarity index 100%
rename from htdocs/comm/askpricesupplier/class/index.html
rename to htdocs/core/modules/supplier_proposal/doc/index.html
diff --git a/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
similarity index 97%
rename from htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
rename to htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index db021bcb89e..f2d40713daf 100644
--- a/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -25,7 +25,7 @@
* \ingroup propale
* \brief Fichier de la classe permettant de generer les propales au modele Azur
*/
-require_once DOL_DOCUMENT_ROOT.'/core/modules/askpricesupplier/modules_askpricesupplier.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
/**
* Class to generate PDF proposal Azur
*/
-class pdf_aurore extends ModelePDFAskPriceSupplier
+class pdf_aurore extends ModelePDFSupplierProposal
{
var $db;
var $name;
@@ -103,7 +103,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
// Define position of columns
$this->posxdesc=$this->marge_gauche+1;
$this->posxtva=102;
- $this->posxup=116;
+ $this->posxup=126;
$this->posxqty=145;
$this->posxdiscount=162;
$this->postotalht=174;
@@ -149,14 +149,14 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
$outputlangs->load("dict");
$outputlangs->load("companies");
$outputlangs->load("bills");
- $outputlangs->load("askpricesupplier");
+ $outputlangs->load("supplier_proposal");
$outputlangs->load("products");
$nblignes = count($object->lines);
// Loop on each lines to detect if there is at least one image to show
$realpatharray=array();
- if (! empty($conf->global->MAIN_GENERATE_ASKPRICESUPPLIER_WITH_PICTURE))
+ if (! empty($conf->global->MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE))
{
for ($i = 0 ; $i < $nblignes ; $i++)
{
@@ -182,7 +182,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
}
if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
- if ($conf->askpricesupplier->dir_output)
+ if ($conf->supplier_proposal->dir_output)
{
$object->fetch_thirdparty();
@@ -191,13 +191,13 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
// Definition of $dir and $file
if ($object->specimen)
{
- $dir = $conf->askpricesupplier->dir_output;
+ $dir = $conf->supplier_proposal->dir_output;
$file = $dir . "/SPECIMEN.pdf";
}
else
{
$objectref = dol_sanitizeFileName($object->ref);
- $dir = $conf->askpricesupplier->dir_output . "/" . $objectref;
+ $dir = $conf->supplier_proposal->dir_output . "/" . $objectref;
$file = $dir . "/" . $objectref . ".pdf";
}
@@ -421,6 +421,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
$pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
// VAT Rate
+ /*
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
{
$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
@@ -433,13 +434,15 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
$pdf->SetXY($this->posxup, $curY);
if ($up_excl_tax > 0)
$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
-
+ */
+
// Quantity
$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
$pdf->SetXY($this->posxqty, $curY);
$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $qty, 0, 'R'); // Enough for 6 chars
// Discount on line
+ /*
if ($object->lines[$i]->remise_percent)
{
$pdf->SetXY($this->posxdiscount-2, $curY);
@@ -452,7 +455,8 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
$pdf->SetXY($this->postotalht, $curY);
if ($total_excl_tax > 0)
$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
-
+ */
+
// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
$tvaligne=$object->lines[$i]->total_tva;
$localtax1ligne=$object->lines[$i]->total_localtax1;
@@ -591,7 +595,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
}
else
{
- $this->error=$langs->trans("ErrorConstantNotDefined","ASKSUPPLIERPICE_OUTPUTDIR");
+ $this->error=$langs->trans("ErrorConstantNotDefined","SUPPLIER_PROPOSAL_OUTPUTDIR");
return 0;
}
}
@@ -685,7 +689,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
}*/
// Show payments conditions
- if (empty($conf->global->ASKPRICESUPPLIER_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement))
+ if (empty($conf->global->SUPPLIER_PROPOSAL_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement))
{
$pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy);
@@ -715,7 +719,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
$posy=$pdf->GetY()+3;
}
- if (empty($conf->global->ASKPRICESUPPLIER_PDF_HIDE_PAYMENTTERMCOND))
+ if (empty($conf->global->SUPPLIER_PROPOSAL_PDF_HIDE_PAYMENTTERMCOND))
{
// Show payment mode
if ($object->mode_reglement_code
@@ -1148,7 +1152,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
if (empty($hidetop))
{
$pdf->SetXY($this->posxup-1, $tab_top+1);
- $pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("AskPriceSupplierUHT"),'','C');
+ $pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
}
$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
@@ -1193,7 +1197,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
$outputlangs->load("main");
$outputlangs->load("bills");
- $outputlangs->load("askpricesupplier");
+ $outputlangs->load("supplier_proposal");
$outputlangs->load("companies");
$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1201,9 +1205,9 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
// Show Draft Watermark
- if($object->statut==0 && (! empty($conf->global->ASKPRICESUPPLIER_DRAFT_WATERMARK)) )
+ if($object->statut==0 && (! empty($conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK)) )
{
- pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->ASKPRICESUPPLIER_DRAFT_WATERMARK);
+ pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK);
}
$pdf->SetTextColor(0,0,60);
@@ -1264,7 +1268,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
$posy+=4;
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities("AskPriceSupplierDate")." : " . dol_print_date($object->date_livraison,"day",false,$outputlangs,true), '', 'R');
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierProposalDate")." : " . dol_print_date($object->date_livraison,"day",false,$outputlangs,true), '', 'R');
*/
if ($object->client->code_client)
@@ -1386,7 +1390,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
{
$showdetails=0;
- return pdf_pagefoot($pdf,$outputlangs,'ASKPRICESUPPLIER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+ return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_PROPOSAL_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
}
}
diff --git a/htdocs/comm/askpricesupplier/tpl/index.html b/htdocs/core/modules/supplier_proposal/index.html
similarity index 100%
rename from htdocs/comm/askpricesupplier/tpl/index.html
rename to htdocs/core/modules/supplier_proposal/index.html
diff --git a/htdocs/core/modules/askpricesupplier/mod_askpricesupplier_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
similarity index 90%
rename from htdocs/core/modules/askpricesupplier/mod_askpricesupplier_marbre.php
rename to htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
index d1912b98a9a..9d07dd19514 100644
--- a/htdocs/core/modules/askpricesupplier/mod_askpricesupplier_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -23,13 +23,13 @@
* \brief File of class to manage commercial proposal numbering rules Marbre
*/
-require_once DOL_DOCUMENT_ROOT .'/core/modules/askpricesupplier/modules_askpricesupplier.php';
+require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_proposal/modules_supplier_proposal.php';
/**
* Class to manage customer order numbering rules Marbre
*/
-class mod_askpricesupplier_marbre extends ModeleNumRefAskPriceSupplier
+class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='DF';
@@ -74,7 +74,7 @@ class mod_askpricesupplier_marbre extends ModeleNumRefAskPriceSupplier
$posindice=8;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
- $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier";
+ $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal";
$sql.= " WHERE ref LIKE '".$this->prefix."____-%'";
$sql.= " AND entity = ".$conf->entity;
@@ -101,17 +101,17 @@ class mod_askpricesupplier_marbre extends ModeleNumRefAskPriceSupplier
* Return next value
*
* @param Societe $objsoc Object third party
- * @param Propal $askpricesupplier Object commercial proposal
+ * @param Propal $supplier_proposal Object commercial proposal
* @return string Next value
*/
- function getNextValue($objsoc,$askpricesupplier)
+ function getNextValue($objsoc,$supplier_proposal)
{
global $db,$conf;
// D'abord on recupere la valeur max
$posindice=8;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
- $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier";
+ $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal";
$sql.= " WHERE ref LIKE '".$this->prefix."____-%'";
$sql.= " AND entity = ".$conf->entity;
diff --git a/htdocs/core/modules/askpricesupplier/mod_askpricesupplier_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
similarity index 83%
rename from htdocs/core/modules/askpricesupplier/mod_askpricesupplier_saphir.php
rename to htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
index 22582308f22..8781628917f 100644
--- a/htdocs/core/modules/askpricesupplier/mod_askpricesupplier_saphir.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
@@ -25,13 +25,13 @@
* \brief File that contains the numbering module rules Saphir
*/
-require_once DOL_DOCUMENT_ROOT .'/core/modules/askpricesupplier/modules_askpricesupplier.php';
+require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_proposal/modules_supplier_proposal.php';
/**
* Class of file that contains the numbering module rules Saphir
*/
-class mod_askpricesupplier_saphir extends ModeleNumRefAskPriceSupplier
+class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $error = '';
@@ -55,7 +55,7 @@ class mod_askpricesupplier_saphir extends ModeleNumRefAskPriceSupplier
$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
$texte.= '<input type="hidden" name="action" value="updateMask">';
- $texte.= '<input type="hidden" name="maskconstaskpricesupplier" value="ASKPRICESUPPLIER_SAPHIR_MASK">';
+ $texte.= '<input type="hidden" name="maskconstsupplier_proposal" value="SUPPLIER_PROPOSAL_SAPHIR_MASK">';
$texte.= '<table class="nobordernopadding" width="100%">';
$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("CommRequest"),$langs->transnoentities("CommRequest"));
@@ -66,7 +66,7 @@ class mod_askpricesupplier_saphir extends ModeleNumRefAskPriceSupplier
// Parametrage du prefix
$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
- $texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskaskpricesupplier" value="'.$conf->global->ASKPRICESUPPLIER_SAPHIR_MASK.'">',$tooltip,1,1).'</td>';
+ $texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masksupplier_proposal" value="'.$conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK.'">',$tooltip,1,1).'</td>';
$texte.= '<td align="left" rowspan="2"> <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
@@ -103,17 +103,17 @@ class mod_askpricesupplier_saphir extends ModeleNumRefAskPriceSupplier
* Return next value
*
* @param Societe $objsoc Object third party
- * @param Propal $askpricesupplier Object askpricesupplier
+ * @param Propal $supplier_proposal Object supplier_proposal
* @return string Value if OK, 0 if KO
*/
- function getNextValue($objsoc,$askpricesupplier)
+ function getNextValue($objsoc,$supplier_proposal)
{
global $db,$conf;
require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
// On defini critere recherche compteur
- $mask=$conf->global->ASKPRICESUPPLIER_SAPHIR_MASK;
+ $mask=$conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK;
if (! $mask)
{
@@ -121,9 +121,9 @@ class mod_askpricesupplier_saphir extends ModeleNumRefAskPriceSupplier
return 0;
}
- $date=$askpricesupplier->datep;
+ $date=$supplier_proposal->datep;
$customercode=$objsoc->code_client;
- $numFinal=get_next_value($db,$mask,'askpricesupplier','ref','',$customercode,$date);
+ $numFinal=get_next_value($db,$mask,'supplier_proposal','ref','',$customercode,$date);
return $numFinal;
}
diff --git a/htdocs/core/modules/askpricesupplier/modules_askpricesupplier.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
similarity index 88%
rename from htdocs/core/modules/askpricesupplier/modules_askpricesupplier.php
rename to htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
index 4bff78bff54..715dc294d91 100644
--- a/htdocs/core/modules/askpricesupplier/modules_askpricesupplier.php
+++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requ
/**
* Classe mere des modeles de propale
*/
-abstract class ModelePDFAskPriceSupplier extends CommonDocGenerator
+abstract class ModelePDFSupplierProposal extends CommonDocGenerator
{
var $error='';
@@ -50,7 +50,7 @@ abstract class ModelePDFAskPriceSupplier extends CommonDocGenerator
{
global $conf;
- $type='askpricesupplier';
+ $type='supplier_proposal';
$liste=array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -64,7 +64,7 @@ abstract class ModelePDFAskPriceSupplier extends CommonDocGenerator
/**
* Classe mere des modeles de numerotation des references de propales
*/
-abstract class ModeleNumRefAskPriceSupplier
+abstract class ModeleNumRefSupplierProposal
{
var $error='';
@@ -86,7 +86,7 @@ abstract class ModeleNumRefAskPriceSupplier
function info()
{
global $langs;
- $langs->load("askpricesupplier");
+ $langs->load("supplier_proposal");
return $langs->trans("NoDescription");
}
@@ -98,7 +98,7 @@ abstract class ModeleNumRefAskPriceSupplier
function getExample()
{
global $langs;
- $langs->load("askpricesupplier");
+ $langs->load("supplier_proposal");
return $langs->trans("NoExample");
}
@@ -149,17 +149,17 @@ abstract class ModeleNumRefAskPriceSupplier
* Create a document onto disk according to template module.
*
* @param DoliDB $db Database handler
- * @param AskPriceSupplier $object Object askpricesupplier
+ * @param SupplierProposal $object Object supplier_proposal
* @param string $modele Force model to use ('' to not force)
* @param Translate $outputlangs Object langs to use for output
* @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description
* @param int $hideref Hide ref
* @return int 0 if KO, 1 if OK
- * @deprecated Use the new function generateDocument of AskPriceSupplier class
- * @see AskPriceSupplier::generateDocument()
+ * @deprecated Use the new function generateDocument of SupplierProposal class
+ * @see SupplierProposal::generateDocument()
*/
-function askpricesupplier_pdf_create(DoliDB $db, AskPriceSupplier $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function supplier_proposal_pdf_create(DoliDB $db, SupplierProposal $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
{
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 08dc77c94b4..a983bf7f36e 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -48,7 +48,7 @@ $savingdocmask='';
if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX))
{
//var_dump($modulepart);
- if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','askpricesupplier','ficheinter','contract','project','project_task','expensereport')))
+ if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','supplier_proposal','ficheinter','contract','project','project_task','expensereport')))
{
$savingdocmask=dol_sanitizeFileName($object->ref).'-__file__';
}
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 46e7d154533..c68aa599310 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -50,7 +50,7 @@ if (! empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES))
// Special cases
if ($module == 'propal') { $permission=$user->rights->propale->creer;}
-elseif ($module == 'askpricesupplier') { $permission=$user->rights->askpricesupplier->creer;}
+elseif ($module == 'supplier_proposal') { $permission=$user->rights->supplier_proposal->creer;}
elseif ($module == 'fichinter') { $permission=$user->rights->ficheinter->creer;}
elseif ($module == 'project') { $permission=$user->rights->projet->creer;}
elseif ($module == 'project_task') { $permission=$user->rights->projet->creer;}
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 3338585e65b..886c3fb9d1f 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -32,7 +32,10 @@
$usemargins=0;
-if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','askpricesupplier','commande'))) $usemargins=1;
+if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande')))
+{
+ $usemargins=1;
+}
global $forceall, $senderissupplier, $inputalsopricewithtax;
if (empty($dateSelector)) $dateSelector=0;
@@ -43,7 +46,7 @@ if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
// Define colspan for button Add
$colspan = 3; // Col total ht + col edit + col delete
-if (in_array($object->element,array('propal', 'askpricesupplier','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++; // With this, there is a column move button
+if (in_array($object->element,array('propal', 'supplier_proposal','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++; // With this, there is a column move button
//print $object->element;
?>
@@ -53,8 +56,8 @@ if (in_array($object->element,array('propal', 'askpricesupplier','facture','invo
<td class="linecoldescription" <?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span><?php // echo $langs->trans("FreeZone"); ?>
</td>
- <?php if ($object->element == 'askpricesupplier') { ?>
- <tdclass="linecolrefsupplier" align="right"><span id="title_fourn_ref"><?php echo $langs->trans('AskPriceSupplierRefFourn'); ?></span></td>
+ <?php if ($object->element == 'supplier_proposal') { ?>
+ <td class="linecolrefsupplier" align="right"><span id="title_fourn_ref"><?php echo $langs->trans('SupplierProposalRefFourn'); ?></span></td>
<?php } ?>
<td class="linecolvat" align="right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
<td class="linecoluht" align="right"><span id="title_up_ht"><?php echo $langs->trans('PriceUHT'); ?></span></td>
@@ -211,7 +214,7 @@ else {
?>
</td>
- <?php if ($object->element == 'askpricesupplier') { ?>
+ <?php if ($object->element == 'supplier_proposal') { ?>
<td class="nobottom linecolresupplier" align="right"><input id="fourn_ref" name="fourn_ref" class="flat" value="" size="12"></td>
<?php } ?>
@@ -291,8 +294,8 @@ else {
elseif ($this->table_element_line=='propaldet') {
$newline = new PropaleLigne($this->db);
}
- elseif ($this->table_element_line=='askpricesupplierdet') {
- $newline = new AskPriceSupplierLine($this->db);
+ elseif ($this->table_element_line=='supplier_proposaldet') {
+ $newline = new SupplierProposalLine($this->db);
}
elseif ($this->table_element_line=='facturedet') {
$newline = new FactureLigne($this->db);
@@ -338,7 +341,7 @@ if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $da
// With this, there is a column move button ONLY if lines > 1
if (in_array($object->element, array(
'propal',
- 'askpricesupplier',
+ 'supplier_proposal',
'facture',
'invoice',
'commande',
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index db7026dfcdb..883c1f5eea9 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -32,7 +32,7 @@
$usemargins=0;
-if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal', 'askpricesupplier','commande'))) $usemargins=1;
+if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
global $forceall, $senderissupplier, $inputalsopricewithtax;
if (empty($dateSelector)) $dateSelector=0;
@@ -44,7 +44,7 @@ if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
// Define colspan for button Add
$colspan = 3; // Col total ht + col edit + col delete
if (! empty($inputalsopricewithtax)) $colspan++; // We add 1 if col total ttc
-if (in_array($object->element,array('propal','askpricesupplier','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++; // With this, there is a column move button
+if (in_array($object->element,array('propal','supplier_proposal','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++; // With this, there is a column move button
?>
<!-- BEGIN PHP TEMPLATE objectline_edit.tpl.php -->
@@ -104,7 +104,7 @@ $coldisplay=-1; // We remove first td
?>
</td>
- <?php if ($object->element == 'askpricesupplier') { ?>
+ <?php if ($object->element == 'supplier_proposal') { ?>
<td align="right"><input id="fourn_ref" name="fourn_ref" class="flat" value="<?php echo $line->ref_fourn; ?>" size="12"></td>
<?php } ?>
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 7cf7f40020d..f71b2b484d1 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -37,7 +37,7 @@
global $forceall, $senderissupplier, $inputalsopricewithtax, $usemargins;
$usemargins=0;
-if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal', 'askpricesupplier','commande'))) $usemargins=1;
+if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
if (empty($dateSelector)) $dateSelector=0;
if (empty($forceall)) $forceall=0;
@@ -124,7 +124,7 @@ if (empty($usemargins)) $usemargins=0;
}
?>
</td>
- <?php if ($object->element == 'askpricesupplier') { ?>
+ <?php if ($object->element == 'supplier_proposal') { ?>
<td class="linecolrefsupplier" align="right"><?php echo $line->ref_fourn; ?></td>
<?php } ?>
<td align="right" class="linecolvat nowrap"><?php $coldisplay++; ?><?php echo vatrate($line->tva_tx,'%',$line->info_bits); ?></td>
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
index 84f67660c41..6ac6433bb62 100644
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -149,17 +149,17 @@ class InterfaceDemo extends DolibarrTriggers
case 'LINEPROPAL_DELETE':
// Askpricesupplier
- case 'ASKPRICESUPPLIER_CREATE':
- case 'ASKPRICESUPPLIER_CLONE':
- case 'ASKPRICESUPPLIER_MODIFY':
- case 'ASKPRICESUPPLIER_VALIDATE':
- case 'ASKPRICESUPPLIER_SENTBYMAIL':
- case 'ASKPRICESUPPLIER_CLOSE_SIGNED':
- case 'ASKPRICESUPPLIER_CLOSE_REFUSED':
- case 'ASKPRICESUPPLIER_DELETE':
- case 'LINEASKPRICESUPPLIER_INSERT':
- case 'LINEASKPRICESUPPLIER_UPDATE':
- case 'LINEASKPRICESUPPLIER_DELETE':
+ case 'SUPPLIER_PROPOSAL_CREATE':
+ case 'SUPPLIER_PROPOSAL_CLONE':
+ case 'SUPPLIER_PROPOSAL_MODIFY':
+ case 'SUPPLIER_PROPOSAL_VALIDATE':
+ case 'SUPPLIER_PROPOSAL_SENTBYMAIL':
+ case 'SUPPLIER_PROPOSAL_CLOSE_SIGNED':
+ case 'SUPPLIER_PROPOSAL_CLOSE_REFUSED':
+ case 'SUPPLIER_PROPOSAL_DELETE':
+ case 'LINESUPPLIER_PROPOSAL_INSERT':
+ case 'LINESUPPLIER_PROPOSAL_UPDATE':
+ case 'LINESUPPLIER_PROPOSAL_DELETE':
// Contracts
case 'CONTRACT_CREATE':
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index a8b6d18a935..cab8c96b62a 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -541,10 +541,10 @@ if ($object->id > 0)
print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
}
- if ($conf->askpricesupplier->enabled && $user->rights->askpricesupplier->creer)
+ if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer)
{
- $langs->load("askpricesupplier");
- print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/askpricesupplier/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAskPriceSupplier").'</a>';
+ $langs->load("supplier_proposal");
+ print '<a class="butAction" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddSupplierProposal").'</a>';
}
if ($user->rights->fournisseur->facture->creer)
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 13fcc07f8f6..3f9d7b1246a 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -113,7 +113,7 @@ class CommandeFournisseur extends CommonOrder
* @var CommandeFournisseurLigne[]
*/
public $lines = array();
- //Ajout pour askpricesupplier
+ //Ajout pour supplier_proposal
var $origin;
var $origin_id;
var $linked_objects=array();
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index e80f1e6a9f1..83b94bd74d9 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -40,8 +40,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-if (! empty($conf->askpricesupplier->enabled))
- require DOL_DOCUMENT_ROOT . '/comm/askpricesupplier/class/askpricesupplier.class.php';
+if (! empty($conf->supplier_proposal->enabled))
+ require DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php';
if (!empty($conf->produit->enabled))
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
if (!empty($conf->projet->enabled))
@@ -54,7 +54,7 @@ $langs->load('sendings');
$langs->load('companies');
$langs->load('bills');
$langs->load('propal');
-$langs->load('askpricesupplier');
+$langs->load('supplier_proposal');
$langs->load('deliveries');
$langs->load('products');
$langs->load('stocks');
@@ -916,8 +916,8 @@ if (empty($reshook))
// If creation from another object of another module (Example: origin=propal, originid=1)
if (! empty($origin) && ! empty($originid))
{
- $element = 'comm/askpricesupplier';
- $subelement = 'askpricesupplier';
+ $element = 'supplier_proposal';
+ $subelement = 'supplier_proposal';
$object->origin = $origin;
$object->origin_id = $originid;
@@ -1429,8 +1429,8 @@ if ($action=='create')
$subelement = $regs [2];
}
- $element = 'comm/askpricesupplier';
- $subelement = 'askpricesupplier';
+ $element = 'supplier_proposal';
+ $subelement = 'supplier_proposal';
dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
@@ -1579,8 +1579,8 @@ if ($action=='create')
print '<input type="hidden" name="originid" value="' . $objectsrc->id . '">';
$newclassname = $classname;
- if ($newclassname == 'AskPriceSupplier')
- $newclassname = 'CommercialAskPriceSupplier';
+ if ($newclassname == 'SupplierProposal')
+ $newclassname = 'CommercialSupplierProposal';
print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1) . '</td></tr>';
print '<tr><td>' . $langs->trans('TotalHT') . '</td><td colspan="2">' . price($objectsrc->total_ht) . '</td></tr>';
print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td colspan="2">' . price($objectsrc->total_tva) . "</td></tr>";
diff --git a/htdocs/index.php b/htdocs/index.php
index cda19147001..5926e4e374c 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -131,10 +131,9 @@ if (empty($user->societe_id))
print '<br>';
print '<table summary="'.$langs->trans("DolibarrStateBoard").'" class="noborder" width="100%">';
print '<tr class="liste_titre">';
- print '<th class="liste_titre" colspan="2">'.$langs->trans("DolibarrStateBoard").'</th>';
- print '<th class="liste_titre" align="right"> </th>';
+ print '<th class="liste_titre">'.$langs->trans("DolibarrStateBoard").'</th>';
print '</tr>';
- print '<tr class="impair"><td colspan="3" class="tdboxstats nohover">';
+ print '<tr class="impair"><td class="tdboxstats nohover">';
$var=true;
diff --git a/htdocs/core/modules/askpricesupplier/doc/index.html b/htdocs/install/doctemplates/supplier_proposal/index.html
similarity index 100%
rename from htdocs/core/modules/askpricesupplier/doc/index.html
rename to htdocs/install/doctemplates/supplier_proposal/index.html
diff --git a/htdocs/install/doctemplates/askpricesupplier/template_askpricesupplier.odt b/htdocs/install/doctemplates/supplier_proposal/template_supplier_proposal.odt
similarity index 100%
rename from htdocs/install/doctemplates/askpricesupplier/template_askpricesupplier.odt
rename to htdocs/install/doctemplates/supplier_proposal/template_supplier_proposal.odt
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 71186936e61..2cf877acbbc 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -23,6 +23,12 @@
ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL DEFAULT 0 after country;
+ALTER TABLE llx_askpricesupplier RENAME TO llx_supplier_proposal;
+ALTER TABLE llx_askpricesupplierdet RENAME TO llx_supplier_proposaldet;
+ALTER TABLE llx_askpricesupplier_extrafields RENAME TO llx_supplier_proposal_extrafields;
+ALTER TABLE llx_askpricesupplierdet_extrafields RENAME TO llx_supplier_proposaldet_extrafields;
+ALTER TABLE llx_supplier_proposaldet CHANGE COLUMN fk_asksupplierprice fk_supplier_proposal integer NOT NULL;
+
-- Fix bad data
update llx_opensurvey_sondage set format = 'D' where format = 'D+';
update llx_opensurvey_sondage set format = 'A' where format = 'A+';
diff --git a/htdocs/install/mysql/tables/llx_askpricesupplier.sql b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
similarity index 98%
rename from htdocs/install/mysql/tables/llx_askpricesupplier.sql
rename to htdocs/install/mysql/tables/llx_supplier_proposal.sql
index ff62595bd0b..ef307b85c9f 100644
--- a/htdocs/install/mysql/tables/llx_askpricesupplier.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
@@ -15,7 +15,7 @@
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
-- ========================================================================
-CREATE TABLE llx_askpricesupplier (
+CREATE TABLE llx_supplier_proposal (
rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
ref varchar(30) NOT NULL,
entity integer NOT NULL DEFAULT '1',
diff --git a/htdocs/install/mysql/tables/llx_askpricesupplier_extrafields.sql b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
similarity index 95%
rename from htdocs/install/mysql/tables/llx_askpricesupplier_extrafields.sql
rename to htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
index 4552b4d0079..fdd12cbf317 100644
--- a/htdocs/install/mysql/tables/llx_askpricesupplier_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
@@ -15,7 +15,7 @@
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
-- ========================================================================
-CREATE TABLE llx_askpricesupplier_extrafields (
+CREATE TABLE llx_supplier_proposal_extrafields (
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp,
fk_object integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_askpricesupplierdet.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
similarity index 95%
rename from htdocs/install/mysql/tables/llx_askpricesupplierdet.sql
rename to htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
index 5755fdcb83f..81b6f2ef2cc 100644
--- a/htdocs/install/mysql/tables/llx_askpricesupplierdet.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
@@ -15,9 +15,9 @@
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
-- ========================================================================
-CREATE TABLE llx_askpricesupplierdet (
+CREATE TABLE llx_supplier_proposaldet (
rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
- fk_askpricesupplier integer NOT NULL,
+ fk_supplier_proposal integer NOT NULL,
fk_parent_line integer DEFAULT NULL,
fk_product integer DEFAULT NULL,
label varchar(255) DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_askpricesupplierdet_extrafields.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
similarity index 95%
rename from htdocs/install/mysql/tables/llx_askpricesupplierdet_extrafields.sql
rename to htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
index 7bfab6e408c..7bf951225b8 100644
--- a/htdocs/install/mysql/tables/llx_askpricesupplierdet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
@@ -15,7 +15,7 @@
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
-- ========================================================================
-CREATE TABLE llx_askpricesupplierdet_extrafields (
+CREATE TABLE llx_supplier_proposaldet_extrafields (
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp,
fk_object integer NOT NULL,
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 6cd2f14954d..1902385df15 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=خط من المنتجات / الخدمات ذات ا
FreeLegalTextOnProposal=نص تجارية حرة على مقترحات
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=أوامر إدارة الإعداد
OrdersNumberingModules=أوامر الترقيم نمائط
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 9a77b5900fa..665bbde9461 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=سعر الوحدة (صافي)
UnitPriceTTC=سعر الوحدة
PriceU=ارتفاع
PriceUHT=ارتفاع (صافي)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=مبلغ
AmountInvoice=مبلغ الفاتورة
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index 92f6ed52491..a9f6eab62fa 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=هذا هو البريد <b>الاختبار</b> (الا
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 76d8d382427..39ee84bcef7 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Линия на продукт / услуга с ну
FreeLegalTextOnProposal=Свободен текст на търговски предложения
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Настройки за управление на поръчки
OrdersNumberingModules=Поръчки номериране модули
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 91eabdab90b..851ad25c81d 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Единична цена (нето)
UnitPriceTTC=Единична цена
PriceU=U.P.
PriceUHT=U.P. (нето)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (с данък)
Amount=Сума
AmountInvoice=Фактурирана стойност
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 623efc8863c..1c8187eee15 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Това е <b>тестов</b> имейл (думата
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index a5ee8d10ba5..887ba75d0e0 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 49c2c3eec37..3eec2987d41 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index c49606b8f75..d6972e16de4 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 4baddc5f3df..dfcc2e5ef4e 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 79ef94ddc7f..a2b0d33d19b 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index c49606b8f75..d6972e16de4 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index e25f1a04234..722d5459945 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Una línia de producte/servei que té una quantitat nu
FreeLegalTextOnProposal=Text lliure en pressupostos
WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar compte bancari del pressupost
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Configuració del mòdul Sol·licituds a proveïdor
-AskPriceSupplierNumberingModules=Mòdels de numeració de solicitut de preus a proveïdor
-AskPriceSupplierPDFModules=Mòdels de docuements de solicituts de preus de proveïdors
-FreeLegalTextOnAskPriceSupplier=Text lliure en sol·licituds de preus a proveïdors
-WatermarkOnDraftAskPriceSupplier=Marca d'aigua en sol·licituds de preus a proveïdors (en cas de estar buit)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Preguntar per compte bancari per utilitzar en el pressupost
+##### SupplierProposal #####
+SupplierProposalSetup=Configuració del mòdul Sol·licituds a proveïdor
+SupplierProposalNumberingModules=Mòdels de numeració de solicitut de preus a proveïdor
+SupplierProposalPDFModules=Mòdels de docuements de solicituts de preus de proveïdors
+FreeLegalTextOnSupplierProposal=Text lliure en sol·licituds de preus a proveïdors
+WatermarkOnDraftSupplierProposal=Marca d'aigua en sol·licituds de preus a proveïdors (en cas de estar buit)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar per compte bancari per utilitzar en el pressupost
##### Orders #####
OrdersSetup=Configuració del mòdul comandes
OrdersNumberingModules=Mòduls de numeració de les comandes
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 42189ae338e..7cf3c051c7f 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Preu base
UnitPriceTTC=Preu unitari total
PriceU=P.U.
PriceUHT=P.U.
-AskPriceSupplierUHT=Preu Unitari sol·licitat
+SupplierProposalUHT=Preu Unitari sol·licitat
PriceUTTC=Preu unitari (IVA inclòs)
Amount=Import
AmountInvoice=Import factura
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index c5b54076c73..417ec04e748 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Això és un e-mail de <b>prova</b> (la paraula prova ha
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nLi adjuntem la factura __FACREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nVolem recordar-li que la seva factura __FACREF__ sembla estar pendent de pagament. Li adjuntem la factura en cuestio, com a recordatori.\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nLi adjuntem el pressupost __PROPREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nLi adjuntem la sol·licitud de preus __ASKREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nLi adjuntem la sol·licitud de preus __ASKREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nLi adjuntem la comanda __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nLi adjuntem la nostre comanda __ORDERREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nLi adjuntem la factura __FACREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 5cf105fb8a7..18bedef7be7 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Řada výrobků / služeb s nulové hodnoty je považo
FreeLegalTextOnProposal=Volný text o obchodních návrhů
WatermarkOnDraftProposal=Vodoznak na předloh návrhů komerčních (none-li prázdný)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zeptejte se na umístění bankovního účtu nabídky
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Cena požaduje nastavení dodavatelé modul
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Volný text na žádosti o cenový dodavatele
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Zeptejte se na bankovní účet destinaci nabídce ceny
+##### SupplierProposal #####
+SupplierProposalSetup=Cena požaduje nastavení dodavatelé modul
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Volný text na žádosti o cenový dodavatele
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Zeptejte se na bankovní účet destinaci nabídce ceny
##### Orders #####
OrdersSetup=Objednat řízení nastavení
OrdersNumberingModules=Objednávky číslování modelů
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index c9d2cefaf74..abc1a051888 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Jednotková cena (bez DPH)
UnitPriceTTC=Jednotková cena
PriceU=UP
PriceUHT=UP (bez DPH)
-AskPriceSupplierUHT=U.P. net Požadováno
+SupplierProposalUHT=U.P. net Požadováno
PriceUTTC=U.P. (inc. tax)
Amount=Množství
AmountInvoice=Fakturovaná částka
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index 5f14fd018c2..9b7775943c6 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Toto je <b>testovací</b> mail (slovo testovací musí b
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nNajdete zde fakturu __FACREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nDovolujeme si vás upozornit, že faktura __FACREF__ pravděpodobně nebyla uhrazena. Jako upomínku vám ji v příloze zasíláme znovu.\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nNajdete zde obchodní návrh __PROPREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nNajdete zde cenový požadavek __ASKREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nNajdete zde cenový požadavek __ASKREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nNajdete zde objednávku __ORDERREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nNajdete zde naši objednávku __ORDERREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nNajdete zde fakturu __FACREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 98ad0003d8a..632ec24991f 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=En linje af produkt / service med et nul beløb anses
FreeLegalTextOnProposal=Fri tekst på kommercielle forslag
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Ordrer «forvaltning setup
OrdersNumberingModules=Ordrer nummerressourcer moduler
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index e4f41d0d580..c0914268760 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Enhedspris (netto)
UnitPriceTTC=Enhedspris
PriceU=UP
PriceUHT=UP (netto)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Mængde
AmountInvoice=Fakturabeløbet
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 9b12e35bd06..901d8e46210 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dette er en <b>test</b> mail (ordet test skal være i fed
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index bccd449a822..aba90142895 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Produkt-/Servicezeilen mit Nullmenge zulässig
FreeLegalTextOnProposal=Freier Rechtstext für Angebote
WatermarkOnDraftProposal=Wasserzeichen auf Angebots-Entwurf (keines, falls leer)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Fragen Sie nach dem Bankkonto bei einem Angebot
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Lieferanten Preisauskunft Moduleinstellungen
-AskPriceSupplierNumberingModules=Nummerierungsmodul Preisanfragen Lieferanten
-AskPriceSupplierPDFModules=Lieferanten Preisauskunft Dokumentvorlagen
-FreeLegalTextOnAskPriceSupplier=Freier Text auf Preisauskunft Lieferanten
-WatermarkOnDraftAskPriceSupplier=Wasserzeichen auf Lieferanten-Preisauskunft Entwurf (keines, wenn leer)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Fragen Sie nach Bankkonto Bestimmungsort von der Preisauskunft
+##### SupplierProposal #####
+SupplierProposalSetup=Lieferanten Preisauskunft Moduleinstellungen
+SupplierProposalNumberingModules=Nummerierungsmodul Preisanfragen Lieferanten
+SupplierProposalPDFModules=Lieferanten Preisauskunft Dokumentvorlagen
+FreeLegalTextOnSupplierProposal=Freier Text auf Preisauskunft Lieferanten
+WatermarkOnDraftSupplierProposal=Wasserzeichen auf Lieferanten-Preisauskunft Entwurf (keines, wenn leer)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Fragen Sie nach Bankkonto Bestimmungsort von der Preisauskunft
##### Orders #####
OrdersSetup=Bestellverwaltungseinstellungen
OrdersNumberingModules=Bestellnumerierungs-Module
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 30273d93dcf..a91757f22eb 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Stückpreis (netto)
UnitPriceTTC=Stückpreis (brutto)
PriceU=VP
PriceUHT=VP (netto)
-AskPriceSupplierUHT=Nettopreis anfordern
+SupplierProposalUHT=Nettopreis anfordern
PriceUTTC=E.P. (inkl. Steuern)
Amount=Betrag
AmountInvoice=Rechnungsbetrag
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 862b2865246..9179816826b 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dies ist ein (HTML)-<b>Test</b> Mail (das Wort Test muss
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Bedauerlicherweise scheint die Rechnung __FACREF__ bislang unbeglichen. Als Erinnerung übersenden wir Ihnen diese nochmals im Anhang.\n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang unser Angebot __PROPREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 30d21a7e88c..dd25dfd6fb9 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ρωτήστε για τον τραπεζικό λογαριασμό προορισμού της προσφοράς
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index f722e34f853..7f80378a780 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Τιμή Μονάδος (χ. Φ.Π.Α)
UnitPriceTTC=Τιμή Μονάδος
PriceU=Τιμή μον.
PriceUHT=Τιμή μον.
-AskPriceSupplierUHT=Αιτήματα για τιμές μονάδας
+SupplierProposalUHT=Αιτήματα για τιμές μονάδας
PriceUTTC=Τιμή μον. (συμπ. Φ.Π.Α.)
Amount=Ποσό
AmountInvoice=Ποσό Τιμολογίου
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index b1723bf35f7..104ff52e1a7 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Αυτό είναι ένα μήνυμα <b>δοκιμής
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __FACREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nΘα ήθελα να σας προειδοποιήσω ότι το τιμολόγιο __FACREF__ φαίνεται να μην έχει πληρωθεί. Στο συνημμένο βρίσκεται το τιμολόγιο που φαίνεται να μην έχει πληρωθεί.\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την προσφορά __PROPREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το αίτημα των τιμών __ASKREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το αίτημα των τιμών __ASKREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε τη παραγγελία __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την παραγγελία μας __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __FACREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 88a67a58a28..f4d311c8f27 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -846,14 +846,12 @@ VATIsUsedExampleFR=In France, it means companies or organisations having a real
VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
##### Local Taxes #####
LTRate=Rate
-LocalTax1IsUsed=Use second tax
LocalTax1IsNotUsed=Do not use second tax
LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
LocalTax1Management=Second type of tax
LocalTax1IsUsedExample=
LocalTax1IsNotUsedExample=
-LocalTax2IsUsed=Use third tax
LocalTax2IsNotUsed=Do not use third tax
LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
@@ -1208,13 +1206,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
##### Orders #####
OrdersSetup=Order management setup
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 3e93a48d7b5..297556d6533 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -89,8 +89,10 @@ VATIsNotUsed=VAT is not used
CopyAddressFromSoc=Fill address with thirdparty address
NoEmailDefined=There is no email defined
##### Local Taxes #####
+LocalTax1IsUsed=Use second tax
LocalTax1IsUsedES= RE is used
LocalTax1IsNotUsedES= RE is not used
+LocalTax2IsUsed=Use third tax
LocalTax2IsUsedES= IRPF is used
LocalTax2IsNotUsedES= IRPF is not used
LocalTax1ES=RE
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index a05b2b7c06e..070bc5c3d56 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -306,7 +306,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 7485aada8dc..1ff53d36797 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/en_US/askpricesupplier.lang b/htdocs/langs/en_US/supplier_proposal.lang
similarity index 64%
rename from htdocs/langs/en_US/askpricesupplier.lang
rename to htdocs/langs/en_US/supplier_proposal.lang
index 0cf337b96e6..b0e2887feb0 100644
--- a/htdocs/langs/en_US/askpricesupplier.lang
+++ b/htdocs/langs/en_US/supplier_proposal.lang
@@ -1,25 +1,25 @@
-# Dolibarr language file - Source file is en_US - askpricesupplier
-AskPriceSupplier=Supplier commercial proposals
-askpricesupplierDESC=Manage price requests to suppliers
-askpricesupplierMENU_LEFT_TITLE=Price request supplier
-askpricesupplierMENU_LEFT_TITLE_NEW=New request
-askpricesupplierMENU_LEFT_TITLE_LIST=List
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Supplier commercial proposals
+supplier_proposalDESC=Manage price requests to suppliers
+supplier_proposalMENU_LEFT_TITLE=Supplier proposals
+supplier_proposalMENU_LEFT_TITLE_NEW=New request
+supplier_proposalMENU_LEFT_TITLE_LIST=List
CommRequest=Price request
CommRequests=Price requests
SearchRequest=Find a request
DraftRequests=Draft requests
LastModifiedRequests=Last %s modified price requests
RequestsOpened=Open price requests
-AskPriceSupplierArea=Area price requests suppliers
-Askpricesupplier=Price request supplier
+SupplierProposalArea=Supplier proposals area
+Askpricesupplier=Supplier proposals
NewAskPrice=New price request
NewAsk=New request
ShowAskpricesupplier=Show price request
-AddAskPriceSupplier=Create a price request
-AskPriceSupplierRefFourn=Supplier ref
-AskPriceSupplierDate=Delivery date
-AskPriceSupplierRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
-RelatedAskPriceSupplier=Related price requests suppliers
+AddSupplierProposal=Create a price request
+SupplierProposalRefFourn=Supplier ref
+SupplierProposalDate=Delivery date
+SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+RelatedSupplierProposal=Related price requests suppliers
ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b> ?
DateAsk=Date of request
DeleteAsk=Delete request
@@ -48,12 +48,12 @@ ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b> ?
ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b> ?
SendAskByMail=Send price request by mail
SendAskRef=Sending the price request %s
-AskPriceSupplierCard=Request card
+SupplierProposalCard=Request card
ConfirmDeleteAsk=Are you sure you want to delete this price request ?
-ActionsOnAskPriceSupplier=Events on price request
+ActionsOnSupplierProposal=Events on price request
DocModelAuroreDescription=A complete request model (logo...)
CommercialAsk=Price request
-DefaultModelAskPriceSupplierCreate=Default model creation
-DefaultModelAskPriceSupplierToBill=Default template when closing a price request (accepted)
-DefaultModelAskPriceSupplierClosed=Default template when closing a price request (refused)
-ListOfAskPriceSupplier=Liste des demandes de prix fournisseurs
+DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
+DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+ListOfSupplierProposal=List of supplier proposal requests
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 1b5358f2b79..9eccba0d95f 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Una línea de producto/servicio que tiene una cantidad
FreeLegalTextOnProposal=Texto libre en presupuestos
WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Configuración del módulo Solicitudes a proveedor
-AskPriceSupplierNumberingModules=Modelos de numeración de solicitud de precios a proveedor
-AskPriceSupplierPDFModules=Modelos de documentos de solicitud de precios a proveedores
-FreeLegalTextOnAskPriceSupplier=Texto libre en solicitudes de precios a proveedores
-WatermarkOnDraftAskPriceSupplier=Marca de agua en solicitudes de precios a proveedor (en caso de estar vacío)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Preguntar por cuenta bancaria a usar en el presupuesto
+##### SupplierProposal #####
+SupplierProposalSetup=Configuración del módulo Solicitudes a proveedor
+SupplierProposalNumberingModules=Modelos de numeración de solicitud de precios a proveedor
+SupplierProposalPDFModules=Modelos de documentos de solicitud de precios a proveedores
+FreeLegalTextOnSupplierProposal=Texto libre en solicitudes de precios a proveedores
+WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a proveedor (en caso de estar vacío)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
##### Orders #####
OrdersSetup=Configuración del módulo pedidos
OrdersNumberingModules=Módulos de numeración de los pedidos
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 66bcd6d4b85..3bbe0724cec 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Precio base
UnitPriceTTC=Precio unitario total
PriceU=P.U.
PriceUHT=P.U.
-AskPriceSupplierUHT=P.U. neto solicitado
+SupplierProposalUHT=P.U. neto solicitado
PriceUTTC=P.U. (i.i.)
Amount=Importe
AmountInvoice=Importe factura
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 622c5c91c39..4cb1a885c4b 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -60,7 +60,7 @@ PredefinedMailTestHtml=Esto es un e-mail de <b>prueba</b>(la palabra prueba debe
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __FACREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nQueremos recordarle que su factura __FACREF__ parece estar pendiente de pago. Le adjuntamos la factura en cuestión, como recordatorio.\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nLe adjuntamos el presupuesto __PROPREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nLe adjuntamos la solicitud de precios __ASKREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nLe adjuntamos la solicitud de precios __ASKREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nLe adjuntamos el pedido __ORDERREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nLe adjuntamos nuestro pedido __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __FACREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 54b4ced593f..4a6f97936da 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Toote/teenuse rida, mille koguseks on märgitud 0, pee
FreeLegalTextOnProposal=Vaba tekst pakkumistel
WatermarkOnDraftProposal=Vesimärk pakkumiste mustanditel (puudub, kui tühi)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Tellimuste haldamise seadistamine
OrdersNumberingModules=Tellimuste numeratsiooni mudelid
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index e07606ee685..17690a08d1c 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Ühiku hind (neto)
UnitPriceTTC=Ühiku hind
PriceU=ÜH
PriceUHT=ÜH (neto)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Summa
AmountInvoice=Arve summa
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index c89032a204b..dc2541fc541 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=See on <b>test</b> kiri (sõna test peab olema rasvases k
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 6e6e891ae29..3b99014487f 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index b20667c3c86..40a4f4621f8 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index c49606b8f75..d6972e16de4 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index ab7e526cc8f..bb75e25d09a 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=یک خط از محصول / خدمات با مقدار
FreeLegalTextOnProposal=متن رایگان در طرح های تجاری
WatermarkOnDraftProposal=تعیین میزان مد آب در پیش نویس طرح تجاری (هیچ اگر خالی)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=راه اندازی مدیریت سفارش
OrdersNumberingModules=سفارشات شماره مدل
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index c9d5f36bb19..1af11d729e3 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=قیمت واحد (خالص)
UnitPriceTTC=قیمت واحد
PriceU=UP
PriceUHT=UP (خالص)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=مقدار
AmountInvoice=مقدار فاکتور
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 817e117f606..d372dd4b585 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=این ایمیل <b>آزمون</b> (آزمون کلمه
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ شما در اینجا خواهید دید فاکتور __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ ما می خواهیم به شما هشدار می دهند که فاکتور __ FACREF__ به نظر می رسد که غیر انتفایی نیست. پس این فاکتور در پیوست است دوباره، به عنوان یک یادآوری. __PERSONALIZED__Sincerely __ SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__ شما در اینجا خواهید دید پیشنهاد تجاری __ PROPREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__ شما در اینجا خواهید دید که منظور __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ شما در اینجا خواهید دید منظور ما __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ شما در اینجا خواهید دید فاکتور __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index b6bd4cd14c9..1b186c29974 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Rivi tuotteen / palvelun nolla määrä pidetään vai
FreeLegalTextOnProposal=Vapaa tekstihaku kaupallisiin ehdotuksia
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Tilaukset hallinto-setup
OrdersNumberingModules=Tilaukset numerointiin modules
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 22249c98571..775007e91ed 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Yksikköhinta (netto)
UnitPriceTTC=Yksikköhinta
PriceU=UP
PriceUHT=UP (netto)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Määrä
AmountInvoice=Laskun summa
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index c96d7454d53..09361739656 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Tämä on <b>testi</b> postitse (sana testi on lihavoitu)
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index e43f0431d51..4b2df3d27a5 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -21,7 +21,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
FormatDateHourText=%d %B %Y %H:%M
ErrorNoSocialContributionForSellerCountry=Erreur, aucun type de charges défini pour le pays '%s'.
PriceUHT=Prix
-AskPriceSupplierUHT=P.U. HT. demandé
+SupplierProposalUHT=P.U. HT. demandé
PriceUTTC=P.U. TTC
AmountVAT=Montant TPS
AmountLT1=Montant TVQ
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 0de11174d41..b0f0935d674 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1194,13 +1194,13 @@ UseOptionLineIfNoQuantity=Une ligne de produit/service ayant une quantité nulle
FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciales
WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Saisir le compte bancaire cible lors de la proposition commerciale
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Configuration du module Demande de tarifs forunisseurs
-AskPriceSupplierNumberingModules=Modèles de numérotation des demandes de prix
-AskPriceSupplierPDFModules=Modèles de documents des demandes de prix
-FreeLegalTextOnAskPriceSupplier=Texte libre sur les demande de tarifs fournisseurs
-WatermarkOnDraftAskPriceSupplier=Filigrane sur le document de demande de prix fournisseurs (aucun si vide)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Demander le compte bancaire cible durant la création de la demande de prix fournisseur
+##### SupplierProposal #####
+SupplierProposalSetup=Configuration du module Demande de tarifs forunisseurs
+SupplierProposalNumberingModules=Modèles de numérotation des demandes de prix
+SupplierProposalPDFModules=Modèles de documents des demandes de prix
+FreeLegalTextOnSupplierProposal=Texte libre sur les demande de tarifs fournisseurs
+WatermarkOnDraftSupplierProposal=Filigrane sur le document de demande de prix fournisseurs (aucun si vide)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Demander le compte bancaire cible durant la création de la demande de prix fournisseur
##### Orders #####
OrdersSetup=Configuration du module Commandes
OrdersNumberingModules=Modèles de numérotation des commandes
diff --git a/htdocs/langs/fr_FR/askpricesupplier.lang b/htdocs/langs/fr_FR/askpricesupplier.lang
index 50ba0c96d8d..2bbf73507ba 100644
--- a/htdocs/langs/fr_FR/askpricesupplier.lang
+++ b/htdocs/langs/fr_FR/askpricesupplier.lang
@@ -1,25 +1,25 @@
-# Dolibarr language file - Source file is en_US - askpricesupplier
-AskPriceSupplier=Proposition commerciales fournisseurs
-askpricesupplierDESC=Gestion des demandes de prix aux fournisseurs
-askpricesupplierMENU_LEFT_TITLE=Demandes de prix fourn.
-askpricesupplierMENU_LEFT_TITLE_NEW=Nouvelle demande
-askpricesupplierMENU_LEFT_TITLE_LIST=Liste
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Proposition commerciales fournisseurs
+supplier_proposalDESC=Gestion des demandes de prix aux fournisseurs
+supplier_proposalMENU_LEFT_TITLE=Demandes de prix fourn.
+supplier_proposalMENU_LEFT_TITLE_NEW=Nouvelle demande
+supplier_proposalMENU_LEFT_TITLE_LIST=Liste
CommRequest=Demande de prix
CommRequests=Demandes de prix
SearchRequest=Rechercher une demande
DraftRequests=Demandes brouillons
LastModifiedRequests=Les %s dernières demandes de prix modifiées
RequestsOpened=Demandes de prix ouvertes
-AskPriceSupplierArea=Espace des demandes de prix fournisseurs
+SupplierProposalArea=Espace des demandes de prix fournisseurs
Askpricesupplier=Demande de prix fournisseur
NewAskPrice=Nouvelle demande de prix
NewAsk=Nouvelle demande
ShowAskpricesupplier=Afficher la demande de prix
-AddAskPriceSupplier=Créer une demande de prix
-AskPriceSupplierRefFourn=Réf. fournisseur
-AskPriceSupplierDate=Date de livraison
-AskPriceSupplierRefFournNotice=Avant de clôturer à "Acceptée", pensez à saisir les références fournisseurs.
-RelatedAskPriceSupplier=Demandes de prix fournisseurs associées
+AddSupplierProposal=Créer une demande de prix
+SupplierProposalRefFourn=Réf. fournisseur
+SupplierProposalDate=Date de livraison
+SupplierProposalRefFournNotice=Avant de clôturer à "Acceptée", pensez à saisir les références fournisseurs.
+RelatedSupplierProposal=Demandes de prix fournisseurs associées
ConfirmValidateAsk=Êtes-vous sûr de vouloir valider cette demande de prix sous la référence <b>%s</b> ?
DateAsk=Date de demande
DeleteAsk=Supprimer demande
@@ -46,12 +46,12 @@ ConfirmCloneAsk=Êtes-vous sûr de vouloir cloner la demande de prix <b>%s</b> ?
ConfirmReOpenAsk=Êtes-vous sûr de vouloir réouvrir la demande de prix <b>%s</b> ?
SendAskByMail=Envoyer demande de prix par email
SendAskRef=Envoi de la demande de prix %s
-AskPriceSupplierCard=Fiche demande
+SupplierProposalCard=Fiche demande
ConfirmDeleteAsk=Êtes-vous sûr de vouloir effacer cette demande de prix <b>%s</b> ?
-ActionsOnAskPriceSupplier=Événements sur la demande
+ActionsOnSupplierProposal=Événements sur la demande
DocModelAuroreDescription=Modèle de demande de prix fournisseur complet (logo…)
CommercialAsk=Demande de prix
-DefaultModelAskPriceSupplierCreate=Modèle par défaut à la création
-DefaultModelAskPriceSupplierToBill=Modèle par défaut lors de la clôture d'une demande de prix (à accéptée)
-DefaultModelAskPriceSupplierClosed=Modèle par défaut lors de la clôture d'une demande de prix (refusée)
-ListOfAskPriceSupplier=Liste des demandes de prix fournisseurs
\ No newline at end of file
+DefaultModelSupplierProposalCreate=Modèle par défaut à la création
+DefaultModelSupplierProposalToBill=Modèle par défaut lors de la clôture d'une demande de prix (à accéptée)
+DefaultModelSupplierProposalClosed=Modèle par défaut lors de la clôture d'une demande de prix (refusée)
+ListOfSupplierProposal=Liste des demandes de prix fournisseurs
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 1d1000a7f46..79d041bed9f 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Prix unitaire HT
UnitPriceTTC=Prix unitaire TTC
PriceU=P.U.
PriceUHT=P.U. HT
-AskPriceSupplierUHT=Prix unitaire net requis
+SupplierProposalUHT=Prix unitaire net requis
PriceUTTC=P.U TTC
Amount=Montant
AmountInvoice=Montant facture
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 9c63ec04665..628f09acf15 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Ceci est un message de <b>test</b> (le mot test doit êtr
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la facture __FACREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\nNous voudrions porter à votre connaissance que la facture __FACREF__ ne semble pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la proposition commerciale __PROPREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre demande de tarif __ASKREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre demande de tarif __ASKREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la facture __FACREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 4f64383c9f8..9561ffa50de 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=קו של המוצר / שירות עם כמות אפס
FreeLegalTextOnProposal=טקסט חופשי על הצעות מסחריות
WatermarkOnDraftProposal=סימן מים על הצעות טיוטה מסחריים (כל אם ריק)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=התקנה וניהול של סדר
OrdersNumberingModules=הזמנות מספור מודולים
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index e07d2f99747..c46ee354b5b 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index ee0dc8f5203..dc0343bdda0 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 77bbc62586f..9f6b24df199 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index cca3d72d8d4..3195a70c2ad 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index c49606b8f75..d6972e16de4 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 9eb5868acfc..be9d72891c3 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Egy sor termék / szolgáltatás nulla összeg szóba,
FreeLegalTextOnProposal=Szabad szöveg a kereskedelmi javaslatok
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order Management Setup
OrdersNumberingModules=Megrendelés számozási modulok
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 3b5bdc36be3..2862f33388b 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Egység ár (nettó)
UnitPriceTTC=Egység ár
PriceU=E.Á.
PriceUHT=E.Á. (nettó)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Mennyiség
AmountInvoice=Számla mennyiség
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index d79d3d03b48..b6165f9a508 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Ez egy <b>teszt</b> mail (a szó vizsgálatot kell vastag
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index e8bf7adf9b2..16b02f38038 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index c7f35694d73..2a447f0d120 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 7a38b9f6aba..a90be693f54 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index ff5f580b28a..e65160d61a6 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A lína af vöru / þjónustu með núll upphæð er t
FreeLegalTextOnProposal=Frjáls texti um viðskiptabanka tillögur
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Stjórn Order's skipulag
OrdersNumberingModules=Pantanir tala mát
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index e644d3aad35..696554d24da 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit verð (nettó)
UnitPriceTTC=Eining verðs
PriceU=UPP
PriceUHT=UP (nettó)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Upphæð
AmountInvoice=Invoice upphæð
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 485ffc7841f..2f40cd2fbde 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Þetta er <b>prófun</b> póstur (orðið próf verður f
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index e8a80b8fdc1..1eb38b5c2ed 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Una linea di prodotto/servizio con un importo pari a 0
FreeLegalTextOnProposal=Testo libero sulle proposte commerciali
WatermarkOnDraftProposal=Bozze dei preventivi filigranate (nessuna filigrana se vuoto)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Configurazione della gestione ordini
OrdersNumberingModules=Modelli di numerazione degli ordini
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 1d67b0be959..bca67cab22c 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Prezzo unitario (netto)
UnitPriceTTC=Prezzo unitario (lordo)
PriceU=P.U.
PriceUHT=P.U.(netto)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Importo
AmountInvoice=Importo della fattura
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index a1ff97351db..11b44cc0d73 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Questa è una mail <b>di test</b> (la parola test deve ri
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nGentile Cliente,\nin allegato trova la nostra fattura numero __FACREF__\n\n__PERSONALIZED__Cordiali saluti\n\nIl presente invio SOSTITUISCE INTEGRALMENTE quello effettuato in modo tradizionale a mezzo servizio postale.\n\nTale operazione è ammessa dalla normativa fiscale in essere, relativa alla "Trasmissione delle Fatture" per via Telematica:\nR.M. n. 571134 del 19/07/88 - (posta elettronica);\nR.M. n. 450217 del 30/07/90 - (procedure informatizzate);R.M. n. 107 del 04/07/01 - (trasmissione atture);\nR.M. n. 202/E del 04/12/01 - (archiviazione fatture).\nRisoluzioni che forniscono chiarimenti in ordine alle condizioni necessarie per l'ammissibilità ai sensi dell'art. 21 D.P.R. 26/10/72, n.633, della procedura di trasmissione e memorizzazione delle fatture mediante sistemi combinati fondati sull'impiego congiunto di supporti informatici, telefax\ne posta elettronica.\n\n È necessario GENERARNE UNA STAMPA e procedere alla relativa archiviazione come da prassi a norma di legge.\n\nRimaniamo a completa disposizione per qualsiasi informazione.\n\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \nVorremmo portare alla Vostra attenzione che la fattura __FACREF__ sembra non essere stata saldata. La fattura è allegata alla presente, come promemoria.\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nAlleghiamo la proposta commerciale __PROPREF__ \n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nAlleghiamo l'ordine __ORDERREF__\n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nAlleghiamo il nostro ordine __ORDERREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nGentile Cliente,\nin allegato trova la nostra fattura __FACREF__\n\n__PERSONALIZED__Cordiali Saluti\n\nIl presente invio SOSTITUISCE INTEGRALMENTE quello effettuato in modo tradizionale a mezzo servizio postale.\n\nTale operazione è ammessa dalla normativa fiscale in essere, relativa alla "Trasmissione delle Fatture" per via Telematica:\nR.M. n. 571134 del 19/07/88 - (posta elettronica);\nR.M. n. 450217 del 30/07/90 - (procedure informatizzate);R.M. n. 107 del 04/07/01 - (trasmissione atture);\nR.M. n. 202/E del 04/12/01 - (archiviazione fatture).\nRisoluzioni che forniscono chiarimenti in ordine alle condizioni necessarie per l'ammissibilità ai sensi dell'art. 21 D.P.R. 26/10/72, n.633, della procedura di trasmissione e memorizzazione delle fatture mediante sistemi combinati fondati sull'impiego congiunto di supporti informatici, telefax\ne posta elettronica.\n\n È necessario GENERARNE UNA STAMPA e procedere alla relativa archiviazione come da prassi a norma di legge.\n\nRimaniamo a completa disposizione per qualsiasi informazione.\n\n__SIGNATURE__
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 46d534d10e2..3eb5b0c0da8 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=ゼロ量と製品/サービスのラインは、オ
FreeLegalTextOnProposal=商業的な提案でフリーテキスト
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=注文の管理セットアップ
OrdersNumberingModules=モジュールの番号受注
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 5c83ef3a01d..917414dc2bd 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=単価（純額）
UnitPriceTTC=単価
PriceU=UP
PriceUHT=UP（純額）
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=量
AmountInvoice=請求額
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 4baf53dc6ad..8b61273e70c 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=これは<b>テスト</b>メール（ワードテスト
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index a5ee8d10ba5..887ba75d0e0 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 49c2c3eec37..3eec2987d41 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index c49606b8f75..d6972e16de4 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index a5ee8d10ba5..887ba75d0e0 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 49c2c3eec37..3eec2987d41 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index c49606b8f75..d6972e16de4 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index cefbf8dc630..842ca34cb7f 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 9884fe5b626..5997dbb3dca 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index 32ab3851e39..86b4dafb9c4 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index a5ee8d10ba5..887ba75d0e0 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 49c2c3eec37..3eec2987d41 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index c49606b8f75..d6972e16de4 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index b2c75cfb07a..fa2dc8c6ab1 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Produkto/paslaugos linija su nuline suma yra laikoma g
FreeLegalTextOnProposal=Laisvas tekstas komerciniame pasiūlyme
WatermarkOnDraftProposal=Vandens ženklas komercinių pasiūlymų projekte (nėra, jei lapas tuščias)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Klausti pasiūlyme esančios banko sąskaitos paskirties
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Tiekėjų modulyje kainos prašymo nustatymas
-AskPriceSupplierNumberingModules=Tiekėjų modulyje kainos prašymų numeracijos modeliai
-AskPriceSupplierPDFModules=Tiekėjų modulyje kainos prašymų dokumentų modeliai
-FreeLegalTextOnAskPriceSupplier=Laisvas tekstas kainos prašymuose
-WatermarkOnDraftAskPriceSupplier=Vandens ženklas ant kainų prašymų tiekėjų (nėra jei tuščias)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Klausti banko sąskaitos paskirties ant kainos užklausos
+##### SupplierProposal #####
+SupplierProposalSetup=Tiekėjų modulyje kainos prašymo nustatymas
+SupplierProposalNumberingModules=Tiekėjų modulyje kainos prašymų numeracijos modeliai
+SupplierProposalPDFModules=Tiekėjų modulyje kainos prašymų dokumentų modeliai
+FreeLegalTextOnSupplierProposal=Laisvas tekstas kainos prašymuose
+WatermarkOnDraftSupplierProposal=Vandens ženklas ant kainų prašymų tiekėjų (nėra jei tuščias)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Klausti banko sąskaitos paskirties ant kainos užklausos
##### Orders #####
OrdersSetup=Užsakymų valdymo nuostatos
OrdersNumberingModules=Užsakymų numeracijos modeliai
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 225589204ae..7d47b393b0a 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Vieneto kaina (grynoji)
UnitPriceTTC=Vieneto kaina
PriceU=U.P.
PriceUHT=U.P. (grynasis)
-AskPriceSupplierUHT=U.P. grynasis Prašomas
+SupplierProposalUHT=U.P. grynasis Prašomas
PriceUTTC=U.P. (įsk. mokesčius)
Amount=Suma
AmountInvoice=Sąskaitos-faktūros suma
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index a2da33ecb0e..45d66704e31 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Tai yra pašto <b>bandymas</b> (žodis bandymas turi būt
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nČia rasite sąskaitą-faktūrą __ FACREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nNorime jus perspėti, kad sąskaita-faktūra __ FACREF__ atrodo yra neapmokėta. Todėl tai yra pakartotinis priminimas apmokėti sąskaitą-faktūrą ir pakartotinai prikabinta sąskaita-faktūra.\n\n__PERSONALIZED__Sincerely\n\n__ SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nČia rasite komercinį pasiūlymą __ PROPREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nČia rasite užsakymą __ ORDERREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nČia rasite mūsų užsakymą __ ORDERREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nČia rasite sąskaitą-faktūrą __ FACREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 3b67036e1d8..78cc5e8f4b1 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Produkta / pakalpojuma ar nulles summu līnija tiek uz
FreeLegalTextOnProposal=Brīvais teksts komerciālajos priekšlikumos
WatermarkOnDraftProposal=Ūdenszīme projektu komerciālo priekšlikumu (none ja tukšs)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Pasūtījumu vadības iestatīšana
OrdersNumberingModules=Pasūtījumu numerācijas modeļi
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 30e2ca28da1..d48722a4636 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Vienības cena (neto)
UnitPriceTTC=Vienības cena
PriceU=UP
PriceUHT=UP (neto)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Summa
AmountInvoice=Rēķina summa
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index e540fba4c84..c343c0c82cf 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Tas ir <b>tests</b> pasts (vārds testam jābūt treknrak
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\n\nYou will find here the invoice __FACREF__\n\n\n__PERSONALIZED__Sincerely\n\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n\n__PERSONALIZED__Sincerely\n\n\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nJums tiek nosūtīts komerciālais piedāvājums __PROPREF__\n\n__PERSONALIZED__Ar cieņu\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index a5ee8d10ba5..887ba75d0e0 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index c7f35694d73..2a447f0d120 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index c49606b8f75..d6972e16de4 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index bfa033b15af..6abf62b594c 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=En vare/tjeneste med med null i kvantum blir betraktet
FreeLegalTextOnProposal=Fritekst på tilbud
WatermarkOnDraftProposal=Vannmerke på tilbudskladder (ingen hvis tom)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bakkonto for tilbudet
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Oppsett av modulen leverandør-prisforespørsler
-AskPriceSupplierNumberingModules=Leverandør-prisforespørsel nummereringsmodeller
-AskPriceSupplierPDFModules=Leverandør-prisforespørsel dokumentmodeller
-FreeLegalTextOnAskPriceSupplier=Fritekst på leverandør-prisforespørsel
-WatermarkOnDraftAskPriceSupplier=Vannmerke på kladder av leverandør-prisforepørsler (ingen hvis tom)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Be om bankkonto for prisforespørsel
+##### SupplierProposal #####
+SupplierProposalSetup=Oppsett av modulen leverandør-prisforespørsler
+SupplierProposalNumberingModules=Leverandør-prisforespørsel nummereringsmodeller
+SupplierProposalPDFModules=Leverandør-prisforespørsel dokumentmodeller
+FreeLegalTextOnSupplierProposal=Fritekst på leverandør-prisforespørsel
+WatermarkOnDraftSupplierProposal=Vannmerke på kladder av leverandør-prisforepørsler (ingen hvis tom)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Be om bankkonto for prisforespørsel
##### Orders #####
OrdersSetup=Innstillinger for ordre
OrdersNumberingModules=Nummereringsmodul for ordre
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 4948f083731..456c2f5ab4e 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Enhetspris (netto)
UnitPriceTTC=Enhetspris
PriceU=Pris
PriceUHT=Pris (netto)
-AskPriceSupplierUHT=Forespørsel om nettopris
+SupplierProposalUHT=Forespørsel om nettopris
PriceUTTC=U.P. (inkl. avgift)
Amount=Beløp
AmountInvoice=Fakturabeløp
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index e1536345a4c..59525041039 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dette er en <b>test</b> e-post (ordet test må være i fe
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVedlagt faktura __FACREF__\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nVi kan ikke se å ha mottatt betaling for faktura __FACREF__ . Som påminnelse sender vi fakturaen på nytt\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVedlagt følger tilbud__PROPREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nVedlagt følger prisforespørsel __ASKREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nVedlagt følger prisforespørsel __ASKREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVedlagt følger ordrenummer __ORDERREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nVedlagt følger ordrenummer __ORDERREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVedlagt faktura __FACREF__\n\n__PERSONALIZED__Med vennlig hilsen\n\n__SIGNATURE__
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 1c9dc4267eb..375e3354887 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Product- / dienstregels met een waarde van 0 gebruiken
FreeLegalTextOnProposal=Vrije tekst op Offertes
WatermarkOnDraftProposal=Watermerk op ontwerp offertes (geen indien leeg)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vraag naar bankrekening bestemming van het voorstel
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Prijsaanvragen leveranciers module instelling
-AskPriceSupplierNumberingModules=Prijsaanvragen leveranciers nummering modellen
-AskPriceSupplierPDFModules=Prijsaanvragen leveranciers documenten modellen
-FreeLegalTextOnAskPriceSupplier=Vrije tekst op leveranciers prijsaanvragen
-WatermarkOnDraftAskPriceSupplier=Watermerk op ontwerp leveranciers prijsaanvraag (geen als leeg)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Vraag naar bankrekening bestemming van prijsaanvraag
+##### SupplierProposal #####
+SupplierProposalSetup=Prijsaanvragen leveranciers module instelling
+SupplierProposalNumberingModules=Prijsaanvragen leveranciers nummering modellen
+SupplierProposalPDFModules=Prijsaanvragen leveranciers documenten modellen
+FreeLegalTextOnSupplierProposal=Vrije tekst op leveranciers prijsaanvragen
+WatermarkOnDraftSupplierProposal=Watermerk op ontwerp leveranciers prijsaanvraag (geen als leeg)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Vraag naar bankrekening bestemming van prijsaanvraag
##### Orders #####
OrdersSetup=Opdrachtenbeheerinstellingen
OrdersNumberingModules=Opdrachtennummeringmodules
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 094df954fe5..11111d0feaf 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Eenheidsprijs (netto)
UnitPriceTTC=Eenheidsprijs (bruto)
PriceU=E.P.
PriceUHT=EP (netto)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Hoeveelheid
AmountInvoice=Factuurbedrag
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 388bb763143..bb44b6ab054 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dit is een <b>test</b> e-mail (het woord test moet vetged
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Hierbij sturen wij u de factuur __FACREF__\n\n__PERSONALIZED__Met vriendelijke groeten,\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 4f60f4776ba..fdc3a61f55c 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Linia produktów / usług z zerową ilość jest trakt
FreeLegalTextOnProposal=Darmowy tekstu propozycji
WatermarkOnDraftProposal=Znak wodny projektów wniosków komercyjnych (brak jeśli pusty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zapytaj o rachunku bankowego przeznaczenia propozycji
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Cena żąda konfiguracji modułu dostawcy
-AskPriceSupplierNumberingModules=Wnioski Cena dostawcy numeracji modeli
-AskPriceSupplierPDFModules=Cena żąda dostawców modele dokumenty
-FreeLegalTextOnAskPriceSupplier=Bezpłatne tekst na podania Ceny dostawców
-WatermarkOnDraftAskPriceSupplier=Znak wodny na projekt cenie żąda dostawców (brak jeśli pusty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Zapytaj o rachunku bankowego przeznaczenia zamówienie cena
+##### SupplierProposal #####
+SupplierProposalSetup=Cena żąda konfiguracji modułu dostawcy
+SupplierProposalNumberingModules=Wnioski Cena dostawcy numeracji modeli
+SupplierProposalPDFModules=Cena żąda dostawców modele dokumenty
+FreeLegalTextOnSupplierProposal=Bezpłatne tekst na podania Ceny dostawców
+WatermarkOnDraftSupplierProposal=Znak wodny na projekt cenie żąda dostawców (brak jeśli pusty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Zapytaj o rachunku bankowego przeznaczenia zamówienie cena
##### Orders #####
OrdersSetup=Zamówienia zarządzania konfiguracją
OrdersNumberingModules=Zamówienia numeracji modules
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index c05348d2f20..3b9105eda39 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Cena jednostkowa (netto)
UnitPriceTTC=Cena jednostkowa
PriceU=cen/szt.
PriceUHT=cen/szt (netto)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Ilość
AmountInvoice=Kwota faktury
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index 8a1d21d682f..59e18906550 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dette er en <b>test</b> mail (ordet testen må være i fe
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Znajdziesz tu fakturę __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Chcielibyśmy ostrzec, że __FACREF__ faktura wydaje się nie jest wypłacana. Więc to jest faktura w załączniku znowu, jako przypomnienie. __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Znajdziesz tu propozycję handlową __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__ Znajdziesz tu wniosek cen __ASKREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__ Znajdziesz tu wniosek cen __ASKREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Znajdziesz tu porządek __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Znajdziesz tu nasze zamówienie __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Znajdziesz tu fakturę __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 16c2aa1ba0d..7f66261c6a0 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -1021,10 +1021,10 @@ UseOptionLineIfNoQuantity=Uma linha de produto/serviço com quantidade zero é c
FreeLegalTextOnProposal=Texto livre em orçamentos
WatermarkOnDraftProposal=Marca d'água no rascunho de orçamentos (nenhum se vazio)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Informar conta bancária de destino da proposta
-AskPriceSupplierSetup=Preço solicitado via fornecedor instalação de módulo
-FreeLegalTextOnAskPriceSupplier=Texto livre sobre os pedidos de preços de fornecedores
-WatermarkOnDraftAskPriceSupplier=Marca d'água em projetos de ordem dos fornecedores (nenhum se estiver vazio)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Informar conta bancária de destino da proposta
+SupplierProposalSetup=Preço solicitado via fornecedor instalação de módulo
+FreeLegalTextOnSupplierProposal=Texto livre sobre os pedidos de preços de fornecedores
+WatermarkOnDraftSupplierProposal=Marca d'água em projetos de ordem dos fornecedores (nenhum se estiver vazio)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Informar conta bancária de destino da proposta
OrdersSetup=Configurações do gestor de pedidos
OrdersNumberingModules=modelos de numeração de pedidos
OrdersModelModule=Modelos de documentos de pedidos
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 96f743193c1..2f33c753573 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -153,7 +153,7 @@ UnitPriceHT=Preço Base
UnitPriceTTC=Preço Unit. Total
PriceU=Preço Unit.
PriceUHT=Preço Unit.
-AskPriceSupplierUHT=UP net solicitada
+SupplierProposalUHT=UP net solicitada
PriceUTTC=U.P. (inc. Impostos)
AmountInvoice=Valor Fatura
AmountPayment=Valor Pagamento
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 4f7f8c03d2a..787d0272b8e 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -50,7 +50,7 @@ PredefinedMailTestHtml=Esse e um email de <b>teste</b> (a palavra test deve ser
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Você vai encontrar aqui a factura __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__ CONTACTCIV NAM E__ Gostaríamos de avisar que a fatura __ FACREF__ parece não ter sido pago. Portanto, esta é a fatura em anexo novamente, como um lembrete. __PERSONALIZED __ Sincerely __ SIGNATURE __
PredefinedMailContentSendProposal=__ CONTACTCIV NAME__ Você vai encontrar aqui a proposta comercial __ PROPREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nVocê vai encontrar aqui o preço pedido __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nVocê vai encontrar aqui o preço pedido __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIV NAME__ Você vai encontrar aqui a ordem __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Você vai encontrar aqui o nosso pedido __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Você vai encontrar aqui a factura __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index cddb81aee1b..3845bdf00c4 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Uma linha de producto/serviço que tem uma quantidade
FreeLegalTextOnProposal=Texto livre em Orçamentos
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Configuração do módulo pedidos
OrdersNumberingModules=Módulos de numeração dos pedidos
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 5536b4c8b98..4a9a88f44af 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Preço Base (base)
UnitPriceTTC=Preço Unitário
PriceU=P.U.
PriceUHT=P.U. (base)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Montante
AmountInvoice=Montante da Fatura
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 78d54b4908f..fbe189959dc 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Este é um email de <b>teste</b> (o teste de palavra deve
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index cb274c3790f..059837a0d83 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=O linie de produse / servicii cu o suma de zero este c
FreeLegalTextOnProposal=Text liber pe ofertele comerciale
WatermarkOnDraftProposal=Filigranul pe ofertele comerciale schiţă (niciunul daca e gol)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al ofertei
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Ordinele de gestionare setup
OrdersNumberingModules=Ordinele de numerotare module
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 55477d39660..37dd6426694 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Preț unitar (net)
UnitPriceTTC=Preț unitar
PriceU=UP
PriceUHT=UP (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Valoare
AmountInvoice=Valoare Factură
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index aa80c7cecca..b5f2f7618ef 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Acesta este un e-mail <b>de testare</b> (test de cuvânt
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Am dori să vă avertizăm că factura __FACREF__ pare a nu fi platită. Deci, vă ataşăm din nou factura, ca un memento. \n\n__PERSONALIZED__ Cu respect \n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeţi găsi aici oferta comercială__PROPREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeţi găsi aici comanda __ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYVeţi găsi aici comanda noastră__ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 3cd237ef00a..ca9121ecbdb 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Соответствие продукта / услуг
FreeLegalTextOnProposal=Свободный текст на коммерческие предложения
WatermarkOnDraftProposal=Водяные знаки на черновиках Коммерческих предложений ("Нет" если пусто)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Запрос банковского счёта для предложения
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Настройка модуля запросов цен поставщиков
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Свободный текст на запросе цены у поставщиков
-WatermarkOnDraftAskPriceSupplier=Водяной знак на проекте запроса цены у поставщиков (нет знака, если пустое)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Настройка модуля запросов цен поставщиков
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Свободный текст на запросе цены у поставщиков
+WatermarkOnDraftSupplierProposal=Водяной знак на проекте запроса цены у поставщиков (нет знака, если пустое)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Приказ 'Management Setup
OrdersNumberingModules=Приказы нумерации модулей
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 706047604b1..aa27c5b99b5 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Цена за единицу (нетто)
UnitPriceTTC=Цена за единицу
PriceU=Цена ед.
PriceUHT=Цена ед. (нетто)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Сумма
AmountInvoice=Сумма счета-фактуры
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index fa80f2f6ba9..fdd057f2ad0 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dette er en <b>test</b> mail (ordet testen må være i fe
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nВы можете увидеть здесь запрос цены __ASKREF__\n\n\n__PERSONALIZED__С уважением\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nВы можете увидеть здесь запрос цены __ASKREF__\n\n\n__PERSONALIZED__С уважением\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 5f79630a72c..7186e501d3e 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Rad výrobkov / služieb s nulovej hodnoty je považov
FreeLegalTextOnProposal=Voľný text o obchodných návrhov
WatermarkOnDraftProposal=Vodoznak na predlôh návrhov komerčných (none ak prázdny)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Objednať riadenie nastavenia
OrdersNumberingModules=Objednávky číslovanie modelov
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 57e8dd2e1e4..799a0ae6334 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Jednotková cena (bez DPH)
UnitPriceTTC=Jednotková cena
PriceU=UP
PriceUHT=UP (bez DPH)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Množstvo
AmountInvoice=Fakturovaná čiastka
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index ebf48639ff8..d57a8d9500c 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Toto je <b>test-mail</b> (slovo test musí byť tučne).
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 522df753994..45f53da2f13 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Vrstica proizvoda/storitve z vrednostjo 0 se smatra ko
FreeLegalTextOnProposal=Poljubno besedilo na komercialni ponudbi
WatermarkOnDraftProposal=Vodni tisk na osnutkih komercialnih ponudb (brez, če je prazno)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vprašajte za ciljni bančni račun ponudbe
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Nastavitev modula cenovnih zahtevkov za dobavitelje
-AskPriceSupplierNumberingModules=Modeli številčenja cenovnih zahtevkov za dobavitelje
-AskPriceSupplierPDFModules=Modeli dokumentiranja cenovnih zahtevkov za dobavitelje
-FreeLegalTextOnAskPriceSupplier=Prosti tekst na cenovnih zahtevkov dobaviteljev
-WatermarkOnDraftAskPriceSupplier=Vodni tisk na osnutkih cenovnih zahtevkov za dobavitelje (brez, če je prazno)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Vprašaj za končni bančni račun cenovnega zahtevka
+##### SupplierProposal #####
+SupplierProposalSetup=Nastavitev modula cenovnih zahtevkov za dobavitelje
+SupplierProposalNumberingModules=Modeli številčenja cenovnih zahtevkov za dobavitelje
+SupplierProposalPDFModules=Modeli dokumentiranja cenovnih zahtevkov za dobavitelje
+FreeLegalTextOnSupplierProposal=Prosti tekst na cenovnih zahtevkov dobaviteljev
+WatermarkOnDraftSupplierProposal=Vodni tisk na osnutkih cenovnih zahtevkov za dobavitelje (brez, če je prazno)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Vprašaj za končni bančni račun cenovnega zahtevka
##### Orders #####
OrdersSetup=Nastavitve upravljanja z naročili
OrdersNumberingModules=Moduli za številčenje naročil
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index a8d56f2f010..1ab87f73516 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Cena enote (neto)
UnitPriceTTC=Cena enote
PriceU=C.E.
PriceUHT=C.E. (neto)
-AskPriceSupplierUHT=Zahtevana neto cena na enoto C.E.
+SupplierProposalUHT=Zahtevana neto cena na enoto C.E.
PriceUTTC=C.E. (z davkom)
Amount=Znesek
AmountInvoice=Znesek računa
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index 85e7917ace3..0524222f823 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=To je <b>test</b> mail (beseda test mora biti v krepkem t
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nV prilogi je račun __FACREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nŽelimo vas opozoriti, da račun __FACREF__ ni bil poravnan. Zato vam račun še enkrat pošiljamo v prilogi.\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nV prilogi je ponudba __PROPREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nV prilogi je zahtevek za ceno __ASKREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nV prilogi je zahtevek za ceno __ASKREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nV prilogi je potrditev naročila __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nV prilogi je naše naročilo __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nV prilogi je račun __FACREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index a5ee8d10ba5..887ba75d0e0 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 093340ec142..0fadd5d3632 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index c49606b8f75..d6972e16de4 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index a5ee8d10ba5..887ba75d0e0 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 8d1d1f9317a..82eb4c03445 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Jedinična cena
PriceU=J.C.
PriceUHT=J.C. (neto)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index 4bec9af7580..7eb7523af91 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 88b8dcf4300..6ed1b7bb60b 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=En rad av produkt / tjänst med en nolla belopp anses
FreeLegalTextOnProposal=Fri text på affärsförslag
WatermarkOnDraftProposal=Vattenstämpel på utkast till affärsförslag (ingen om tom)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto destination förslag
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Pris begär leverantörer modul konfiguration
-AskPriceSupplierNumberingModules=Pris förfrågningar leverantörer numrerings modeller
-AskPriceSupplierPDFModules=Pris begär leverantörer dokument modeller
-FreeLegalTextOnAskPriceSupplier=Fritext på förfrågningar pris leverantörer
-WatermarkOnDraftAskPriceSupplier=Vattenstämpel om förslaget pris begär leverantörer (ingen om tom)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Fråga efter bankkonto destination pris begäran
+##### SupplierProposal #####
+SupplierProposalSetup=Pris begär leverantörer modul konfiguration
+SupplierProposalNumberingModules=Pris förfrågningar leverantörer numrerings modeller
+SupplierProposalPDFModules=Pris begär leverantörer dokument modeller
+FreeLegalTextOnSupplierProposal=Fritext på förfrågningar pris leverantörer
+WatermarkOnDraftSupplierProposal=Vattenstämpel om förslaget pris begär leverantörer (ingen om tom)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Fråga efter bankkonto destination pris begäran
##### Orders #####
OrdersSetup=Beställ ledning setup
OrdersNumberingModules=Beställningar numrering moduler
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 6d893fb99e3..4f526cc8135 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Pris per enhet (netto)
UnitPriceTTC=Pris per enhet
PriceU=Styckpris
PriceUHT=St.pris(net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Belopp
AmountInvoice=Fakturabelopp
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index c94a0b49856..e1d6fe305e2 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Detta är en <b>test</b> post (ordet Provningen skall i f
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Vi vill varna er att fakturan __FACREF__ tycks inte betalt. Så detta är fakturan i bilagan igen, som en påminnelse. __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \nHär hittar du det kommersiella förslaget __PROPREF__\n__PERSONALIZED__mvh\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Här hittar ordern __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Här hittar du vår ordning __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index a5ee8d10ba5..887ba75d0e0 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 49c2c3eec37..3eec2987d41 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index c49606b8f75..d6972e16de4 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 6f74a027338..365af813b89 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=สายผลิตภัณฑ์ / บริกา
FreeLegalTextOnProposal=ข้อความฟรีเกี่ยวกับข้อเสนอในเชิงพาณิชย์
WatermarkOnDraftProposal=ลายน้ำในร่างข้อเสนอในเชิงพาณิชย์ (ไม่มีถ้าว่างเปล่า)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=ขอปลายทางบัญชีธนาคารของข้อเสนอ
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=ราคาขอซัพพลายเออร์ที่ติดตั้งโมดูล
-AskPriceSupplierNumberingModules=ราคาผู้ผลิตร้องขอหมายเลขรุ่น
-AskPriceSupplierPDFModules=ราคาขอซัพพลายเออร์รูปแบบเอกสาร
-FreeLegalTextOnAskPriceSupplier=ข้อความฟรีในราคาผู้ผลิตร้องขอ
-WatermarkOnDraftAskPriceSupplier=ลายน้ำราคาร่างซัพพลายเออร์ขอ (ไม่เลยถ้าว่างเปล่า)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=ขอบัญชีธนาคารปลายทางของการร้องขอราคา
+##### SupplierProposal #####
+SupplierProposalSetup=ราคาขอซัพพลายเออร์ที่ติดตั้งโมดูล
+SupplierProposalNumberingModules=ราคาผู้ผลิตร้องขอหมายเลขรุ่น
+SupplierProposalPDFModules=ราคาขอซัพพลายเออร์รูปแบบเอกสาร
+FreeLegalTextOnSupplierProposal=ข้อความฟรีในราคาผู้ผลิตร้องขอ
+WatermarkOnDraftSupplierProposal=ลายน้ำราคาร่างซัพพลายเออร์ขอ (ไม่เลยถ้าว่างเปล่า)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=ขอบัญชีธนาคารปลายทางของการร้องขอราคา
##### Orders #####
OrdersSetup=การตั้งค่าการจัดการการสั่งซื้อ
OrdersNumberingModules=สั่งซื้อจำนวนรุ่น
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 6c57ed16d58..9632798efb3 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=ราคาต่อหน่วย (สุทธิ)
UnitPriceTTC=ราคาต่อหน่วย
PriceU=UP
PriceUHT=UP (สุทธิ)
-AskPriceSupplierUHT=ขอขึ้นสุทธิ
+SupplierProposalUHT=ขอขึ้นสุทธิ
PriceUTTC=UP (รวมภาษี).
Amount=จำนวน
AmountInvoice=จำนวนใบแจ้งหนี้
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 1ae66888047..33978f11aeb 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=<b>นี่คือจดหมายทดสอบ</b
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่ใบแจ้งหนี้ __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ เราอยากจะเตือนคุณว่า __FACREF__ ใบแจ้งหนี้ที่ดูเหมือนว่าจะไม่ได้รับการ payed ดังนั้นนี่คือสิ่งที่แนบมาในใบแจ้งหนี้อีกครั้งเป็นตัวเตือน __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่ข้อเสนอในเชิงพาณิชย์ __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่คำขอราคา __ASKREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่คำขอราคา __ASKREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่เพื่อ __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่เพื่อเรา __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่ใบแจ้งหนี้ __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 017331e03b4..c061393abea 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=Sıfır tutarında olan ürün/hizmet satırını bir
FreeLegalTextOnProposal=Teklifler üzerinde serbest metin
WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Teklif için banka hesabı iste
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Tedarikçi fiyat isteği modülü kurulumu
-AskPriceSupplierNumberingModules=Tedarikçi fiyat isteği numaralandırma modülü
-AskPriceSupplierPDFModules=Tedarikçi fiyat isteği belge modelleri
-FreeLegalTextOnAskPriceSupplier=Tedarikçi fiyat isteği üzerinde serbest metin
-WatermarkOnDraftAskPriceSupplier=Taslak tedarikçi fiyat istekleri üzerinde filigran (boşsa yok)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Fiyat isteklerinde hedef banka hesabı iste
+##### SupplierProposal #####
+SupplierProposalSetup=Tedarikçi fiyat isteği modülü kurulumu
+SupplierProposalNumberingModules=Tedarikçi fiyat isteği numaralandırma modülü
+SupplierProposalPDFModules=Tedarikçi fiyat isteği belge modelleri
+FreeLegalTextOnSupplierProposal=Tedarikçi fiyat isteği üzerinde serbest metin
+WatermarkOnDraftSupplierProposal=Taslak tedarikçi fiyat istekleri üzerinde filigran (boşsa yok)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Fiyat isteklerinde hedef banka hesabı iste
##### Orders #####
OrdersSetup=Sipariş yönetimi kurulumu
OrdersNumberingModules=Sipariş numaralandırma modülü
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index f49868a96be..6ca8e1285f0 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Birim fiyat (net)
UnitPriceTTC=Birim fiyat
PriceU=B.F.
PriceUHT=B.F. (net)
-AskPriceSupplierUHT=İstenen U.P. ağı
+SupplierProposalUHT=İstenen U.P. ağı
PriceUTTC=B.F. (vergi dahil)
Amount=Tutar
AmountInvoice=Fatura tutarı
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index fbbc07c0371..85792056ea5 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Bu bir <b>deneme</b> postası (deneme sözcüğü koyu ol
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nFaturanız buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nSize faturanız __FACREF__ için ödeme yapılmamış göründüğünü belirtmek isteriz. Anımsatma amacıyla ilgili fatura ekte sunulmuştur.\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz bilgilerinize sunulmuştur __PROPREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nFiyat isteği sunulmuştur__ASKREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nFiyat isteği sunulmuştur__ASKREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nSiparişiniz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nSiparişimiz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFatura buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index c495f6d0577..7cb4fccc447 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 25ffcd26a05..9e481ed67da 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index c49606b8f75..d6972e16de4 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index a5ee8d10ba5..887ba75d0e0 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 56822a74f6a..f8de4e342c7 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index c49606b8f75..d6972e16de4 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 74b61805ca6..872e047e1fc 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Yêu cầu tài khoản ngân hàng của đơn hàng đề xuất
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Cài đặt module đề nghị giá nhà cung cấp
-AskPriceSupplierNumberingModules=Kiểu đánh số cho đề nghị giá nhà cung cấp
-AskPriceSupplierPDFModules=Kiểu chứng từ đề nghị giá nhà cung cấp
-FreeLegalTextOnAskPriceSupplier=Free text trên đề nghị giá nhà cung cấp
-WatermarkOnDraftAskPriceSupplier=Watermark trên dự thảo đề nghị giá nhà cung cấp (không nếu rỗng)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Yêu cầu số tài khoản ngân hàng trên đề nghị giá
+##### SupplierProposal #####
+SupplierProposalSetup=Cài đặt module đề nghị giá nhà cung cấp
+SupplierProposalNumberingModules=Kiểu đánh số cho đề nghị giá nhà cung cấp
+SupplierProposalPDFModules=Kiểu chứng từ đề nghị giá nhà cung cấp
+FreeLegalTextOnSupplierProposal=Free text trên đề nghị giá nhà cung cấp
+WatermarkOnDraftSupplierProposal=Watermark trên dự thảo đề nghị giá nhà cung cấp (không nếu rỗng)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Yêu cầu số tài khoản ngân hàng trên đề nghị giá
##### Orders #####
OrdersSetup=Cài đặt quản lý đơn hàng
OrdersNumberingModules=Mô hình đánh số đơn hàng
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 5beffb5b17b..cc431a8aa4d 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=Đơn giá (chưa thuế)
UnitPriceTTC=Đơn giá
PriceU=U.P.
PriceUHT=U.P. (net)
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=Số tiền
AmountInvoice=Số tiền hóa đơn
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 9dc00dcec59..a66de0efc5d 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=Đây là một thư <b>kiểm tra</b> (kiểm tra từ p
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây các hóa đơn __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Chúng tôi muốn cảnh báo bạn rằng __FACREF__ hóa đơn dường như không được payed. Vì vậy, đây là hóa đơn kèm một lần nữa, như một lời nhắc nhở. __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây đề nghị thương mại __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây thứ tự __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây để chúng tôi __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây các hóa đơn __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 27687ff2ba2..4ba0751573e 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=定量为0的产品或服务项视为可选项*
FreeLegalTextOnProposal=报价单中的额外说明文本
WatermarkOnDraftProposal=为商业计划书草案添加水印(如果空)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=询问银行账户
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=订单管理设置
OrdersNumberingModules=订单编号模块
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index ef87967004a..b54f4ee9cbf 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=单位价格（净值）
UnitPriceTTC=单价
PriceU=向上
PriceUHT=不含税价格
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=金额
AmountInvoice=发票金额
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index e34b3180862..d50b2620cc4 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=这是一个<b>测试</b>邮件（单词测试必须大
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index cd2186c3ca9..49d421adb14 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -1193,13 +1193,13 @@ UseOptionLineIfNoQuantity=一個產品線/服務的，是作為一個選項視
FreeLegalTextOnProposal=可在下面輸入額外的建議書資訊
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
-##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+##### SupplierProposal #####
+SupplierProposalSetup=Price requests suppliers module setup
+SupplierProposalNumberingModules=Price requests suppliers numbering models
+SupplierProposalPDFModules=Price requests suppliers documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=設定訂單管理模組
OrdersNumberingModules=訂單編號模組
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 0f136e0feed..2206ccdfcce 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -303,7 +303,7 @@ UnitPriceHT=單位價格（凈值）
UnitPriceTTC=單價
PriceU=向上
PriceUHT=不含稅價格
-AskPriceSupplierUHT=U.P. net Requested
+SupplierProposalUHT=U.P. net Requested
PriceUTTC=U.P. (inc. tax)
Amount=總額
AmountInvoice=發票金額
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index acd7930df6e..cae93cb4da6 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -61,7 +61,7 @@ PredefinedMailTestHtml=這是一個<b>測試</b>郵件（單詞測試必須大
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 64068652ca9..fea8ccb8e62 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -44,7 +44,7 @@ class Product extends CommonObject
public $element='product';
public $table_element='product';
public $fk_element='fk_product';
- protected $childtables=array('askpricesupplierdet', 'propaldet','commandedet','facturedet','contratdet','facture_fourn_det','commande_fournisseurdet'); // To test if we can delete object
+ protected $childtables=array('supplier_proposaldet', 'propaldet','commandedet','facturedet','contratdet','facture_fourn_det','commande_fournisseurdet'); // To test if we can delete object
protected $isnolinkedbythird = 1; // No field fk_soc
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 57049610390..0c84826cf47 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -43,7 +43,7 @@ class Societe extends CommonObject
public $element='societe';
public $table_element = 'societe';
public $fk_element='fk_soc';
- protected $childtables=array("askpricesupplier","propal","commande","facture","contrat","facture_fourn","commande_fournisseur","projet"); // To test if we can delete object
+ protected $childtables=array("supplier_proposal","propal","commande","facture","contrat","facture_fourn","commande_fournisseur","projet"); // To test if we can delete object
/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
diff --git a/htdocs/comm/admin/askpricesupplier_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
similarity index 92%
rename from htdocs/comm/admin/askpricesupplier_extrafields.php
rename to htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index 0fb0554203f..a7589566175 100644
--- a/htdocs/comm/admin/askpricesupplier_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -19,12 +19,12 @@
*/
require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$langs->load("companies");
$langs->load("admin");
-$langs->load('askpricesupplier');
+$langs->load('supplier_proposal');
$extrafields = new ExtraFields($db);
$form = new Form($db);
@@ -36,7 +36,7 @@ foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
$action=GETPOST('action', 'alpha');
$attrname=GETPOST('attrname', 'alpha');
-$elementtype='askpricesupplier'; //Must be the $table_element of the class that manage extrafield
+$elementtype='supplier_proposal'; //Must be the $table_element of the class that manage extrafield
if (!$user->admin) accessforbidden();
@@ -56,16 +56,16 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
$textobject=$langs->transnoentitiesnoconv("CommRequests");
-llxHeader('',$langs->trans("AskPriceSupplierSetup"));
+llxHeader('',$langs->trans("SupplierProposalSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SupplierProposalSetup"),$linkback,'title_setup');
-$head = askpricesupplier_admin_prepare_head();
+$head = supplier_proposal_admin_prepare_head();
-dol_fiche_head($head, 'attributes', $langs->trans("CommRequests"), 0, 'askpricesupplier');
+dol_fiche_head($head, 'attributes', $langs->trans("CommRequests"), 0, 'supplier_proposal');
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
diff --git a/htdocs/comm/admin/askpricesupplierdet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
similarity index 92%
rename from htdocs/comm/admin/askpricesupplierdet_extrafields.php
rename to htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index 09c215d1f3d..12e5d2c23e6 100644
--- a/htdocs/comm/admin/askpricesupplierdet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -22,7 +22,7 @@
*/
require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -31,7 +31,7 @@ if (!$user->admin)
$langs->load("admin");
$langs->load("other");
-$langs->load("askpricesupplier");
+$langs->load("supplier_proposal");
$extrafields = new ExtraFields($db);
$form = new Form($db);
@@ -44,7 +44,7 @@ foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
$action=GETPOST('action', 'alpha');
$attrname=GETPOST('attrname', 'alpha');
-$elementtype='askpricesupplierdet'; //Must be the $table_element of the class that manage extrafield
+$elementtype='supplier_proposaldet'; //Must be the $table_element of the class that manage extrafield
if (!$user->admin) accessforbidden();
@@ -63,14 +63,14 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
$textobject=$langs->transnoentitiesnoconv("CommRequests");
-llxHeader('',$langs->trans("AskPriceSupplierSetup"));
+llxHeader('',$langs->trans("SupplierProposalSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SupplierProposalSetup"),$linkback,'title_setup');
-$head = askpricesupplier_admin_prepare_head();
+$head = supplier_proposal_admin_prepare_head();
-dol_fiche_head($head, 'attributeslines', $langs->trans("CommRequests"), 0, 'askpricesupplier');
+dol_fiche_head($head, 'attributeslines', $langs->trans("CommRequests"), 0, 'supplier_proposal');
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/supplier_proposal/card.php
similarity index 91%
rename from htdocs/comm/askpricesupplier/card.php
rename to htdocs/supplier_proposal/card.php
index 900ef57d56a..878d1c0df01 100644
--- a/htdocs/comm/askpricesupplier/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -25,15 +25,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-require '../../main.inc.php';
+require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaskpricesupplier.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formsupplier_proposal.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php';
-require_once DOL_DOCUMENT_ROOT . '/comm/askpricesupplier/class/askpricesupplier.class.php';
+require_once DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php';
require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/modules/askpricesupplier/modules_askpricesupplier.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/askpricesupplier.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/modules/supplier_proposal/modules_supplier_proposal.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/supplier_proposal.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
if (! empty($conf->projet->enabled)) {
@@ -42,7 +42,7 @@ if (! empty($conf->projet->enabled)) {
}
$langs->load('companies');
-$langs->load('askpricesupplier');
+$langs->load('supplier_proposal');
$langs->load('compta');
$langs->load('bills');
$langs->load('orders');
@@ -74,9 +74,9 @@ $NBLINES = 4;
// Security check
if (! empty($user->societe_id)) $socid = $user->societe_id;
-$result = restrictedArea($user, 'askpricesupplier', $id);
+$result = restrictedArea($user, 'supplier_proposal', $id);
-$object = new AskPriceSupplier($db);
+$object = new SupplierProposal($db);
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
@@ -92,9 +92,9 @@ if ($id > 0 || ! empty($ref)) {
}
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('askpricesuppliercard','globalcard'));
+$hookmanager->initHooks(array('supplier_proposalcard','globalcard'));
-$permissionnote = $user->rights->askpricesupplier->creer; // Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php
/*
@@ -134,11 +134,11 @@ if (empty($reshook))
}
// Delete askprice
- else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->askpricesupplier->supprimer)
+ else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->supplier_proposal->supprimer)
{
$result = $object->delete($user);
if ($result > 0) {
- header('Location: ' . DOL_URL_ROOT . '/comm/askpricesupplier/list.php');
+ header('Location: ' . DOL_URL_ROOT . '/supplier_proposal/list.php');
exit();
} else {
$langs->load("errors");
@@ -147,7 +147,7 @@ if (empty($reshook))
}
// Remove line
- else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->askpricesupplier->creer)
+ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->supplier_proposal->creer)
{
$result = $object->deleteline($lineid);
// reorder lines
@@ -172,8 +172,8 @@ if (empty($reshook))
// Validation
else if ($action == 'confirm_validate' && $confirm == 'yes' &&
- ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->creer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->validate)))
+ ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->creer))
+ || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->validate)))
)
{
$result = $object->valid($user);
@@ -205,7 +205,7 @@ if (empty($reshook))
}
}
- else if ($action == 'setdate_livraison' && $user->rights->askpricesupplier->creer)
+ else if ($action == 'setdate_livraison' && $user->rights->supplier_proposal->creer)
{
$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
if ($result < 0)
@@ -213,7 +213,7 @@ if (empty($reshook))
}
// Create askprice
- else if ($action == 'add' && $user->rights->askpricesupplier->creer)
+ else if ($action == 'add' && $user->rights->supplier_proposal->creer)
{
$object->socid = $socid;
$object->fetch_thirdparty();
@@ -231,9 +231,9 @@ if (empty($reshook))
$db->begin();
// Si on a selectionne une demande a copier, on realise la copie
- if (GETPOST('createmode') == 'copy' && GETPOST('copie_askpricesupplier'))
+ if (GETPOST('createmode') == 'copy' && GETPOST('copie_supplier_proposal'))
{
- if ($object->fetch(GETPOST('copie_askpricesupplier')) > 0) {
+ if ($object->fetch(GETPOST('copie_supplier_proposal')) > 0) {
$object->ref = GETPOST('ref');
$object->date_livraison = $date_delivery;
$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
@@ -251,7 +251,7 @@ if (empty($reshook))
$id = $object->create_from($user);
} else {
- setEventMessages($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_askpricesupplier')), null, 'errors');
+ setEventMessages($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_supplier_proposal')), null, 'errors');
}
} else {
$object->ref = GETPOST('ref');
@@ -291,8 +291,8 @@ if (empty($reshook))
{
if ($origin && $originid)
{
- $element = 'comm/askpricesupplier';
- $subelement = 'askpricesupplier';
+ $element = 'supplier_proposal';
+ $subelement = 'supplier_proposal';
$object->origin = $origin;
$object->origin_id = $originid;
@@ -426,7 +426,7 @@ if (empty($reshook))
}
// Reopen proposal
- else if ($action == 'confirm_reopen' && $user->rights->askpricesupplier->cloturer && ! GETPOST('cancel')) {
+ else if ($action == 'confirm_reopen' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
// prevent browser refresh from reopening proposal several times
if ($object->statut == 2 || $object->statut == 3 || $object->statut == 4) {
$object->reopen($user, 1);
@@ -434,7 +434,7 @@ if (empty($reshook))
}
// Close proposal
- else if ($action == 'setstatut' && $user->rights->askpricesupplier->cloturer && ! GETPOST('cancel')) {
+ else if ($action == 'setstatut' && $user->rights->supplier_proposal->cloturer && ! GETPOST('cancel')) {
if (! GETPOST('statut')) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CloseAs")), null, 'errors');
$action = 'statut';
@@ -455,15 +455,15 @@ if (empty($reshook))
// Actions to send emails
$actiontypecode='AC_ASKPRICE';
- $trigger_name='ASKPRICESUPPLIER_SENTBYMAIL';
+ $trigger_name='SUPPLIER_PROPOSAL_SENTBYMAIL';
$paramname='id';
- $mode='emailfromaskpricesupplier';
+ $mode='emailfromsupplier_proposal';
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
// Go back to draft
- if ($action == 'modif' && $user->rights->askpricesupplier->creer)
+ if ($action == 'modif' && $user->rights->supplier_proposal->creer)
{
$object->set_draft($user);
@@ -481,7 +481,7 @@ if (empty($reshook))
}
}
- else if ($action == "setabsolutediscount" && $user->rights->askpricesupplier->creer) {
+ else if ($action == "setabsolutediscount" && $user->rights->supplier_proposal->creer) {
if ($_POST["remise_id"]) {
if ($object->id > 0) {
$result = $object->insert_discount($_POST["remise_id"]);
@@ -493,7 +493,7 @@ if (empty($reshook))
}
// Add line
- else if ($action == 'addline' && $user->rights->askpricesupplier->creer) {
+ else if ($action == 'addline' && $user->rights->supplier_proposal->creer) {
// Set if we used free entry or predefined product
$predef='';
@@ -725,7 +725,7 @@ if (empty($reshook))
}
// Mise a jour d'une ligne dans la demande de prix
- else if ($action == 'updateligne' && $user->rights->askpricesupplier->creer && GETPOST('save') == $langs->trans("Save")) {
+ else if ($action == 'updateligne' && $user->rights->supplier_proposal->creer && GETPOST('save') == $langs->trans("Save")) {
// Define info_bits
$info_bits = 0;
if (preg_match('/\*/', GETPOST('tva_tx')))
@@ -830,13 +830,13 @@ if (empty($reshook))
}
}
- else if ($action == 'updateligne' && $user->rights->askpricesupplier->creer && GETPOST('cancel') == $langs->trans('Cancel')) {
+ else if ($action == 'updateligne' && $user->rights->supplier_proposal->creer && GETPOST('cancel') == $langs->trans('Cancel')) {
header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
exit();
}
// Generation doc (depuis lien ou depuis cartouche doc)
- else if ($action == 'builddoc' && $user->rights->askpricesupplier->creer) {
+ else if ($action == 'builddoc' && $user->rights->supplier_proposal->creer) {
if (GETPOST('model')) {
$object->setDocModel($user, GETPOST('model'));
}
@@ -858,12 +858,12 @@ if (empty($reshook))
}
// Remove file in doc form
- else if ($action == 'remove_file' && $user->rights->askpricesupplier->creer) {
+ else if ($action == 'remove_file' && $user->rights->supplier_proposal->creer) {
if ($object->id > 0) {
require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
$langs->load("other");
- $upload_dir = $conf->askpricesupplier->dir_output;
+ $upload_dir = $conf->supplier_proposal->dir_output;
$file = $upload_dir . '/' . GETPOST('file');
$ret = dol_delete_file($file, 0, 0, 0, $object);
if ($ret)
@@ -874,30 +874,30 @@ if (empty($reshook))
}
// Set project
- else if ($action == 'classin' && $user->rights->askpricesupplier->creer) {
+ else if ($action == 'classin' && $user->rights->supplier_proposal->creer) {
$object->setProject($_POST['projectid']);
}
// Delai de livraison
- else if ($action == 'setavailability' && $user->rights->askpricesupplier->creer) {
+ else if ($action == 'setavailability' && $user->rights->supplier_proposal->creer) {
$result = $object->availability($_POST['availability_id']);
}
// Conditions de reglement
- else if ($action == 'setconditions' && $user->rights->askpricesupplier->creer) {
+ else if ($action == 'setconditions' && $user->rights->supplier_proposal->creer) {
$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
}
- else if ($action == 'setremisepercent' && $user->rights->askpricesupplier->creer) {
+ else if ($action == 'setremisepercent' && $user->rights->supplier_proposal->creer) {
$result = $object->set_remise_percent($user, $_POST['remise_percent']);
}
- else if ($action == 'setremiseabsolue' && $user->rights->askpricesupplier->creer) {
+ else if ($action == 'setremiseabsolue' && $user->rights->supplier_proposal->creer) {
$result = $object->set_remise_absolue($user, $_POST['remise_absolue']);
}
// Mode de reglement
- else if ($action == 'setmode' && $user->rights->askpricesupplier->creer) {
+ else if ($action == 'setmode' && $user->rights->supplier_proposal->creer) {
$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
}
@@ -905,7 +905,7 @@ if (empty($reshook))
* Ordonnancement des lignes
*/
- else if ($action == 'up' && $user->rights->askpricesupplier->creer) {
+ else if ($action == 'up' && $user->rights->supplier_proposal->creer) {
$object->line_up(GETPOST('rowid'));
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -924,7 +924,7 @@ if (empty($reshook))
exit();
}
- else if ($action == 'down' && $user->rights->askpricesupplier->creer) {
+ else if ($action == 'down' && $user->rights->supplier_proposal->creer) {
$object->line_down(GETPOST('rowid'));
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -950,7 +950,7 @@ if (empty($reshook))
if (! $error) {
// Actions on extra fields (by external module or standard code)
- $hookmanager->initHooks(array('askpricesupplierdao'));
+ $hookmanager->initHooks(array('supplier_proposaldao'));
$parameters = array('id' => $object->id);
$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been
// modified by
@@ -979,7 +979,7 @@ llxHeader('', $langs->trans('CommRequests'), 'EN:Ask_Price_Supplier|FR:Demande_d
$form = new Form($db);
$formother = new FormOther($db);
$formfile = new FormFile($db);
-$formaskpricesupplier = new FormAskPriceSupplier($db);
+$formsupplier_proposal = new FormSupplierProposal($db);
$formmargin = new FormMargin($db);
$companystatic = new Societe($db);
@@ -997,8 +997,8 @@ if ($action == 'create')
// Load objectsrc
if (! empty($origin) && ! empty($originid))
{
- $element = 'comm/askpricesupplier';
- $subelement = 'askpricesupplier';
+ $element = 'supplier_proposal';
+ $subelement = 'supplier_proposal';
dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
@@ -1025,7 +1025,7 @@ if ($action == 'create')
}
- $object = new AskPriceSupplier($db);
+ $object = new SupplierProposal($db);
print '<form name="addprop" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
@@ -1100,8 +1100,8 @@ if ($action == 'create')
print '<tr>';
print '<td>' . $langs->trans("DefaultModel") . '</td>';
print '<td colspan="2">';
- $liste = ModelePDFAskPriceSupplier::liste_modeles($db);
- print $form->selectarray('model', $liste, ($conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_DEFAULT ? $conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_DEFAULT : $conf->global->ASKPRICESUPPLIER_ADDON_PDF));
+ $liste = ModelePDFSupplierProposal::liste_modeles($db);
+ print $form->selectarray('model', $liste, ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF));
print "</td></tr>";
// Project
@@ -1177,10 +1177,10 @@ if ($action == 'create')
* Combobox pour la fonction de copie
*/
- if (empty($conf->global->ASKPRICESUPPLIER_CLONE_ON_CREATE_PAGE)) print '<input type="hidden" name="createmode" value="empty">';
+ if (empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) print '<input type="hidden" name="createmode" value="empty">';
- if (! empty($conf->global->ASKPRICESUPPLIER_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '<br><table>';
- if (! empty($conf->global->ASKPRICESUPPLIER_CLONE_ON_CREATE_PAGE))
+ if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '<br><table>';
+ if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE))
{
// For backward compatibility
print '<tr>';
@@ -1191,7 +1191,7 @@ if ($action == 'create')
$liste_ask [0] = '';
$sql = "SELECT p.rowid as id, p.ref, s.nom";
- $sql .= " FROM " . MAIN_DB_PREFIX . "askpricesupplier p";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "supplier_proposal p";
$sql .= ", " . MAIN_DB_PREFIX . "societe s";
$sql .= " WHERE s.rowid = p.fk_soc";
$sql .= " AND p.entity = " . $conf->entity;
@@ -1208,7 +1208,7 @@ if ($action == 'create')
$liste_ask [$row [0]] = $askPriceSupplierRefAndSocName;
$i ++;
}
- print $form->selectarray("copie_askpricesupplier", $liste_ask, 0);
+ print $form->selectarray("copie_supplier_proposal", $liste_ask, 0);
} else {
dol_print_error($db);
}
@@ -1249,7 +1249,7 @@ if ($action == 'create')
}
print '</td></tr>';
}
- if (! empty($conf->global->ASKPRICESUPPLIER_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '</table>';
+ if (! empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '</table>';
dol_fiche_end();
@@ -1284,8 +1284,8 @@ if ($action == 'create')
$soc = new Societe($db);
$soc->fetch($object->socid);
- $head = askpricesupplier_prepare_head($object);
- dol_fiche_head($head, 'comm', $langs->trans('CommRequest'), 0, 'askpricesupplier');
+ $head = supplier_proposal_prepare_head($object);
+ dol_fiche_head($head, 'comm', $langs->trans('CommRequest'), 0, 'supplier_proposal');
$formconfirm = '';
@@ -1338,7 +1338,7 @@ if ($action == 'create')
require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
$notify = new Notify($db);
$text .= '<br>';
- $text .= $notify->confirmMessage('ASKPRICESUPPLIER_VALIDATE', $object->socid, $object);
+ $text .= $notify->confirmMessage('SUPPLIER_PROPOSAL_VALIDATE', $object->socid, $object);
}
if (! $error)
@@ -1357,7 +1357,7 @@ if ($action == 'create')
print '<table class="border" width="100%">';
- $linkback = '<a href="' . DOL_URL_ROOT . '/comm/askpricesupplier/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+ $linkback = '<a href="' . DOL_URL_ROOT . '/supplier_proposal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
// Ref
print '<tr><td>' . $langs->trans('Ref') . '</td><td colspan="5">';
@@ -1431,7 +1431,7 @@ if ($action == 'create')
print '<tr><td>';
print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('Project') . '</td>';
- if ($user->rights->askpricesupplier->creer) {
+ if ($user->rights->supplier_proposal->creer) {
if ($action != 'classify')
print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=classify&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a></td>';
print '</tr></table>';
@@ -1479,7 +1479,7 @@ if ($action == 'create')
print '<table width="100%" class="nobordernopadding"><tr><td>';
print $langs->trans('BankAccount');
print '</td>';
- if ($action != 'editbankaccount' && $user->rights->askpricesupplier->creer)
+ if ($action != 'editbankaccount' && $user->rights->supplier_proposal->creer)
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
print '</tr></table>';
print '</td><td colspan="3">';
@@ -1574,7 +1574,7 @@ if ($action == 'create')
$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
// Form to add new line
- if ($object->statut == 0 && $user->rights->askpricesupplier->creer)
+ if ($object->statut == 0 && $user->rights->supplier_proposal->creer)
{
if ($action != 'editline')
{
@@ -1600,7 +1600,7 @@ if ($action == 'create')
* Form to close proposal (signed or not)
*/
$form_close = '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
- $form_close .= '<p class="notice">'.$langs->trans('AskPriceSupplierRefFournNotice').'</p>';
+ $form_close .= '<p class="notice">'.$langs->trans('SupplierProposalRefFournNotice').'</p>';
$form_close .= '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
$form_close .= '<table class="border" width="100%">';
$form_close .= '<tr><td width="150" align="left">' . $langs->trans("CloseAs") . '</td><td align="left">';
@@ -1639,8 +1639,8 @@ if ($action == 'create')
{
// Validate
if ($object->statut == 0 && $object->total_ttc >= 0 && count($object->lines) > 0 &&
- ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->creer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->validate)))
+ ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->creer))
+ || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->validate)))
) {
if (count($object->lines) > 0)
print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=validate">' . $langs->trans('Validate') . '</a></div>';
@@ -1648,19 +1648,19 @@ if ($action == 'create')
}
// Edit
- if ($object->statut == 1 && $user->rights->askpricesupplier->creer) {
+ if ($object->statut == 1 && $user->rights->supplier_proposal->creer) {
print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=modif">' . $langs->trans('Modify') . '</a></div>';
}
// ReOpen
- if (($object->statut == 2 || $object->statut == 3 || $object->statut == 4) && $user->rights->askpricesupplier->cloturer) {
+ if (($object->statut == 2 || $object->statut == 3 || $object->statut == 4) && $user->rights->supplier_proposal->cloturer) {
print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=reopen' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen') . '"';
print '>' . $langs->trans('ReOpen') . '</a></div>';
}
// Send
if ($object->statut == 1 || $object->statut == 2) {
- if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->askpricesupplier->send) {
+ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send) {
print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init">' . $langs->trans('SendByMail') . '</a></div>';
} else
print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
@@ -1674,18 +1674,18 @@ if ($action == 'create')
}
// Close
- if ($object->statut == 1 && $user->rights->askpricesupplier->cloturer) {
+ if ($object->statut == 1 && $user->rights->supplier_proposal->cloturer) {
print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=statut' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
print '>' . $langs->trans('Close') . '</a></div>';
}
// Clone
- if ($user->rights->askpricesupplier->creer) {
+ if ($user->rights->supplier_proposal->creer) {
print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&socid=' . $object->socid . '&action=clone&object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';
}
// Delete
- if ($user->rights->askpricesupplier->supprimer) {
+ if ($user->rights->supplier_proposal->supprimer) {
print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=delete"';
print '>' . $langs->trans('Delete') . '</a></div>';
}
@@ -1704,14 +1704,14 @@ if ($action == 'create')
* Documents generes
*/
$filename = dol_sanitizeFileName($object->ref);
- $filedir = $conf->askpricesupplier->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $filedir = $conf->supplier_proposal->dir_output . "/" . dol_sanitizeFileName($object->ref);
$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
- $genallowed = $user->rights->askpricesupplier->creer;
- $delallowed = $user->rights->askpricesupplier->supprimer;
+ $genallowed = $user->rights->supplier_proposal->creer;
+ $delallowed = $user->rights->supplier_proposal->supprimer;
$var = true;
- $somethingshown = $formfile->show_documents('askpricesupplier', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+ $somethingshown = $formfile->show_documents('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
// Linked object block
$somethingshown = $form->showLinkedObjectBlock($object);
@@ -1725,7 +1725,7 @@ if ($action == 'create')
// List of actions on element
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
$formactions = new FormActions($db);
- $somethingshown = $formactions->showactions($object, 'askpricesupplier', $socid);
+ $somethingshown = $formactions->showactions($object, 'supplier_proposal', $socid);
print '</div></div></div>';
}
@@ -1742,7 +1742,7 @@ if ($action == 'create')
$ref = dol_sanitizeFileName($object->ref);
include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
- $fileparams = dol_most_recent_file($conf->askpricesupplier->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+ $fileparams = dol_most_recent_file($conf->supplier_proposal->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
$file = $fileparams['fullname'];
// Define output language
@@ -1768,7 +1768,7 @@ if ($action == 'create')
dol_print_error($db, $object->error, $object->errors);
exit();
}
- $fileparams = dol_most_recent_file($conf->askpricesupplier->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+ $fileparams = dol_most_recent_file($conf->supplier_proposal->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
$file = $fileparams['fullname'];
}
@@ -1821,7 +1821,7 @@ if ($action == 'create')
// Tableau des parametres complementaires
$formmail->param['action'] = 'send';
- $formmail->param['models'] = 'askpricesupplier_send';
+ $formmail->param['models'] = 'supplier_proposal_send';
$formmail->param['models_id']=GETPOST('modelmailselected','int');
$formmail->param['id'] = $object->id;
$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
diff --git a/htdocs/core/modules/askpricesupplier/index.html b/htdocs/supplier_proposal/class/index.html
similarity index 100%
rename from htdocs/core/modules/askpricesupplier/index.html
rename to htdocs/supplier_proposal/class/index.html
diff --git a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
similarity index 88%
rename from htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
rename to htdocs/supplier_proposal/class/supplier_proposal.class.php
index 1cb2e72f292..57fc7e50838 100644
--- a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -27,8 +27,8 @@
*/
/**
- * \file htdocs/comm/propal/class/propal.class.php
- * \brief File of class to manage proposals
+ * \file htdocs/supplier_proposal/class/supplier_propal.class.php
+ * \brief File of class to manage supplier proposals
*/
require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.product.class.php';
@@ -40,12 +40,12 @@ require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php';
/**
* Class to manage price ask supplier
*/
-class AskPriceSupplier extends CommonObject
+class SupplierProposal extends CommonObject
{
- public $element='askpricesupplier';
- public $table_element='askpricesupplier';
- public $table_element_line='askpricesupplierdet';
- public $fk_element='fk_askpricesupplier';
+ public $element='supplier_proposal';
+ public $table_element='supplier_proposal';
+ public $table_element_line='supplier_proposaldet';
+ public $fk_element='fk_supplier_proposal';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
@@ -136,31 +136,31 @@ class AskPriceSupplier extends CommonObject
*
* @param DoliDB $db Database handler
* @param int $socid Id third party
- * @param int $askpricesupplierid Id askpricesupplier
+ * @param int $supplier_proposalid Id supplier_proposal
*/
- function __construct($db, $socid="", $askpricesupplierid=0)
+ function __construct($db, $socid="", $supplier_proposalid=0)
{
global $conf,$langs;
$this->db = $db;
$this->socid = $socid;
- $this->id = $askpricesupplierid;
+ $this->id = $supplier_proposalid;
$this->products = array();
$this->remise = 0;
$this->remise_percent = 0;
$this->remise_absolue = 0;
- $langs->load("askpricesupplier");
- $this->labelstatut[0]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_DRAFT_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_DRAFT_LABEL : $langs->trans("AskpricesupplierStatusDraft"));
- $this->labelstatut[1]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_VALIDATED_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_VALIDATED_LABEL : $langs->trans("AskpricesupplierStatusValidated"));
- $this->labelstatut[2]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_SIGNED_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_SIGNED_LABEL : $langs->trans("AskpricesupplierStatusSigned"));
- $this->labelstatut[3]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_NOTSIGNED_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_NOTSIGNED_LABEL : $langs->trans("AskpricesupplierStatusNotSigned"));
- $this->labelstatut[4]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_BILLED_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_BILLED_LABEL : $langs->trans("AskpricesupplierStatusBilled"));
- $this->labelstatut_short[0]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_DRAFTSHORT_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_DRAFTSHORT_LABEL : $langs->trans("AskpricesupplierStatusDraftShort"));
- $this->labelstatut_short[1]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_VALIDATEDSHORT_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_VALIDATEDSHORT_LABEL : $langs->trans("Opened"));
- $this->labelstatut_short[2]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_SIGNEDSHORT_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_SIGNEDSHORT_LABEL : $langs->trans("AskpricesupplierStatusSignedShort"));
- $this->labelstatut_short[3]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_NOTSIGNEDSHORT_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_NOTSIGNEDSHORT_LABEL : $langs->trans("AskpricesupplierStatusNotSignedShort"));
- $this->labelstatut_short[4]=(! empty($conf->global->ASKPRICESUPPLIER_STATUS_BILLEDSHORT_LABEL) ? $conf->global->ASKPRICESUPPLIER_STATUS_BILLEDSHORT_LABEL : $langs->trans("AskpricesupplierStatusBilledShort"));
+ $langs->load("supplier_proposal");
+ $this->labelstatut[0]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_DRAFT_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_DRAFT_LABEL : $langs->trans("AskpricesupplierStatusDraft"));
+ $this->labelstatut[1]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_VALIDATED_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_VALIDATED_LABEL : $langs->trans("AskpricesupplierStatusValidated"));
+ $this->labelstatut[2]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_SIGNED_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_SIGNED_LABEL : $langs->trans("AskpricesupplierStatusSigned"));
+ $this->labelstatut[3]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_NOTSIGNED_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_NOTSIGNED_LABEL : $langs->trans("AskpricesupplierStatusNotSigned"));
+ $this->labelstatut[4]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_BILLED_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_BILLED_LABEL : $langs->trans("AskpricesupplierStatusBilled"));
+ $this->labelstatut_short[0]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_DRAFTSHORT_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_DRAFTSHORT_LABEL : $langs->trans("AskpricesupplierStatusDraftShort"));
+ $this->labelstatut_short[1]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_VALIDATEDSHORT_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_VALIDATEDSHORT_LABEL : $langs->trans("Opened"));
+ $this->labelstatut_short[2]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_SIGNEDSHORT_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_SIGNEDSHORT_LABEL : $langs->trans("AskpricesupplierStatusSignedShort"));
+ $this->labelstatut_short[3]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_NOTSIGNEDSHORT_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_NOTSIGNEDSHORT_LABEL : $langs->trans("AskpricesupplierStatusNotSignedShort"));
+ $this->labelstatut_short[4]=(! empty($conf->global->SUPPLIER_PROPOSAL_STATUS_BILLEDSHORT_LABEL) ? $conf->global->SUPPLIER_PROPOSAL_STATUS_BILLEDSHORT_LABEL : $langs->trans("AskpricesupplierStatusBilledShort"));
}
@@ -205,7 +205,7 @@ class AskPriceSupplier extends CommonObject
$price = $prod->price;
}
- $line = new AskPriceSupplierLine($this->db);
+ $line = new SupplierProposalLine($this->db);
$line->fk_product=$idproduct;
$line->desc=$productdesc;
@@ -245,27 +245,27 @@ class AskPriceSupplier extends CommonObject
return -5;
}
- $askpricesupplierligne=new AskPriceSupplierLine($this->db);
- $askpricesupplierligne->fk_askpricesupplier=$this->id;
- $askpricesupplierligne->fk_remise_except=$remise->id;
- $askpricesupplierligne->desc=$remise->description; // Description ligne
- $askpricesupplierligne->tva_tx=$remise->tva_tx;
- $askpricesupplierligne->subprice=-$remise->amount_ht;
- $askpricesupplierligne->fk_product=0; // Id produit predefini
- $askpricesupplierligne->qty=1;
- $askpricesupplierligne->remise=0;
- $askpricesupplierligne->remise_percent=0;
- $askpricesupplierligne->rang=-1;
- $askpricesupplierligne->info_bits=2;
+ $supplier_proposalligne=new SupplierProposalLine($this->db);
+ $supplier_proposalligne->fk_supplier_proposal=$this->id;
+ $supplier_proposalligne->fk_remise_except=$remise->id;
+ $supplier_proposalligne->desc=$remise->description; // Description ligne
+ $supplier_proposalligne->tva_tx=$remise->tva_tx;
+ $supplier_proposalligne->subprice=-$remise->amount_ht;
+ $supplier_proposalligne->fk_product=0; // Id produit predefini
+ $supplier_proposalligne->qty=1;
+ $supplier_proposalligne->remise=0;
+ $supplier_proposalligne->remise_percent=0;
+ $supplier_proposalligne->rang=-1;
+ $supplier_proposalligne->info_bits=2;
// TODO deprecated
- $askpricesupplierligne->price=-$remise->amount_ht;
+ $supplier_proposalligne->price=-$remise->amount_ht;
- $askpricesupplierligne->total_ht = -$remise->amount_ht;
- $askpricesupplierligne->total_tva = -$remise->amount_tva;
- $askpricesupplierligne->total_ttc = -$remise->amount_ttc;
+ $supplier_proposalligne->total_ht = -$remise->amount_ht;
+ $supplier_proposalligne->total_tva = -$remise->amount_tva;
+ $supplier_proposalligne->total_ttc = -$remise->amount_ttc;
- $result=$askpricesupplierligne->insert();
+ $result=$supplier_proposalligne->insert();
if ($result > 0)
{
$result=$this->update_price(1);
@@ -282,7 +282,7 @@ class AskPriceSupplier extends CommonObject
}
else
{
- $this->error=$askpricesupplierligne->error;
+ $this->error=$supplier_proposalligne->error;
$this->db->rollback();
return -2;
}
@@ -329,7 +329,7 @@ class AskPriceSupplier extends CommonObject
{
global $mysoc;
- dol_syslog(get_class($this)."::addline askpricesupplierid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type");
+ dol_syslog(get_class($this)."::addline supplier_proposalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type");
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
// Clean parameters
@@ -397,9 +397,9 @@ class AskPriceSupplier extends CommonObject
}
// Insert line
- $this->line=new AskPriceSupplierLine($this->db);
+ $this->line=new SupplierProposalLine($this->db);
- $this->line->fk_askpricesupplier=$this->id;
+ $this->line->fk_supplier_proposal=$this->id;
$this->line->label=$label;
$this->line->desc=$desc;
$this->line->qty=$qty;
@@ -547,10 +547,10 @@ class AskPriceSupplier extends CommonObject
}
// Update line
- $this->line=new AskPriceSupplierLine($this->db);
+ $this->line=new SupplierProposalLine($this->db);
// Stock previous line records
- $staticline=new AskPriceSupplierLine($this->db);
+ $staticline=new SupplierProposalLine($this->db);
$staticline->fetch($rowid);
$this->line->oldline = $staticline;
@@ -612,7 +612,7 @@ class AskPriceSupplier extends CommonObject
$this->update_price(1);
- $this->fk_askpricesupplier = $this->id;
+ $this->fk_supplier_proposal = $this->id;
$this->rowid = $rowid;
$this->db->commit();
@@ -643,7 +643,7 @@ class AskPriceSupplier extends CommonObject
{
if ($this->statut == 0)
{
- $line=new AskPriceSupplierLine($this->db);
+ $line=new SupplierProposalLine($this->db);
// For triggers
$line->fetch($lineid);
@@ -708,7 +708,7 @@ class AskPriceSupplier extends CommonObject
$this->db->begin();
// Insert into database
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."askpricesupplier (";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."supplier_proposal (";
$sql.= "fk_soc";
$sql.= ", price";
$sql.= ", remise";
@@ -757,12 +757,12 @@ class AskPriceSupplier extends CommonObject
$resql=$this->db->query($sql);
if ($resql)
{
- $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."askpricesupplier");
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."supplier_proposal");
if ($this->id)
{
$this->ref='(PROV'.$this->id.')';
- $sql = 'UPDATE '.MAIN_DB_PREFIX."askpricesupplier SET ref='".$this->ref."' WHERE rowid=".$this->id;
+ $sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->ref."' WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
@@ -836,7 +836,7 @@ class AskPriceSupplier extends CommonObject
$action='update';
// Actions on extra fields (by external module or standard code)
- $hookmanager->initHooks(array('askpricesupplierdao'));
+ $hookmanager->initHooks(array('supplier_proposaldao'));
$parameters=array('socid'=>$this->id);
$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (empty($reshook))
@@ -855,7 +855,7 @@ class AskPriceSupplier extends CommonObject
if (! $notrigger)
{
// Call trigger
- $result=$this->call_trigger('ASKPRICESUPPLIER_CREATE',$user);
+ $result=$this->call_trigger('SUPPLIER_PROPOSAL_CREATE',$user);
if ($result < 0) { $error++; }
// End call triggers
}
@@ -895,7 +895,7 @@ class AskPriceSupplier extends CommonObject
/**
- * Insert into DB a askpricesupplier object completely defined by its data members (ex, results from copy).
+ * Insert into DB a supplier_proposal object completely defined by its data members (ex, results from copy).
*
* @param User $user User that create
* @return int Id of the new object if ok, <0 if ko
@@ -953,7 +953,7 @@ class AskPriceSupplier extends CommonObject
$this->id=0;
$this->statut=0;
- if (empty($conf->global->ASKPRICESUPPLIER_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/core/modules/askpricesupplier/".$conf->global->ASKPRICESUPPLIER_ADDON.".php"))
+ if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.".php"))
{
$this->error='ErrorSetupNotComplete';
return -1;
@@ -965,10 +965,10 @@ class AskPriceSupplier extends CommonObject
$this->date = $now;
// Set ref
- require_once DOL_DOCUMENT_ROOT ."/core/modules/askpricesupplier/".$conf->global->ASKPRICESUPPLIER_ADDON.'.php';
- $obj = $conf->global->ASKPRICESUPPLIER_ADDON;
- $modAskPriceSupplier = new $obj;
- $this->ref = $modAskPriceSupplier->getNextValue($objsoc,$this);
+ require_once DOL_DOCUMENT_ROOT ."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.'.php';
+ $obj = $conf->global->SUPPLIER_PROPOSAL_ADDON;
+ $modSupplierProposal = new $obj;
+ $this->ref = $modSupplierProposal->getNextValue($objsoc,$this);
// Create clone
$result=$this->create($user);
@@ -986,7 +986,7 @@ class AskPriceSupplier extends CommonObject
}
// Call trigger
- $result=$this->call_trigger('ASKPRICESUPPLIER_CLONE',$user);
+ $result=$this->call_trigger('SUPPLIER_PROPOSAL_CLONE',$user);
if ($result < 0) { $error++; }
// End call triggers
}
@@ -1031,7 +1031,7 @@ class AskPriceSupplier extends CommonObject
$sql.= ", c.label as statut_label";
$sql.= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
$sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."askpricesupplier as p";
+ $sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."supplier_proposal as p";
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid';
$sql.= " WHERE p.fk_statut = c.id";
@@ -1109,13 +1109,13 @@ class AskPriceSupplier extends CommonObject
/*
* Lignes askprice liees a un produit ou non
*/
- $sql = "SELECT d.rowid, d.fk_askpricesupplier, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
+ $sql = "SELECT d.rowid, d.fk_supplier_proposal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
$sql.= ' d.ref_fourn as ref_produit_fourn';
- $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplierdet as d";
+ $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
- $sql.= " WHERE d.fk_askpricesupplier = ".$this->id;
+ $sql.= " WHERE d.fk_supplier_proposal = ".$this->id;
$sql.= " ORDER by d.rang";
$result = $this->db->query($sql);
@@ -1128,10 +1128,10 @@ class AskPriceSupplier extends CommonObject
{
$objp = $this->db->fetch_object($result);
- $line = new AskPriceSupplierLine($this->db);
+ $line = new SupplierProposalLine($this->db);
$line->rowid = $objp->rowid;
- $line->fk_askpricesupplier = $objp->fk_askpricesupplier;
+ $line->fk_supplier_proposal = $objp->fk_supplier_proposal;
$line->fk_parent_line = $objp->fk_parent_line;
$line->product_type = $objp->product_type;
$line->label = $objp->custom_label;
@@ -1213,7 +1213,7 @@ class AskPriceSupplier extends CommonObject
$action='update';
// Actions on extra fields (by external module or standard code)
- $hookmanager->initHooks(array('askpricesupplierdao'));
+ $hookmanager->initHooks(array('supplier_proposaldao'));
$parameters=array('id'=>$this->id);
$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (empty($reshook))
@@ -1256,8 +1256,8 @@ class AskPriceSupplier extends CommonObject
$error=0;
$now=dol_now();
- if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->creer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->validate)))
+ if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->creer))
+ || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->validate)))
{
$this->db->begin();
@@ -1276,7 +1276,7 @@ class AskPriceSupplier extends CommonObject
}
$this->newref = $num;
- $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
$sql.= " SET ref = '".$num."',";
$sql.= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
@@ -1293,7 +1293,7 @@ class AskPriceSupplier extends CommonObject
if (! $error && ! $notrigger)
{
// Call trigger
- $result=$this->call_trigger('ASKPRICESUPPLIER_VALIDATE',$user);
+ $result=$this->call_trigger('SUPPLIER_PROPOSAL_VALIDATE',$user);
if ($result < 0) { $error++; }
// End call triggers
}
@@ -1309,8 +1309,8 @@ class AskPriceSupplier extends CommonObject
// to not lose the linked files
$oldref = dol_sanitizeFileName($this->ref);
$newref = dol_sanitizeFileName($num);
- $dirsource = $conf->askpricesupplier->dir_output.'/'.$oldref;
- $dirdest = $conf->askpricesupplier->dir_output.'/'.$newref;
+ $dirsource = $conf->supplier_proposal->dir_output.'/'.$oldref;
+ $dirdest = $conf->supplier_proposal->dir_output.'/'.$newref;
if (file_exists($dirsource))
{
@@ -1319,7 +1319,7 @@ class AskPriceSupplier extends CommonObject
{
dol_syslog("Rename ok");
// Rename docs starting with $oldref with $newref
- $listoffiles=dol_dir_list($conf->askpricesupplier->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+ $listoffiles=dol_dir_list($conf->supplier_proposal->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
foreach($listoffiles as $fileentry)
{
$dirsource=$fileentry['name'];
@@ -1358,9 +1358,9 @@ class AskPriceSupplier extends CommonObject
*/
function set_date_livraison($user, $date_livraison)
{
- if (! empty($user->rights->askpricesupplier->creer))
+ if (! empty($user->rights->supplier_proposal->creer))
{
- $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier ";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
$sql.= " SET date_livraison = ".($date_livraison!=''?"'".$this->db->idate($date_livraison)."'":'null');
$sql.= " WHERE rowid = ".$this->id;
@@ -1389,11 +1389,11 @@ class AskPriceSupplier extends CommonObject
{
$remise=trim($remise)?trim($remise):0;
- if (! empty($user->rights->askpricesupplier->creer))
+ if (! empty($user->rights->supplier_proposal->creer))
{
$remise = price2num($remise);
- $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier SET remise_percent = ".$remise;
+ $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET remise_percent = ".$remise;
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
if ($this->db->query($sql) )
@@ -1422,11 +1422,11 @@ class AskPriceSupplier extends CommonObject
{
$remise=trim($remise)?trim($remise):0;
- if (! empty($user->rights->askpricesupplier->creer))
+ if (! empty($user->rights->supplier_proposal->creer))
{
$remise = price2num($remise);
- $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier ";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
$sql.= " SET remise_absolue = ".$remise;
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
@@ -1462,7 +1462,7 @@ class AskPriceSupplier extends CommonObject
$this->statut = $statut;
$error=0;
- $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
$sql.= " SET fk_statut = ".$this->statut.",";
if (! empty($note)) $sql.= " note_private = '".$this->db->escape($note)."',";
$sql.= " date_cloture=NULL, fk_user_cloture=NULL";
@@ -1480,7 +1480,7 @@ class AskPriceSupplier extends CommonObject
if (! $notrigger)
{
// Call trigger
- $result=$this->call_trigger('ASKPRICESUPPLIER_REOPEN',$user);
+ $result=$this->call_trigger('SUPPLIER_PROPOSAL_REOPEN',$user);
if ($result < 0) { $error++; }
// End call triggers
}
@@ -1526,20 +1526,20 @@ class AskPriceSupplier extends CommonObject
$this->db->begin();
- $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
$sql.= " SET fk_statut = ".$statut.", note_private = '".$this->db->escape($note)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
$sql.= " WHERE rowid = ".$this->id;
$resql=$this->db->query($sql);
if ($resql)
{
- $modelpdf=$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_CLOSED?$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_CLOSED:$this->modelpdf;
- $trigger_name='ASKPRICESUPPLIER_CLOSE_REFUSED';
+ $modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED:$this->modelpdf;
+ $trigger_name='SUPPLIER_PROPOSAL_CLOSE_REFUSED';
if ($statut == 2)
{
- $trigger_name='ASKPRICESUPPLIER_CLOSE_SIGNED';
- $modelpdf=$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_TOBILL?$conf->global->ASKPRICESUPPLIER_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
+ $trigger_name='SUPPLIER_PROPOSAL_CLOSE_SIGNED';
+ $modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
// The connected company is classified as a client
$soc=new Societe($this->db);
@@ -1559,7 +1559,7 @@ class AskPriceSupplier extends CommonObject
}
if ($statut == 4)
{
- $trigger_name='ASKPRICESUPPLIER_CLASSIFY_BILLED';
+ $trigger_name='SUPPLIER_PROPOSAL_CLASSIFY_BILLED';
}
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
@@ -1697,7 +1697,7 @@ class AskPriceSupplier extends CommonObject
{
global $conf,$langs;
- $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplier SET fk_statut = 0";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET fk_statut = 0";
$sql.= " WHERE rowid = ".$this->id;
if ($this->db->query($sql))
@@ -1733,10 +1733,10 @@ class AskPriceSupplier extends CommonObject
$ga = array();
$sql = "SELECT s.rowid, s.nom as name, s.client,";
- $sql.= " p.rowid as askpricesupplierid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
+ $sql.= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
$sql.= " p.datep as dp, p.fin_validite as datelimite";
if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."askpricesupplier as p, ".MAIN_DB_PREFIX."c_propalst as c";
+ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE p.entity = ".$conf->entity;
$sql.= " AND p.fk_soc = s.rowid";
@@ -1764,15 +1764,15 @@ class AskPriceSupplier extends CommonObject
if ($shortlist == 1)
{
- $ga[$obj->askpricesupplierid] = $obj->ref;
+ $ga[$obj->supplier_proposalid] = $obj->ref;
}
else if ($shortlist == 2)
{
- $ga[$obj->askpricesupplierid] = $obj->ref.' ('.$obj->name.')';
+ $ga[$obj->supplier_proposalid] = $obj->ref.' ('.$obj->name.')';
}
else
{
- $ga[$i]['id'] = $obj->askpricesupplierid;
+ $ga[$i]['id'] = $obj->supplier_proposalid;
$ga[$i]['ref'] = $obj->ref;
$ga[$i]['name'] = $obj->name;
}
@@ -1808,17 +1808,17 @@ class AskPriceSupplier extends CommonObject
if (! $notrigger)
{
// Call trigger
- $result=$this->call_trigger('ASKPRICESUPPLIER_DELETE',$user);
+ $result=$this->call_trigger('SUPPLIER_PROPOSAL_DELETE',$user);
if ($result < 0) { $error++; }
// End call triggers
}
if (! $error)
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."askpricesupplierdet WHERE fk_askpricesupplier = ".$this->id;
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE fk_supplier_proposal = ".$this->id;
if ($this->db->query($sql))
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."askpricesupplier WHERE rowid = ".$this->id;
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposal WHERE rowid = ".$this->id;
if ($this->db->query($sql))
{
// Delete linked object
@@ -1829,9 +1829,9 @@ class AskPriceSupplier extends CommonObject
{
// We remove directory
$ref = dol_sanitizeFileName($this->ref);
- if ($conf->askpricesupplier->dir_output && !empty($this->ref))
+ if ($conf->supplier_proposal->dir_output && !empty($this->ref))
{
- $dir = $conf->askpricesupplier->dir_output . "/" . $ref ;
+ $dir = $conf->supplier_proposal->dir_output . "/" . $ref ;
$file = $dir . "/" . $ref . ".pdf";
if (file_exists($file))
{
@@ -1909,7 +1909,7 @@ class AskPriceSupplier extends CommonObject
}
/**
- * Object AskPriceSupplier Information
+ * Object SupplierProposal Information
*
* @param int $id Proposal id
* @return void
@@ -1919,7 +1919,7 @@ class AskPriceSupplier extends CommonObject
$sql = "SELECT c.rowid, ";
$sql.= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
$sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
- $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier as c";
+ $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
$sql.= " WHERE c.rowid = ".$id;
$result = $this->db->query($sql);
@@ -1987,7 +1987,7 @@ class AskPriceSupplier extends CommonObject
function LibStatut($statut,$mode=1)
{
global $langs;
- $langs->load("askpricesupplier");
+ $langs->load("supplier_proposal");
if ($statut==0) $statuttrans='statut0';
if ($statut==1) $statuttrans='statut1';
@@ -2021,7 +2021,7 @@ class AskPriceSupplier extends CommonObject
$clause = " WHERE";
$sql = "SELECT p.rowid, p.ref, p.datec as datec";
- $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier as p";
+ $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
if (!$user->rights->societe->client->voir && !$user->societe_id)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
@@ -2036,8 +2036,8 @@ class AskPriceSupplier extends CommonObject
$resql=$this->db->query($sql);
if ($resql)
{
- if ($mode == 'opened') $delay_warning=$conf->askpricesupplier->cloture->warning_delay;
- if ($mode == 'signed') $delay_warning=$conf->askpricesupplier->facturation->warning_delay;
+ if ($mode == 'opened') $delay_warning=$conf->supplier_proposal->cloture->warning_delay;
+ if ($mode == 'signed') $delay_warning=$conf->supplier_proposal->facturation->warning_delay;
// This assignment in condition is not a bug. It allows walking the results.
while ($obj=$this->db->fetch_object($resql))
@@ -2110,7 +2110,7 @@ class AskPriceSupplier extends CommonObject
$xnbp = 0;
while ($xnbp < $nbp)
{
- $line=new AskPriceSupplierLine($this->db);
+ $line=new SupplierProposalLine($this->db);
$line->desc=$langs->trans("Description")." ".$xnbp;
$line->qty=1;
$line->subprice=100;
@@ -2159,7 +2159,7 @@ class AskPriceSupplier extends CommonObject
$clause = "WHERE";
$sql = "SELECT count(p.rowid) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier as p";
+ $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
if (!$user->rights->societe->client->voir && !$user->societe_id)
{
@@ -2191,7 +2191,7 @@ class AskPriceSupplier extends CommonObject
/**
* Returns the reference to the following non used Proposal used depending on the active numbering module
- * defined into ASKPRICESUPPLIER_ADDON
+ * defined into SUPPLIER_PROPOSAL_ADDON
*
* @param Societe $soc Object thirdparty
* @return string Reference libre pour la propale
@@ -2199,20 +2199,20 @@ class AskPriceSupplier extends CommonObject
function getNextNumRef($soc)
{
global $conf, $db, $langs;
- $langs->load("askpricesupplier");
+ $langs->load("supplier_proposal");
- if (! empty($conf->global->ASKPRICESUPPLIER_ADDON))
+ if (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON))
{
$mybool=false;
- $file = $conf->global->ASKPRICESUPPLIER_ADDON.".php";
- $classname = $conf->global->ASKPRICESUPPLIER_ADDON;
+ $file = $conf->global->SUPPLIER_PROPOSAL_ADDON.".php";
+ $classname = $conf->global->SUPPLIER_PROPOSAL_ADDON;
// Include file with class
$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
foreach ($dirmodels as $reldir) {
- $dir = dol_buildpath($reldir."core/modules/askpricesupplier/");
+ $dir = dol_buildpath($reldir."core/modules/supplier_proposal/");
// Load file with numbering class (if found)
$mybool|=@include_once $dir.$file;
@@ -2262,14 +2262,14 @@ class AskPriceSupplier extends CommonObject
$label=$langs->trans("ShowAskpricesupplier").': '.$this->ref;
$linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
if ($option == '') {
- $link = '<a href="'.DOL_URL_ROOT.'/comm/askpricesupplier/card.php?id='.$this->id. $get_params .$linkclose;
+ $link = '<a href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id. $get_params .$linkclose;
}
if ($option == 'document') {
- $link = '<a href="'.DOL_URL_ROOT.'/comm/askpricesupplier/document.php?id='.$this->id. $get_params .$linkclose;
+ $link = '<a href="'.DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$this->id. $get_params .$linkclose;
}
$linkend='</a>';
- $picto='askpricesupplier';
+ $picto='supplier_proposal';
if ($withpicto)
@@ -2293,9 +2293,9 @@ class AskPriceSupplier extends CommonObject
$sql.= ' pt.product_type, pt.rang, pt.fk_parent_line,';
$sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
$sql.= ' p.description as product_desc, pt.ref_fourn as ref_produit_fourn';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'askpricesupplierdet as pt';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
- $sql.= ' WHERE pt.fk_askpricesupplier = '.$this->id;
+ $sql.= ' WHERE pt.fk_supplier_proposal = '.$this->id;
$sql.= ' ORDER BY pt.rang ASC, pt.rowid';
dol_syslog(get_class($this).'::getLinesArray', LOG_DEBUG);
@@ -2309,7 +2309,7 @@ class AskPriceSupplier extends CommonObject
{
$obj = $this->db->fetch_object($resql);
- $this->lines[$i] = new AskPriceSupplierLine($this->db);
+ $this->lines[$i] = new SupplierProposalLine($this->db);
$this->lines[$i]->id = $obj->rowid; // for backward compatibility
$this->lines[$i]->rowid = $obj->rowid;
$this->lines[$i]->label = $obj->custom_label;
@@ -2367,14 +2367,14 @@ class AskPriceSupplier extends CommonObject
{
global $conf,$user,$langs;
- $langs->load("askpricesupplier");
+ $langs->load("supplier_proposal");
// Positionne le modele sur le nom du modele a utiliser
if (! dol_strlen($modele))
{
- if (! empty($conf->global->ASKPRICESUPPLIER_ADDON_PDF))
+ if (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF))
{
- $modele = $conf->global->ASKPRICESUPPLIER_ADDON_PDF;
+ $modele = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF;
}
else
{
@@ -2382,7 +2382,7 @@ class AskPriceSupplier extends CommonObject
}
}
- $modelpath = "core/modules/askpricesupplier/doc/";
+ $modelpath = "core/modules/supplier_proposal/doc/";
return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
}
@@ -2434,22 +2434,22 @@ class AskPriceSupplier extends CommonObject
/**
- * \class AskPriceSupplierLine
- * \brief Class to manage askpricesupplier lines
+ * \class SupplierProposalLine
+ * \brief Class to manage supplier_proposal lines
*/
-class AskPriceSupplierLine extends CommonObject
+class SupplierProposalLine extends CommonObject
{
var $db;
var $error;
- public $element='askpricesupplierdet';
- public $table_element='askpricesupplierdet';
+ public $element='supplier_proposaldet';
+ public $table_element='supplier_proposaldet';
var $oldline;
- // From llx_askpricesupplierdet
+ // From llx_supplier_proposaldet
var $rowid;
- var $fk_askpricesupplier;
+ var $fk_supplier_proposal;
var $fk_parent_line;
var $desc; // Description ligne
var $fk_product; // Id produit predefini
@@ -2558,13 +2558,13 @@ class AskPriceSupplierLine extends CommonObject
*/
function fetch($rowid)
{
- $sql = 'SELECT pd.rowid, pd.fk_askpricesupplier, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.tva_tx,';
+ $sql = 'SELECT pd.rowid, pd.fk_supplier_proposal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.tva_tx,';
$sql.= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,';
$sql.= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,';
$sql.= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
$sql.= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
$sql.= ' pd.product_type, pd.ref_fourn as ref_produit_fourn';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'askpricesupplierdet as pd';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pd';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
$sql.= ' WHERE pd.rowid = '.$rowid;
@@ -2574,7 +2574,7 @@ class AskPriceSupplierLine extends CommonObject
$objp = $this->db->fetch_object($result);
$this->rowid = $objp->rowid;
- $this->fk_askpricesupplier = $objp->fk_askpricesupplier;
+ $this->fk_supplier_proposal = $objp->fk_supplier_proposal;
$this->fk_parent_line = $objp->fk_parent_line;
$this->label = $objp->custom_label;
$this->desc = $objp->description;
@@ -2670,14 +2670,14 @@ class AskPriceSupplierLine extends CommonObject
$this->db->begin();
// Insert line into database
- $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'askpricesupplierdet';
- $sql.= ' (fk_askpricesupplier, fk_parent_line, label, description, fk_product, product_type,';
+ $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'supplier_proposaldet';
+ $sql.= ' (fk_supplier_proposal, fk_parent_line, label, description, fk_product, product_type,';
$sql.= ' fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
$sql.= ' subprice, remise_percent, ';
$sql.= ' info_bits, ';
$sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
$sql.= ' ref_fourn)';
- $sql.= " VALUES (".$this->fk_askpricesupplier.",";
+ $sql.= " VALUES (".$this->fk_supplier_proposal.",";
$sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").",";
$sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
$sql.= " '".$this->db->escape($this->desc)."',";
@@ -2709,7 +2709,7 @@ class AskPriceSupplierLine extends CommonObject
$resql=$this->db->query($sql);
if ($resql)
{
- $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'askpricesupplierdet');
+ $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
@@ -2724,7 +2724,7 @@ class AskPriceSupplierLine extends CommonObject
if (! $notrigger)
{
// Call trigger
- $result=$this->call_trigger('LINEASKPRICESUPPLIER_INSERT',$user);
+ $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_INSERT',$user);
if ($result < 0)
{
$this->db->rollback();
@@ -2756,8 +2756,8 @@ class AskPriceSupplierLine extends CommonObject
$error=0;
$this->db->begin();
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."askpricesupplierdet WHERE rowid = ".$this->rowid;
- dol_syslog("AskPriceSupplierLine::delete", LOG_DEBUG);
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE rowid = ".$this->rowid;
+ dol_syslog("SupplierProposalLine::delete", LOG_DEBUG);
if ($this->db->query($sql) )
{
@@ -2774,7 +2774,7 @@ class AskPriceSupplierLine extends CommonObject
}
// Call trigger
- $result=$this->call_trigger('LINEASKPRICESUPLLIER_DELETE',$user);
+ $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_DELETE',$user);
if ($result < 0)
{
$this->db->rollback();
@@ -2842,7 +2842,7 @@ class AskPriceSupplierLine extends CommonObject
$this->db->begin();
// Mise a jour ligne en base
- $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplierdet SET";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
$sql.= " description='".$this->db->escape($this->desc)."'";
$sql.= " , label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
$sql.= " , product_type=".$this->product_type;
@@ -2890,7 +2890,7 @@ class AskPriceSupplierLine extends CommonObject
if (! $notrigger)
{
// Call trigger
- $result=$this->call_trigger('LINEASKPRICESUPPLIER_UPDATE',$user);
+ $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE',$user);
if ($result < 0)
{
$this->db->rollback();
@@ -2921,13 +2921,13 @@ class AskPriceSupplierLine extends CommonObject
$this->db->begin();
// Mise a jour ligne en base
- $sql = "UPDATE ".MAIN_DB_PREFIX."askpricesupplierdet SET";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
$sql.= " total_ht=".price2num($this->total_ht,'MT')."";
$sql.= ",total_tva=".price2num($this->total_tva,'MT')."";
$sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
$sql.= " WHERE rowid = ".$this->rowid;
- dol_syslog("AskPriceSupplierLine::update_total", LOG_DEBUG);
+ dol_syslog("SupplierProposalLine::update_total", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
diff --git a/htdocs/comm/askpricesupplier/document.php b/htdocs/supplier_proposal/document.php
similarity index 81%
rename from htdocs/comm/askpricesupplier/document.php
rename to htdocs/supplier_proposal/document.php
index f2558e826dc..ff1abaa2da1 100644
--- a/htdocs/comm/askpricesupplier/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -25,9 +25,9 @@
* \brief Management page of documents attached to a business proposal
*/
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php';
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
@@ -47,7 +47,7 @@ if (! empty($user->societe_id))
$action='';
$socid = $user->societe_id;
}
-$result = restrictedArea($user, 'askpricesupplier', $id);
+$result = restrictedArea($user, 'supplier_proposal', $id);
// Get parameters
$sortfield = GETPOST("sortfield",'alpha');
@@ -60,12 +60,12 @@ $pagenext = $page + 1;
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="name";
-$object = new AskPriceSupplier($db);
+$object = new SupplierProposal($db);
$object->fetch($id,$ref);
if ($object->id > 0)
{
$object->fetch_thirdparty();
- $upload_dir = $conf->askpricesupplier->dir_output.'/'.dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref);
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
}
@@ -80,10 +80,10 @@ $form = new Form($db);
if ($object->id > 0)
{
- $upload_dir = $conf->askpricesupplier->dir_output.'/'.dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref);
- $head = askpricesupplier_prepare_head($object);
- dol_fiche_head($head, 'document', $langs->trans('CommRequest'), 0, 'askpricesupplier');
+ $head = supplier_proposal_prepare_head($object);
+ dol_fiche_head($head, 'document', $langs->trans('CommRequest'), 0, 'supplier_proposal');
// Construit liste des fichiers
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
@@ -95,7 +95,7 @@ if ($object->id > 0)
print '<table class="border"width="100%">';
- $linkback='<a href="'.DOL_URL_ROOT.'/comm/askpricesupplier/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+ $linkback='<a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
// Ref
print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">';
@@ -113,8 +113,8 @@ if ($object->id > 0)
print '</div>';
- $modulepart = 'askpricesupplier';
- $permission = $user->rights->askpricesupplier->creer;
+ $modulepart = 'supplier_proposal';
+ $permission = $user->rights->supplier_proposal->creer;
$param = '&id=' . $object->id;
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
}
diff --git a/htdocs/comm/askpricesupplier/index.php b/htdocs/supplier_proposal/index.php
similarity index 79%
rename from htdocs/comm/askpricesupplier/index.php
rename to htdocs/supplier_proposal/index.php
index 6936defda49..4c363ba32ac 100644
--- a/htdocs/comm/askpricesupplier/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -23,11 +23,11 @@
* \brief Home page of proposal area
*/
-require '../../main.inc.php';
+require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT .'/comm/askpricesupplier/class/askpricesupplier.class.php';
+require_once DOL_DOCUMENT_ROOT .'/supplier_proposal/class/supplier_proposal.class.php';
-$langs->load("askpricesupplier");
+$langs->load("supplier_proposal");
$langs->load("companies");
// Security check
@@ -37,22 +37,22 @@ if (isset($user->societe_id) && $user->societe_id > 0)
$action = '';
$socid = $user->societe_id;
}
-$result = restrictedArea($user, 'askpricesupplier');
+$result = restrictedArea($user, 'supplier_proposal');
/*
* View
*/
$now=dol_now();
-$askpricesupplierstatic=new AskPriceSupplier($db);
+$supplier_proposalstatic=new SupplierProposal($db);
$companystatic=new Societe($db);
$form = new Form($db);
$formfile = new FormFile($db);
$help_url="EN:Module_Ask_Price_Supplier|FR:Module_Demande_de_prix_fournisseur";
-llxHeader("",$langs->trans("AskPriceSupplierArea"),$help_url);
+llxHeader("",$langs->trans("SupplierProposalArea"),$help_url);
-print load_fiche_titre($langs->trans("AskPriceSupplierArea"));
+print load_fiche_titre($langs->trans("SupplierProposalArea"));
print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -61,7 +61,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
* Search form
*/
$var=false;
-print '<form method="post" action="'.DOL_URL_ROOT.'/comm/askpricesupplier/list.php">';
+print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchRequest").'</td></tr>';
@@ -78,7 +78,7 @@ print "</table></form><br>\n";
$sql = "SELECT count(p.rowid), p.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql.= ", ".MAIN_DB_PREFIX."askpricesupplier as p";
+$sql.= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE p.fk_soc = s.rowid";
$sql.= " AND p.entity = ".$conf->entity;
@@ -119,12 +119,12 @@ if ($resql)
$listofstatus=array(0,1,2,3,4);
foreach ($listofstatus as $status)
{
- $dataseries[]=array('label'=>$askpricesupplierstatic->LibStatut($status,1),'data'=>(isset($vals[$status])?(int) $vals[$status]:0));
+ $dataseries[]=array('label'=>$supplier_proposalstatic->LibStatut($status,1),'data'=>(isset($vals[$status])?(int) $vals[$status]:0));
if (! $conf->use_javascript_ajax)
{
$var=!$var;
print "<tr ".$bc[$var].">";
- print '<td>'.$askpricesupplierstatic->LibStatut($status,0).'</td>';
+ print '<td>'.$supplier_proposalstatic->LibStatut($status,0).'</td>';
print '<td align="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status])?$vals[$status]:0).'</a></td>';
print "</tr>\n";
}
@@ -149,10 +149,10 @@ else
/*
* Draft askprice
*/
-if (! empty($conf->askpricesupplier->enabled))
+if (! empty($conf->supplier_proposal->enabled))
{
$sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client";
- $sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier as c";
+ $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE c.fk_soc = s.rowid";
@@ -167,7 +167,7 @@ if (! empty($conf->askpricesupplier->enabled))
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("DraftRequests").'</td></tr>';
- $langs->load("askpricesupplier");
+ $langs->load("supplier_proposal");
$num = $db->num_rows($resql);
if ($num)
{
@@ -179,9 +179,9 @@ if (! empty($conf->askpricesupplier->enabled))
$obj = $db->fetch_object($resql);
print "<tr ".$bc[$var].">";
- $askpricesupplierstatic->id=$obj->rowid;
- $askpricesupplierstatic->ref=$obj->ref;
- print '<td class="nowrap">'.$askpricesupplierstatic->getNomUrl(1).'</td>';
+ $supplier_proposalstatic->id=$obj->rowid;
+ $supplier_proposalstatic->ref=$obj->ref;
+ print '<td class="nowrap">'.$supplier_proposalstatic->getNomUrl(1).'</td>';
$companystatic->id=$obj->socid;
$companystatic->name=$obj->socname;
@@ -208,7 +208,7 @@ $max=5;
$sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
$sql.= " date_cloture as datec";
-$sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier as c";
+$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE c.fk_soc = s.rowid";
@@ -239,12 +239,12 @@ if ($resql)
print "<tr ".$bc[$var].">";
print '<td width="20%" class="nowrap">';
- $askpricesupplierstatic->id=$obj->rowid;
- $askpricesupplierstatic->ref=$obj->ref;
+ $supplier_proposalstatic->id=$obj->rowid;
+ $supplier_proposalstatic->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="96" class="nobordernopadding nowrap">';
- print $askpricesupplierstatic->getNomUrl(1);
+ print $supplier_proposalstatic->getNomUrl(1);
print '</td>';
print '<td width="16" class="nobordernopadding nowrap">';
@@ -253,9 +253,9 @@ if ($resql)
print '<td width="16" align="right" class="nobordernopadding">';
$filename=dol_sanitizeFileName($obj->ref);
- $filedir=$conf->askpricesupplier->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+ $filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
- print $formfile->getDocumentsLink($askpricesupplierstatic->element, $filename, $filedir);
+ print $formfile->getDocumentsLink($supplier_proposalstatic->element, $filename, $filedir);
print '</td></tr></table>';
print '</td>';
@@ -267,7 +267,7 @@ if ($resql)
print '<td>'.$companystatic->getNomUrl(1,'customer').'</td>';
print '<td>'.dol_print_date($db->jdate($obj->datec),'day').'</td>';
- print '<td align="right">'.$askpricesupplierstatic->LibStatut($obj->fk_statut,5).'</td>';
+ print '<td align="right">'.$supplier_proposalstatic->LibStatut($obj->fk_statut,5).'</td>';
print '</tr>';
$i++;
}
@@ -280,15 +280,15 @@ else dol_print_error($db);
/*
* Opened askprice
*/
-if (! empty($conf->askpricesupplier->enabled) && $user->rights->askpricesupplier->lire)
+if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
{
- $langs->load("askpricesupplier");
+ $langs->load("supplier_proposal");
$now=dol_now();
- $sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as askpricesupplierid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datec as dp";
+ $sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as supplier_proposalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datec as dp";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- $sql.= ", ".MAIN_DB_PREFIX."askpricesupplier as p";
+ $sql.= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE p.fk_soc = s.rowid";
$sql.= " AND p.entity = ".$conf->entity;
@@ -308,7 +308,7 @@ if (! empty($conf->askpricesupplier->enabled) && $user->rights->askpricesupplier
$var=true;
print '<table class="noborder" width="100%">';
- print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/comm/askpricesupplier/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
+ print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
while ($i < $nbofloop)
@@ -320,21 +320,21 @@ if (! empty($conf->askpricesupplier->enabled) && $user->rights->askpricesupplier
// Ref
print '<td class="nowrap" width="140">';
- $askpricesupplierstatic->id=$obj->askpricesupplierid;
- $askpricesupplierstatic->ref=$obj->ref;
+ $supplier_proposalstatic->id=$obj->supplier_proposalid;
+ $supplier_proposalstatic->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td class="nobordernopadding nowrap">';
- print $askpricesupplierstatic->getNomUrl(1);
+ print $supplier_proposalstatic->getNomUrl(1);
print '</td>';
print '<td width="18" class="nobordernopadding nowrap">';
- if ($db->jdate($obj->dfv) < ($now - $conf->askpricesupplier->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+ if ($db->jdate($obj->dfv) < ($now - $conf->supplier_proposal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
print '</td>';
print '<td width="16" align="center" class="nobordernopadding">';
$filename=dol_sanitizeFileName($obj->ref);
- $filedir=$conf->askpricesupplier->dir_output . '/' . dol_sanitizeFileName($obj->ref);
- $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->askpricesupplierid;
- print $formfile->getDocumentsLink($askpricesupplierstatic->element, $filename, $filedir);
+ $filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+ $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->supplier_proposalid;
+ print $formfile->getDocumentsLink($supplier_proposalstatic->element, $filename, $filedir);
print '</td></tr></table>';
print "</td>";
@@ -348,7 +348,7 @@ if (! empty($conf->askpricesupplier->enabled) && $user->rights->askpricesupplier
print '<td align="right">';
print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
print '<td align="right">'.price($obj->total_ttc).'</td>';
- print '<td align="center" width="14">'.$askpricesupplierstatic->LibStatut($obj->fk_statut,3).'</td>'."\n";
+ print '<td align="center" width="14">'.$supplier_proposalstatic->LibStatut($obj->fk_statut,3).'</td>'."\n";
print '</tr>'."\n";
$i++;
$total += $obj->total_ttc;
diff --git a/htdocs/comm/askpricesupplier/info.php b/htdocs/supplier_proposal/info.php
similarity index 81%
rename from htdocs/comm/askpricesupplier/info.php
rename to htdocs/supplier_proposal/info.php
index 3b8f95d45fa..9c3f8967bd5 100644
--- a/htdocs/comm/askpricesupplier/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -23,12 +23,12 @@
* \brief Page d'affichage des infos d'une proposition commerciale
*/
-require '../../main.inc.php';
+require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
-$langs->load('askpricesupplier');
+$langs->load('supplier_proposal');
$langs->load('compta');
$id=GETPOST('id','int');
@@ -36,7 +36,7 @@ $socid=GETPOST('socid','int');
// Security check
if (! empty($user->societe_id)) $socid=$user->societe_id;
-$result = restrictedArea($user, 'askpricesupplier', $id);
+$result = restrictedArea($user, 'supplier_proposal', $id);
/*
@@ -45,12 +45,12 @@ $result = restrictedArea($user, 'askpricesupplier', $id);
llxHeader('',$langs->trans('CommRequest'),'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');
-$object = new AskPriceSupplier($db);
+$object = new SupplierProposal($db);
$object->fetch($id);
$object->fetch_thirdparty();
-$head = askpricesupplier_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans('CommRequest'), 0, 'askpricesupplier');
+$head = supplier_proposal_prepare_head($object);
+dol_fiche_head($head, 'info', $langs->trans('CommRequest'), 0, 'supplier_proposal');
$object->info($object->id);
diff --git a/htdocs/comm/askpricesupplier/list.php b/htdocs/supplier_proposal/list.php
similarity index 90%
rename from htdocs/comm/askpricesupplier/list.php
rename to htdocs/supplier_proposal/list.php
index ae7ed58b29c..cfea07b1e48 100644
--- a/htdocs/comm/askpricesupplier/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -30,17 +30,17 @@
* \brief Page of commercial proposals card and list
*/
-require '../../main.inc.php';
+require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaskpricesupplier.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsupplier_proposal.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php';
+require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
if (! empty($conf->projet->enabled))
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
$langs->load('companies');
-$langs->load('askpricesupplier');
+$langs->load('supplier_proposal');
$langs->load('compta');
$langs->load('bills');
$langs->load('orders');
@@ -55,7 +55,7 @@ $search_societe=GETPOST('search_societe','alpha');
$search_montant_ht=GETPOST('search_montant_ht','alpha');
$search_author=GETPOST('search_author','alpha');
$viewstatut=$db->escape(GETPOST('viewstatut'));
-$object_statut=$db->escape(GETPOST('askpricesupplier_statut'));
+$object_statut=$db->escape(GETPOST('supplier_proposal_statut'));
$sall=GETPOST("sall");
$mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
@@ -66,7 +66,7 @@ $month=GETPOST("month");
$NBLINES=4;
// Security check
-$module='askpricesupplier';
+$module='supplier_proposal';
$dbtable='';
$objectid='';
if (! empty($user->societe_id)) $socid=$user->societe_id;
@@ -98,7 +98,7 @@ $viewstatut=$object_statut;
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('askpricesupplierlist'));
+$hookmanager->initHooks(array('supplier_proposallist'));
@@ -122,7 +122,7 @@ llxHeader('',$langs->trans('CommRequest'),'EN:Ask_Price_Supplier|FR:Demande_de_p
$form = new Form($db);
$formother = new FormOther($db);
$formfile = new FormFile($db);
-$formaskpricesupplier = new FormAskPriceSupplier($db);
+$formsupplier_proposal = new FormSupplierProposal($db);
$companystatic=new Societe($db);
$now=dol_now();
@@ -141,11 +141,11 @@ $limit = $conf->liste_limit;
$sql = 'SELECT s.rowid, s.nom as name, s.town, s.client, s.code_client,';
-$sql.= ' p.rowid as askpricesupplierid, p.note_private, p.total_ht, p.ref, p.fk_statut, p.fk_user_author, p.date_livraison as dp,';
+$sql.= ' p.rowid as supplier_proposalid, p.note_private, p.total_ht, p.ref, p.fk_statut, p.fk_user_author, p.date_livraison as dp,';
if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
$sql.= ' u.login';
-$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'askpricesupplier as p';
-if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'askpricesupplierdet as pd ON p.rowid=pd.fk_askpricesupplier';
+$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'supplier_proposal as p';
+if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'supplier_proposaldet as pd ON p.rowid=pd.fk_supplier_proposal';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid';
// We'll need this table joined to the select in order to filter by sale
if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -198,7 +198,7 @@ else if ($year > 0)
if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
if ($search_user > 0)
{
- $sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='askpricesupplier' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$search_user;
+ $sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='supplier_proposal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$search_user;
}
@@ -217,7 +217,7 @@ $result=$db->query($sql);
if ($result)
{
- $objectstatic=new AskPriceSupplier($db);
+ $objectstatic=new SupplierProposal($db);
$userstatic=new User($db);
$num = $db->num_rows($result);
@@ -236,7 +236,7 @@ if ($result)
if ($search_sale > 0) $param.='&search_sale='.$search_sale;
if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht;
if ($search_author) $param.='&search_author='.$search_author;
- print_barre_liste($langs->trans('ListOfAskPriceSupplier').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+ print_barre_liste($langs->trans('ListOfSupplierProposal').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
// Lignes des champs de filtre
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
@@ -277,7 +277,7 @@ if ($result)
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('Company'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans('AskPriceSupplierDate'),$_SERVER["PHP_SELF"],'p.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('SupplierProposalDate'),$_SERVER["PHP_SELF"],'p.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'p.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
@@ -310,7 +310,7 @@ if ($result)
print '<input class="flat" size="10" type="text" name="search_author" value="'.$search_author.'">';
print '</td>';
print '<td class="liste_titre" align="right">';
- $formaskpricesupplier->selectAskPriceSupplierStatus($viewstatut,1);
+ $formsupplier_proposal->selectSupplierProposalStatus($viewstatut,1);
print '</td>';
print '<td class="liste_titre" align="right">';
@@ -332,7 +332,7 @@ if ($result)
print '<tr '.$bc[$var].'>';
print '<td class="nowrap">';
- $objectstatic->id=$objp->askpricesupplierid;
+ $objectstatic->id=$objp->supplier_proposalid;
$objectstatic->ref=$objp->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
@@ -341,11 +341,11 @@ if ($result)
print '</td>';
print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
- if ($objp->fk_statut == 1 && $db->jdate($objp->dfv) < ($now - $conf->askpricesupplier->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+ if ($objp->fk_statut == 1 && $db->jdate($objp->dfv) < ($now - $conf->supplier_proposal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
if (! empty($objp->note_private))
{
print ' <span class="note">';
- print '<a href="'.DOL_URL_ROOT.'/comm/askpricesupplier/note.php?id='.$objp->askpricesupplierid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
+ print '<a href="'.DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$objp->supplier_proposalid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
print '</span>';
}
print '</td>';
@@ -353,8 +353,8 @@ if ($result)
// Ref
print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
$filename=dol_sanitizeFileName($objp->ref);
- $filedir=$conf->askpricesupplier->dir_output . '/' . dol_sanitizeFileName($objp->ref);
- $urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->askpricesupplierid;
+ $filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($objp->ref);
+ $urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->supplier_proposalid;
print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
print '</td></tr></table>';
diff --git a/htdocs/comm/askpricesupplier/note.php b/htdocs/supplier_proposal/note.php
similarity index 80%
rename from htdocs/comm/askpricesupplier/note.php
rename to htdocs/supplier_proposal/note.php
index 0ce89fe5e8b..4e9f3affa50 100644
--- a/htdocs/comm/askpricesupplier/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -25,11 +25,11 @@
* \brief Fiche d'information sur une proposition commerciale
*/
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php';
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
-$langs->load('askpricesupplier');
+$langs->load('supplier_proposal');
$langs->load('compta');
$langs->load('bills');
@@ -39,9 +39,9 @@ $action=GETPOST('action','alpha');
// Security check
if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'askpricesupplier', $id, 'askpricesupplier');
+$result = restrictedArea($user, 'supplier_proposal', $id, 'supplier_proposal');
-$object = new AskPriceSupplier($db);
+$object = new SupplierProposal($db);
@@ -49,7 +49,7 @@ $object = new AskPriceSupplier($db);
/* Actions */
/******************************************************************************/
-$permissionnote=$user->rights->askpricesupplier->creer; // Used by the include of actions_setnotes.inc.php
+$permissionnote=$user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php
include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
@@ -74,12 +74,12 @@ if ($id > 0 || ! empty($ref))
$societe = new Societe($db);
if ( $societe->fetch($object->socid) )
{
- $head = askpricesupplier_prepare_head($object);
- dol_fiche_head($head, 'note', $langs->trans('CommRequest'), 0, 'askpricesupplier');
+ $head = supplier_proposal_prepare_head($object);
+ dol_fiche_head($head, 'note', $langs->trans('CommRequest'), 0, 'supplier_proposal');
print '<table class="border" width="100%">';
- $linkback = '<a href="'.DOL_URL_ROOT.'/comm/askpricesupplier/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans('BackToList').'</a>';
+ $linkback = '<a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans('BackToList').'</a>';
// Ref
print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">';
@@ -92,7 +92,7 @@ if ($id > 0 || ! empty($ref))
print "<tr><td>".$langs->trans("Supplier")."</td>";
print '<td colspan="3">'.$object->client->getNomUrl(1).'</td></tr>';
- print '<tr><td>'.$langs->trans('AskPriceSupplierDate').'</td><td colspan="3">';
+ print '<tr><td>'.$langs->trans('SupplierProposalDate').'</td><td colspan="3">';
print dol_print_date($object->date_livraison,'daytext');
print '</td>';
print '</tr>';
diff --git a/htdocs/install/doctemplates/askpricesupplier/index.html b/htdocs/supplier_proposal/tpl/index.html
similarity index 100%
rename from htdocs/install/doctemplates/askpricesupplier/index.html
rename to htdocs/supplier_proposal/tpl/index.html
diff --git a/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
similarity index 85%
rename from htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php
rename to htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
index bf16d01fa1e..76cf756128a 100644
--- a/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
@@ -29,7 +29,7 @@ $langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
echo '<br>';
-print load_fiche_titre($langs->trans('RelatedAskPriceSupplier'));
+print load_fiche_titre($langs->trans('RelatedSupplierProposal'));
?>
<table class="noborder allwidth">
<tr class="liste_titre">
@@ -48,11 +48,11 @@ foreach($linkedObjectBlock as $key => $objectlink)
$var=!$var;
?>
<tr <?php echo $bc[$var]; ?> ><td>
- <a href="<?php echo DOL_URL_ROOT.'/comm/askpricesupplier/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowAskPriceSupplier"),"askpricesupplier").' '.$objectlink->ref; ?></a></td>
+ <a href="<?php echo DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowSupplierProposal"),"supplier_proposal").' '.$objectlink->ref; ?></a></td>
<td></td>
<td align="center"><?php echo dol_print_date($objectlink->datec,'day'); ?></td>
<td align="right"><?php
- if ($user->rights->askpricesupplier->lire) {
+ if ($user->rights->supplier_proposal->lire) {
$total = $total + $objectlink->total_ht;
echo price($objectlink->total_ht);
} ?></td>
@@ -66,7 +66,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
<tr class="liste_total">
<td align="left" colspan="3"><?php echo $langs->trans('TotalHT'); ?></td>
<td align="right"><?php
- if ($user->rights->askpricesupplier->lire) {
+ if ($user->rights->supplier_proposal->lire) {
echo price($total);
} ?></td>
<td></td>
diff --git a/htdocs/theme/eldy/img/object_askpricesupplier.png b/htdocs/theme/eldy/img/object_supplier_proposal.png
similarity index 100%
rename from htdocs/theme/eldy/img/object_askpricesupplier.png
rename to htdocs/theme/eldy/img/object_supplier_proposal.png
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 2a78039ed55..c744a71c189 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -86,43 +86,38 @@ $colorbacktabcard1='255,255,255'; // card
$colorbacktabactive='234,234,234';
$colorbacklineimpair1='255,255,255'; // line impair
$colorbacklineimpair2='255,255,255'; // line impair
-$colorbacklinepair1='250,250,250'; // line pair
+$colorbacklinepair1='248,248,248'; // line pair
$colorbacklinepair2='248,248,248'; // line pair
$colorbacklinepairhover='238,246,252'; // line pair
$colorbackbody='255,255,255';
$colortexttitlenotab='80,80,0';
-$colortexttitle='';
-$colortext='';
-$colortextlink='0,0,70';
+$colortexttitle='0,0,0';
+$colortext='0,0,0';
+$colortextlink='0,0,120';
$fontsize='12';
$fontsizesmaller='11';
$usegradient=1;
$useboldtitle=1;
// Case of option always editable
-if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180'; // topmenu (140,160,185)
-//if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185)
-if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP
-//if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=''; // color for links
+if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY='255,255,255';
+if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180';
+if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230';
+if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=='238,246,252';
+if (! isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK='0,0,120';
-// Fields not yet editable by default
+// Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
{
- // Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on
$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu
$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // card
$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
$conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
$conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
- $conf->global->THEME_ELDY_LINEPAIR1='250,250,250';
+ $conf->global->THEME_ELDY_LINEPAIR1='248,248,248';
$conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
$conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
- $conf->global->THEME_ELDY_USE_HOVER=='238,246,252';
- $conf->global->THEME_ELDY_BACKBODY='255,255,255';
- //$conf->global->THEME_ELDY_TEXTTITLE='0,0,0';
$conf->global->THEME_ELDY_TEXT='0,0,0';
- $conf->global->THEME_ELDY_TEXTLINK='0,0,70';
-
$conf->global->THEME_ELDY_FONT_SIZE1='12';
$conf->global->THEME_ELDY_FONT_SIZE2='11';
}
@@ -246,9 +241,10 @@ body {
<?php print 'direction: '.$langs->trans("DIRECTION").";\n"; ?>
}
-th a, .thumbstat, a.tab { color: rgb(<?php print $colortexttitle; ?>) !important; }
+th a, .thumbstat, a.tab { color: rgb(<?php print $colortexttitle; ?>) !important; font-weight: bold !important; }
+a.tab { font-weight: bold !important; }
-a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: rgb(<?php print $colortextlink; ?>); text-decoration: none; }
+a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: normal; color: rgb(<?php print $colortextlink; ?>); text-decoration: none; }
a:hover { text-decoration: underline; color: rgb(<?php print $colortextlink; ?>); }
<?php if (empty($dol_use_jmobile)) { ?>
@@ -652,7 +648,7 @@ div.divphotoref {
div.statusref {
float: right;
padding-right: 12px;
- margin-top: 7px;
+ margin-top: 6px;
margin-bottom: 10px;
}
img.photoref {
diff --git a/htdocs/theme/md/img/object_printer.png b/htdocs/theme/md/img/object_printer.png
new file mode 100644
index 0000000000000000000000000000000000000000..8722632547c5b7179d68c6e3e670131c72c80bd3
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0y~yU=RXf4i*LmhCj#M?l3SgFct^7J29*~C-ahlfq^N>
z+ueoXe|!I#{R|8YoCO|{#S9GG!XV7ZFl&wk0|NtliKnkC`+Zh90ZEQ~>6#!T)_A%&
zhG?8$J7FX5Ap-%|_%$Xzj#ex38J9I!WhxsoFH2ymdeUc_bg{ZgB#~RoDbY#h^hAxK
ztJnY5fB!G56MB<j$&wz6$35&n*N1NCb~(#%#lGyZnz3KqYHp*>M_xy@Ha<GqySQ5W
zfy3M>Tkfp9`P*mqObvd$1J}AYNd~&UzFBk0j{V1!U3>*qM}#`9bOJW?y_r|?P?_Q4
vrFO2DuIg`>c*ZYi`hSZvS>28MD!bV{h5H3l7Vl(WU|{fc^>bP0l+XkKcPnnn
literal 0
HcmV?d00001
diff --git a/htdocs/theme/md/img/object_askpricesupplier.png b/htdocs/theme/md/img/object_supplier_proposal.png
similarity index 100%
rename from htdocs/theme/md/img/object_askpricesupplier.png
rename to htdocs/theme/md/img/object_supplier_proposal.png
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 14f3036732b..478d70c5f66 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -87,43 +87,40 @@ $colorbacktabcard1='255,255,255'; // card
$colorbacktabactive='234,234,234';
$colorbacklineimpair1='255,255,255'; // line impair
$colorbacklineimpair2='255,255,255'; // line impair
-$colorbacklinepair1='242,242,242'; // line pair
+$colorbacklinepair1='250,250,250'; // line pair
$colorbacklinepair2='248,248,248'; // line pair
-$colorbacklinepairhover='238,246,252'; // line pair
+$colorbacklinepairhover='244,244,244'; // line pair
$colorbackbody='255,255,255';
-//$colortexttitlenotab='40,0,70';
$colortexttitlenotab='80,80,0';
-$colortexttitle='';
-$colortext='';
+$colortexttitle='0,0,0';
+$colortext='0,0,0';
+$colortextlink='0,0,120';
$fontsize='13';
$fontsizesmaller='11';
$usegradient=1;
$useboldtitle=1;
// Case of option always editable
+if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY='255,255,255';
if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F')); // topmenu (140,160,185)
if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185)
-//if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP
-//if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=''; // color for links
-
-// Fields not yet editable by default
+if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=='238,246,252';
+if (! isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK='0,0,120';
+
+// Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
{
- // Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on
// 90A4AE, 607D8B, 455A64, 37474F
$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu
$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // card
$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
$conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
$conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
- $conf->global->THEME_ELDY_LINEPAIR1='242,242,242';
+ $conf->global->THEME_ELDY_LINEPAIR1='250,250,250';
$conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
$conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
$conf->global->THEME_ELDY_USE_HOVER=='238,246,252';
- $conf->global->THEME_ELDY_BACKBODY='255,255,255';
- //$conf->global->THEME_ELDY_TEXTTITLE='0,0,0';
- $conf->global->THEME_ELDY_TEXT='50,50,130';
-
+ $conf->global->THEME_ELDY_TEXT='0,0,0';
$conf->global->THEME_ELDY_FONT_SIZE1='13';
$conf->global->THEME_ELDY_FONT_SIZE2='11';
}
@@ -144,6 +141,7 @@ $colorbacklinepairhover =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(em
$colorbackbody =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY) ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY) :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
$colortexttitle =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLE) ?$colortext:$conf->global->THEME_ELDY_TEXTTITLE) :(empty($user->conf->THEME_ELDY_TEXTTITLE)?$colortexttitle:$user->conf->THEME_ELDY_TEXTTITLE);
$colortext =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT) ?$colortext:$conf->global->THEME_ELDY_TEXT) :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT);
+$colortextlink =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTLINK) ?$colortext:$conf->global->THEME_ELDY_TEXTLINK) :(empty($user->conf->THEME_ELDY_TEXTLINK)?$colortextlink:$user->conf->THEME_ELDY_TEXTLINK);
$fontsize =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1) :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
$fontsizesmaller =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2) :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
@@ -158,15 +156,15 @@ if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
$tmppart=explode(',',$colorbackhmenu1);
$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
if ($tmpval <= 360) $colortextbackhmenu='FFFFFF';
-else $colortextbackhmenu='111111';
+else $colortextbackhmenu='000000';
$tmppart=explode(',',$colorbackvmenu1);
$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
if ($tmpval <= 360) { $colortextbackvmenu='FFFFFF'; }
-else { $colortextbackvmenu='111111'; }
+else { $colortextbackvmenu='000000'; }
$tmppart=explode(',',$colorbacktitle1);
$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
if ($tmpval <= 260) { $colortexttitle='FFFFFF'; $colorshadowtitle='888888'; }
-else { $colortexttitle='111111'; $colorshadowtitle='FFFFFF'; }
+else { $colortexttitle='000000'; $colorshadowtitle='FFFFFF'; }
$tmppart=explode(',',$colorbacktabcard1);
$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
if ($tmpval <= 340) { $colortextbacktab='FFFFFF'; }
@@ -185,7 +183,8 @@ $colorbacklinepair2=join(',',colorStringToArray($colorbacklinepair2));
if ($colorbacklinepairhover != '') $colorbacklinepairhover=join(',',colorStringToArray($colorbacklinepairhover));
$colorbackbody=join(',',colorStringToArray($colorbackbody));
$colortexttitle=join(',',colorStringToArray($colortexttitle));
-$colortext=join(',',colorStringToArray($colorbackvmenu1));
+$colortext=join(',',colorStringToArray($colortext));
+$colortextlink=join(',',colorStringToArray($colortextlink));
print '/*'."\n";
print 'colorbackbody='.$colorbackbody."\n";
@@ -197,6 +196,9 @@ print 'colorbacklineimpair2='.$colorbacklineimpair2."\n";
print 'colorbacklinepair1='.$colorbacklinepair1."\n";
print 'colorbacklinepair2='.$colorbacklinepair2."\n";
print 'colorbacklinepairhover='.$colorbacklinepairhover."\n";
+print '$colortexttitle='.$colortexttitle."\n";
+print '$colortext='.$colortext."\n";
+print '$colortextlink='.$colortextlink."\n";
print 'dol_hide_topmenu='.$dol_hide_topmenu."\n";
print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
@@ -220,7 +222,7 @@ body {
<?php } else { ?>
background: rgb(<?php print $colorbackbody; ?>);
<?php } ?>
- color: #101010;
+ color: rgb(<?php echo $colortext; ?>);
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
margin-top: 0;
@@ -230,9 +232,11 @@ body {
<?php print 'direction: '.$langs->trans("DIRECTION").";\n"; ?>
}
-a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: #000; text-decoration: none; }
+th a, .thumbstat, a.tab { color: rgb(<?php print $colortexttitle; ?>) !important; font-weight: bold !important; }
+a.tab { font-weight: bold !important; }
-a:hover { text-decoration: underline; color: #000000;}
+a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: normal; color: rgb(<?php print $colortextlink; ?>); text-decoration: none; }
+a:hover { text-decoration: underline; color: rgb(<?php print $colortextlink; ?>); }
<?php if (empty($dol_use_jmobile)) { ?>
@@ -244,7 +248,7 @@ textarea.cke_source:focus
box-shadow: none;
}
-input, input.flat, textarea, textarea.flat, form.flat select select, select.flat, .dataTables_length label select {
+input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
background: #FDFDFD;
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index aeb3f194daf..2301f109282 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -71,7 +71,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
$head = user_admin_prepare_head();
-dol_fiche_head($head, 'attributes_group', $langs->trans("Group"), 0, 'user');
+dol_fiche_head($head, 'attributes_group', $langs->trans("MenuUsersAndGroups"), 0, 'user');
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index 8ebdcca9056..bb035d9f95f 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
$head = user_admin_prepare_head();
-dol_fiche_head($head, 'attributes', $langs->trans("User"), 0, 'user');
+dol_fiche_head($head, 'attributes', $langs->trans("MenuUsersAndGroups"), 0, 'user');
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
--
GitLab