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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-12-12 00:51:15 +01:00
commit a972199296
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/contact/fiche.php
View File

@ -385,12 +385,13 @@ else
}); });
$("#copyaddressfromsoc").click(function() { $("#copyaddressfromsoc").click(function() {
$(\'textarea[name="address"]\').text("'.addslashes($objsoc->address).'"); $(\'textarea[name="address"]\').text("'.dol_escape_js($objsoc->address).'");
$(\'input[name="zipcode"]\').val("'.addslashes($objsoc->zip).'"); $(\'input[name="zipcode"]\').val("'.dol_escape_js($objsoc->zip).'");
$(\'input[name="town"]\').val("'.addslashes($objsoc->town).'"); $(\'input[name="town"]\').val("'.dol_escape_js($objsoc->town).'");
$(\'select[name="country_id"]\').val("'.addslashes($objsoc->country_id).'"); $(\'select[name="country_id"]\').val("'.dol_escape_js($objsoc->country_id).'");
$(\'select[name="state_id"]\').val("'.addslashes($objsoc->state_id).'"); $(\'select[name="state_id"]\').val("'.dol_escape_js($objsoc->state_id).'");
}); $(\'input[name="email"]\').val("'.dol_escape_js($objsoc->email).'");
});
})'."\n"; })'."\n";
print '</script>'."\n"; print '</script>'."\n";
} }
@ -482,16 +483,16 @@ else
// Phone / Fax // Phone / Fax
if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->phone_pro)) == 0) $object->phone_pro = $objsoc->tel; // Predefined with third party if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->phone_pro)) == 0) $object->phone_pro = $objsoc->tel; // Predefined with third party
print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input name="phone_pro" type="text" size="18" maxlength="80" value="'.(isset($_POST["phone_pro"])?$_POST["phone_pro"]:$object->phone_pro).'"></td>'; print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input name="phone_pro" id="phone_pro" type="text" size="18" maxlength="80" value="'.(isset($_POST["phone_pro"])?$_POST["phone_pro"]:$object->phone_pro).'"></td>';
print '<td>'.$langs->trans("PhonePerso").'</td><td><input name="phone_perso" type="text" size="18" maxlength="80" value="'.(isset($_POST["phone_perso"])?$_POST["phone_perso"]:$object->phone_perso).'"></td></tr>'; print '<td>'.$langs->trans("PhonePerso").'</td><td><input name="phone_perso" id="phone_perso" type="text" size="18" maxlength="80" value="'.(isset($_POST["phone_perso"])?$_POST["phone_perso"]:$object->phone_perso).'"></td></tr>';
if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->fax)) == 0) $object->fax = $objsoc->fax; // Predefined with third party if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->fax)) == 0) $object->fax = $objsoc->fax; // Predefined with third party
print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input name="phone_mobile" type="text" size="18" maxlength="80" value="'.(isset($_POST["phone_mobile"])?$_POST["phone_mobile"]:$object->phone_mobile).'"></td>'; print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input name="phone_mobile" id="phone_mobile" type="text" size="18" maxlength="80" value="'.(isset($_POST["phone_mobile"])?$_POST["phone_mobile"]:$object->phone_mobile).'"></td>';
print '<td>'.$langs->trans("Fax").'</td><td><input name="fax" type="text" size="18" maxlength="80" value="'.(isset($_POST["fax"])?$_POST["fax"]:$object->fax).'"></td></tr>'; print '<td>'.$langs->trans("Fax").'</td><td><input name="fax" id="fax" type="text" size="18" maxlength="80" value="'.(isset($_POST["fax"])?$_POST["fax"]:$object->fax).'"></td></tr>';
// EMail // EMail
if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) $object->email = $objsoc->email; // Predefined with third party if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) $object->email = $objsoc->email; // Predefined with third party
print '<tr><td>'.$langs->trans("Email").'</td><td><input name="email" type="text" size="50" maxlength="80" value="'.(isset($_POST["email"])?$_POST["email"]:$object->email).'"></td>'; print '<tr><td>'.$langs->trans("Email").'</td><td><input name="email" id="email" type="text" size="50" maxlength="80" value="'.(isset($_POST["email"])?$_POST["email"]:$object->email).'"></td>';
if (! empty($conf->mailing->enabled)) if (! empty($conf->mailing->enabled))
{ {
print '<td>'.$langs->trans("No_Email").'</td><td>'.$form->selectyesno('no_email',(isset($_POST["no_email"])?$_POST["no_email"]:$object->no_email), 1).'</td>'; print '<td>'.$langs->trans("No_Email").'</td><td>'.$form->selectyesno('no_email',(isset($_POST["no_email"])?$_POST["no_email"]:$object->no_email), 1).'</td>';

3
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
View File

@ -172,6 +172,7 @@ date_create datetime NOT NULL ,
description varchar(255) NOT NULL , description varchar(255) NOT NULL ,
date_debut date NOT NULL , date_debut date NOT NULL ,
date_fin date NOT NULL , date_fin date NOT NULL ,
halfday integer DEFAULT 0,
statut integer NOT NULL DEFAULT '1', statut integer NOT NULL DEFAULT '1',
fk_validator integer NOT NULL , fk_validator integer NOT NULL ,
date_valid datetime DEFAULT NULL , date_valid datetime DEFAULT NULL ,
@ -183,6 +184,8 @@ fk_user_cancel integer DEFAULT NULL,
detail_refuse varchar(250) DEFAULT NULL detail_refuse varchar(250) DEFAULT NULL
) )
ENGINE=innodb; ENGINE=innodb;
ALTER TABLE llx_holiday ADD COLUMN halfday integer DEFAULT 0 after date_fin;
ALTER TABLE llx_holiday ADD INDEX idx_holiday_fk_user (fk_user); ALTER TABLE llx_holiday ADD INDEX idx_holiday_fk_user (fk_user);
ALTER TABLE llx_holiday ADD INDEX idx_holiday_date_debut (date_debut); ALTER TABLE llx_holiday ADD INDEX idx_holiday_date_debut (date_debut);

1
htdocs/install/mysql/tables/llx_holiday.sql
View File

@ -24,6 +24,7 @@ date_create DATETIME NOT NULL,
description VARCHAR( 255 ) NOT NULL, description VARCHAR( 255 ) NOT NULL,
date_debut DATE NOT NULL, date_debut DATE NOT NULL,
date_fin DATE NOT NULL, date_fin DATE NOT NULL,
halfday integer DEFAULT 0,
statut integer NOT NULL DEFAULT '1', statut integer NOT NULL DEFAULT '1',
fk_validator integer NOT NULL, fk_validator integer NOT NULL,
date_valid DATETIME DEFAULT NULL, date_valid DATETIME DEFAULT NULL,

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

@ -70,7 +70,7 @@ Phone=Téléphone
PhonePro=Tél pro. PhonePro=Tél pro.
PhonePerso=Tél perso. PhonePerso=Tél perso.
PhoneMobile=Tél portable PhoneMobile=Tél portable
No_Email=Ne pas envoyer d'emailing de masse No_Email=Désactiver l'envoi d'emailing de masse
Fax=Fax Fax=Fax
Zip=Code postal Zip=Code postal
Town=Ville Town=Ville

2
htdocs/main.inc.php
View File

@ -791,6 +791,8 @@ if (! function_exists("llxHeader"))
*/ */
function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='') function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
{ {
global $conf;
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
if (empty($conf->global->MAIN_HIDE_TOP_MENU)) if (empty($conf->global->MAIN_HIDE_TOP_MENU))
{ {