lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Works on possibility to change customer when cloning (enable in customer orders)

Browse Source 
New: can send extra input in ajax dialog
This commit is contained in:
Regis Houssin 2011-04-25 09:27:25 +00:00
parent 94d64bd9e8
commit f7f90b51c7
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/commande/fiche.php
View File

@ -1498,6 +1498,7 @@ else
$formquestion=array(
//'text' => $langs->trans("ConfirmClone"),
//array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
//array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $html->select_company(GETPOST('socid'),'socid','(s.client=1 OR s.client=3)'))
);
// Paiement incomplet. On demande si motif = escompte ou autre

9
htdocs/core/class/html.form.class.php
View File

@ -1992,7 +1992,7 @@ class Form
if ($formquestion)
{
$more.='<table class="nobordernopadding" width="100%">'."\n";
$more.='<table class="nobordernopadding" width="100%">'."\n";
$more.='<tr><td colspan="3" valign="top">'.$formquestion['text'].'</td></tr>'."\n";
foreach ($formquestion as $key => $input)
{
@ -2064,7 +2064,8 @@ class Form
// New code using jQuery only
$formconfirm.= '<div id="dialog-confirm" title="'.dol_escape_htmltag($title).'">';
$formconfirm.= img_help('','').' '.$more.$question;
$formconfirm.= img_help('','').' '.$question;
if (! empty($more)) $formconfirm.= '<p>'.$more.'</p>';
$formconfirm.= '</div>'."\n";
$formconfirm.= '<script type="text/javascript">
var choice=\'ko\';
@ -2235,7 +2236,7 @@ class Form
* \param htmlname Name of select html field
* \param addempty Ajoute entree vide
*/
function form_availability($page, $selected='', $htmlname='availability', $addempty=0)
function form_availability($page, $selected='', $htmlname='availability', $addempty=0)
{
global $langs;
if ($htmlname != "none")
@ -2269,7 +2270,7 @@ class Form
* \param htmlname Name of select html field
* \param addempty Ajoute entree vide
*/
function form_source($page, $selected='', $htmlname='source', $addempty=0)
function form_source($page, $selected='', $htmlname='source', $addempty=0)
{
global $langs;
if ($htmlname != "none")

1
htdocs/langs/en_US/companies.lang
View File

@ -3,6 +3,7 @@ CHARSET=UTF-8
ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one.
ErrorSetACountryFirst=Set the country first
SelectThirdParty=Select a third party
DeleteThirdParty=Delete a third party
ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ?
DeleteContact=Delete a contact

1
htdocs/langs/fr_FR/companies.lang
View File

@ -3,6 +3,7 @@ CHARSET=UTF-8
ErrorCompanyNameAlreadyExists=Le nom de société %s existe déjà. Veuillez en choisir un autre.
ErrorPrefixAlreadyExists=Le préfixe %s existe déjà. Veuillez en choisir un autre.
ErrorSetACountryFirst=Définissez d'abord le pays
SelectThirdParty=Sélectionner un tiers
DeleteThirdParty=Supprimer un tiers
ConfirmDeleteCompany=Êtes-vous sûr de vouloir supprimer cette société et toutes les informations qui en dépendent ?
DeleteContact=Supprimer un contact