Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git in…
…to dev_scrunit
- Loading branch information
Showing
54 changed files
with
1,103 additions
and
415 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,248 @@ | ||
| <?php | ||
| /* Copyright (C) 2018 Alexandre Spangaro <aspangaro@zendsi.com> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| /** | ||
| * \file htdocs/admin/accountant.php | ||
| * \ingroup accountant | ||
| * \brief Setup page to configure accountant / auditor | ||
| */ | ||
|
|
||
| require '../main.inc.php'; | ||
| require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; | ||
| require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; | ||
| require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; | ||
| require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; | ||
| require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; | ||
|
|
||
| $action=GETPOST('action','aZ09'); | ||
|
|
||
| $langs->load("admin"); | ||
| $langs->load("companies"); | ||
|
|
||
| if (! $user->admin) accessforbidden(); | ||
|
|
||
| $error=0; | ||
|
|
||
| // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context | ||
| $contextpage=array('adminaccoutant','globaladmin'); | ||
| $hookmanager->initHooks($contextpage); | ||
|
|
||
| /* | ||
| * Actions | ||
| */ | ||
|
|
||
| $parameters=array(); | ||
| $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks | ||
| if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); | ||
|
|
||
| if ( ($action == 'update' && ! GETPOST("cancel",'alpha')) | ||
| || ($action == 'updateedit') ) | ||
| { | ||
| dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME", GETPOST("nom",'nohtml'),'chaine',0,'',$conf->entity); | ||
| dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address",'nohtml'),'chaine',0,'',$conf->entity); | ||
| dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town",'nohtml'),'chaine',0,'',$conf->entity); | ||
| dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode",'alpha'),'chaine',0,'',$conf->entity); | ||
| dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id",'alpha'),'chaine',0,'',$conf->entity); | ||
| dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code",'alpha'),'chaine',0,'',$conf->entity); | ||
| dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id','int'), 'chaine',0,'',$conf->entity); | ||
| dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("tel",'alpha'),'chaine',0,'',$conf->entity); | ||
| dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax",'alpha'),'chaine',0,'',$conf->entity); | ||
| dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail",'alpha'),'chaine',0,'',$conf->entity); | ||
| dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web",'alpha'),'chaine',0,'',$conf->entity); | ||
| dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note",'none'),'chaine',0,'',$conf->entity); | ||
|
|
||
| if ($action != 'updateedit' && ! $error) | ||
| { | ||
| header("Location: ".$_SERVER["PHP_SELF"]); | ||
| exit; | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| * View | ||
| */ | ||
|
|
||
| $help_url=''; | ||
| llxHeader('',$langs->trans("CompanyFoundation"),$help_url); | ||
|
|
||
| print load_fiche_titre($langs->trans("CompanyFoundation"),'','title_setup'); | ||
|
|
||
| $head = company_admin_prepare_head(); | ||
|
|
||
| dol_fiche_head($head, 'accountant', $langs->trans("Company"), -1, 'company'); | ||
|
|
||
| $form=new Form($db); | ||
| $formother=new FormOther($db); | ||
| $formcompany=new FormCompany($db); | ||
|
|
||
| $countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>'; | ||
|
|
||
| print $langs->trans("AccountantDesc")."<br>\n"; | ||
| print "<br>\n"; | ||
|
|
||
| if ($action == 'edit' || $action == 'updateedit') | ||
| { | ||
| /** | ||
| * Edit parameters | ||
| */ | ||
| print "\n".'<script type="text/javascript" language="javascript">'; | ||
| print '$(document).ready(function () { | ||
| $("#selectcountry_id").change(function() { | ||
| document.form_index.action.value="updateedit"; | ||
| document.form_index.submit(); | ||
| }); | ||
| });'; | ||
| print '</script>'."\n"; | ||
|
|
||
| print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="form_index">'; | ||
| print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; | ||
| print '<input type="hidden" name="action" value="update">'; | ||
|
|
||
| print '<table class="noborder" width="100%">'; | ||
| print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n"; | ||
|
|
||
| // Name | ||
| print '<tr class="oddeven"><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>'; | ||
| print '<input name="nom" id="name" class="minwidth200" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_NAME?$conf->global->MAIN_INFO_ACCOUNTANT_NAME: GETPOST("nom",'nohtml')) . '" autofocus="autofocus"></td></tr>'."\n"; | ||
|
|
||
| // Address | ||
| print '<tr class="oddeven"><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>'; | ||
| print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS?$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS: GETPOST("address",'nohtml')) . '</textarea></td></tr>'."\n"; | ||
|
|
||
| print '<tr class="oddeven"><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>'; | ||
| print '<input class="minwidth100" name="zipcode" id="zipcode" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_ZIP?$conf->global->MAIN_INFO_ACCOUNTANT_ZIP: GETPOST("zipcode",'alpha')) . '"></td></tr>'."\n"; | ||
|
|
||
| print '<tr class="oddeven"><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>'; | ||
| print '<input name="town" class="minwidth100" id="town" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_TOWN?$conf->global->MAIN_INFO_ACCOUNTANT_TOWN: GETPOST("town",'nohtml')) . '"></td></tr>'."\n"; | ||
|
|
||
| // Country | ||
| print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">'; | ||
| //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2); // By default, country of localization | ||
| print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id'); | ||
| if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); | ||
| print '</td></tr>'."\n"; | ||
|
|
||
| print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">'; | ||
| $formcompany->select_departement($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'state_id'); | ||
| print '</td></tr>'."\n"; | ||
|
|
||
| print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>'; | ||
| print '<input name="tel" id="phone" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_PHONE . '"></td></tr>'; | ||
| print '</td></tr>'."\n"; | ||
|
|
||
| print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>'; | ||
| print '<input name="fax" id="fax" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_FAX . '"></td></tr>'; | ||
| print '</td></tr>'."\n"; | ||
|
|
||
| print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>'; | ||
| print '<input name="mail" id="email" class="minwidth200" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_MAIL . '"></td></tr>'; | ||
| print '</td></tr>'."\n"; | ||
|
|
||
| // Web | ||
| print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>'; | ||
| print '<input name="web" id="web" class="minwidth300" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_WEB . '"></td></tr>'; | ||
| print '</td></tr>'."\n"; | ||
|
|
||
| // Note | ||
| print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>'; | ||
| print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note','none') ? GETPOST('note','none') : $conf->global->MAIN_INFO_ACCOUNTANT_NOTE).'</textarea></td></tr>'; | ||
| print '</td></tr>'; | ||
|
|
||
| print '</table>'; | ||
|
|
||
| print '<br><div class="center">'; | ||
| print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">'; | ||
| print ' '; | ||
| print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">'; | ||
| print '</div>'; | ||
| print '<br>'; | ||
|
|
||
| print '</form>'; | ||
| } | ||
| else | ||
| { | ||
| /* | ||
| * Show parameters | ||
| */ | ||
|
|
||
| // Actions buttons | ||
| //print '<div class="tabsAction">'; | ||
| //print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>'; | ||
| //print '</div><br>'; | ||
|
|
||
| print '<div class="div-table-responsive-no-min">'; | ||
| print '<table class="noborder" width="100%">'; | ||
| print '<tr class="liste_titre"><td>'.$langs->trans("CompanyInfo").'</td><td>'.$langs->trans("Value").'</td></tr>'; | ||
|
|
||
|
|
||
| print '<tr class="oddeven"><td class="titlefield wordbreak">'.$langs->trans("CompanyName").'</td><td>'; | ||
| print $conf->global->MAIN_INFO_ACCOUNTANT_NAME; | ||
| print '</td></tr>'; | ||
|
|
||
|
|
||
| print '<tr class="oddeven"><td>'.$langs->trans("CompanyAddress").'</td><td>' . nl2br(empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) . '</td></tr>'; | ||
|
|
||
|
|
||
| print '<tr class="oddeven"><td>'.$langs->trans("CompanyZip").'</td><td>' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ZIP) . '</td></tr>'; | ||
|
|
||
|
|
||
| print '<tr class="oddeven"><td>'.$langs->trans("CompanyTown").'</td><td>' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN)?'':$conf->global->MAIN_INFO_ACCOUNTANT_TOWN) . '</td></tr>'; | ||
|
|
||
|
|
||
| print '<tr class="oddeven"><td>'.$langs->trans("CompanyCountry").'</td><td>'; | ||
| if (! empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY)) | ||
| { | ||
| $code = getCountry($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 2); | ||
| $img=picto_from_langcode($code); | ||
| print $img?$img.' ':''; | ||
| print getCountry($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY,1); | ||
| } | ||
| print '</td></tr>'; | ||
|
|
||
|
|
||
| if (! empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT)) print '<tr class="oddeven"><td>'.$langs->trans("Region-State").'</td><td>'; | ||
| else print '<tr class="oddeven"><td>'.$langs->trans("State").'</td><td>'; | ||
| if (! empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE)) print getState($conf->global->MAIN_INFO_ACCOUNTANT_STATE,$conf->global->MAIN_SHOW_STATE_CODE,0,$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT); | ||
| else print ' '; | ||
| print '</td></tr>'; | ||
|
|
||
| print '<tr class="oddeven"><td>'.$langs->trans("Phone").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_PHONE,$mysoc->country_code) . '</td></tr>'; | ||
|
|
||
| print '<tr class="oddeven"><td>'.$langs->trans("Fax").'</td><td>' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_FAX,$mysoc->country_code) . '</td></tr>'; | ||
|
|
||
| print '<tr class="oddeven"><td>'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_ACCOUNTANT_MAIL,0,0,0,80) . '</td></tr>'; | ||
|
|
||
| // Web | ||
|
|
||
| print '<tr class="oddeven"><td>'.$langs->trans("Web").'</td><td>' . dol_print_url($conf->global->MAIN_INFO_ACCOUNTANT_WEB,'_blank',80) . '</td></tr>'; | ||
|
|
||
| print '<tr class="oddeven"><td class="tdtop">'.$langs->trans("Note").'</td><td>' . (! empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? nl2br($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) : '') . '</td></tr>'; | ||
|
|
||
| print '</table>'; | ||
| print "</div>"; | ||
|
|
||
| print '</form>'; | ||
|
|
||
| // Actions buttons | ||
| print '<div class="tabsAction">'; | ||
| print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a></div>'; | ||
| print '</div>'; | ||
| } | ||
|
|
||
| llxFooter(); | ||
|
|
||
| $db->close(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -69,6 +69,7 @@ | |
| /* | ||
| * Actions | ||
| */ | ||
|
|
||
| if ($object->fetch($id)) | ||
| { | ||
| $object->fetch_thirdparty(); | ||
|
|
||
Oops, something went wrong.