From 2fb68285ba3df1aebb083a01c1efd6d8aabd14a9 Mon Sep 17 00:00:00 2001 From: Baxxx Date: Tue, 9 May 2017 12:59:26 +0200 Subject: [PATCH 1/5] Remove fakturabankemail from accountplan --- db/changes/176_remove_fakturabank_email.sql | 1 + modules/accountplan/view/employee.php | 13 +------------ modules/accountplan/view/record.inc | 17 ----------------- .../model/fakturabanksalary.class.php | 4 ++-- .../model/fakturabankvoting.class.php | 12 ------------ modules/salary/view/edit.php | 13 ++----------- 6 files changed, 6 insertions(+), 54 deletions(-) create mode 100644 db/changes/176_remove_fakturabank_email.sql diff --git a/db/changes/176_remove_fakturabank_email.sql b/db/changes/176_remove_fakturabank_email.sql new file mode 100644 index 00000000..c5a6a125 --- /dev/null +++ b/db/changes/176_remove_fakturabank_email.sql @@ -0,0 +1 @@ +DROP TABLE fakturabankemail; diff --git a/modules/accountplan/view/employee.php b/modules/accountplan/view/employee.php index a4c0be62..539f5ff2 100755 --- a/modules/accountplan/view/employee.php +++ b/modules/accountplan/view/employee.php @@ -39,9 +39,6 @@ } } -$fakturabankemail_query = "select * from fakturabankemail where AccountPlanID = " . $AccountPlanID; -$fakturabankemail = $_lib['storage']->get_row(array('query' => $fakturabankemail_query)); - $salary_conf_query = "SELECT SalaryConfID FROM salaryconf WHERE AccountPlanID = $AccountPlanID"; $salary_conf = $_lib['db']->db_query($salary_conf_query); @@ -81,7 +78,6 @@
- @@ -156,14 +152,7 @@ - - - - - - - - + diff --git a/modules/accountplan/view/record.inc b/modules/accountplan/view/record.inc index 7dde742d..63d28eb8 100755 --- a/modules/accountplan/view/record.inc +++ b/modules/accountplan/view/record.inc @@ -25,13 +25,6 @@ function validate_employee($employee) { $errors[] = "Personnr må stemme med fødselsdag."; } - $fakturabankemail_query = "select * from fakturabankemail where AccountPlanID = " . $employee->AccountPlanID; - $fakturabankemail = $_lib['storage']->get_row(array('query' => $fakturabankemail_query)); - - if(!filter_var($fakturabankemail->Email, FILTER_VALIDATE_EMAIL)) { - $errors[] = "Ugyldig fakturabank epost."; - } - if(empty($employee->SocietyNumber) && empty($employee->IDNumber)) { $errors[] = "Enten Personnr eller ID nummer på være der."; } else { @@ -149,16 +142,6 @@ if($_lib['input']->getProperty('action_accountplan_update') || $_lib['input']->g $_lib['db']->db_query($password_sql); } - if(isset($_POST['fakturabankemail_Email'])) { - $fakturabankemail_query = sprintf("DELETE FROM fakturabankemail WHERE AccountPlanID = %d", $AccountPlanID); - $_lib['db']->db_query($fakturabankemail_query); - - $fakturabankemail_query = sprintf("INSERT INTO fakturabankemail (`AccountPlanID`, `Email`) - VALUES('%d', '%s');", - $AccountPlanID, mysql_escape_string($_POST['fakturabankemail_Email'])); - $_lib['db']->db_query($fakturabankemail_query); - } - if(isset($_POST['accountplangln_GLN'])) { $gln_query = sprintf("DELETE FROM accountplangln WHERE AccountPlanID = %d", $AccountPlanID); $_lib['db']->db_query($gln_query); diff --git a/modules/fakturabank/model/fakturabanksalary.class.php b/modules/fakturabank/model/fakturabanksalary.class.php index d3c60f79..59a4d219 100644 --- a/modules/fakturabank/model/fakturabanksalary.class.php +++ b/modules/fakturabank/model/fakturabanksalary.class.php @@ -46,7 +46,7 @@ public function createSalaryXML($SalaryID, $SalaryConfID) { global $_lib; - $query_head = "select S.*, F.Email AS FakturabankEmail, A.AccountName, A.Address, A.City, A.ZipCode, A.SocietyNumber, A.IDNumber, A.TabellTrekk, A.ProsentTrekk, A.Email, A.Address, A.ZipCode, A.LastName, A.FirstName, A.City, A.CountryCode, A.Phone, A.Mobile, S.DomesticBankAccount, P.Email as SavedByInLodo from salary as S, accountplan as A, fakturabankemail as F, person P where S.SalaryID='$SalaryID' and S.AccountPlanID=A.AccountPlanID and F.AccountPlanID = S.AccountPlanID and A.AccountPlanID = F.AccountPlanID and S.UpdatedBy = P.PersonID"; + $query_head = "select S.*, A.AccountName, A.Address, A.City, A.ZipCode, A.SocietyNumber, A.IDNumber, A.TabellTrekk, A.ProsentTrekk, A.Email, A.Address, A.ZipCode, A.LastName, A.FirstName, A.City, A.CountryCode, A.Phone, A.Mobile, S.DomesticBankAccount, P.Email as SavedByInLodo from salary as S, accountplan as A, person P where S.SalaryID='$SalaryID' and S.AccountPlanID=A.AccountPlanID and S.UpdatedBy = P.PersonID"; #print "$query_head
"; $result_head = $_lib['db']->db_query($query_head); $head = $_lib['db']->db_fetch_object($result_head); @@ -218,7 +218,7 @@ public function createSalaryXML($SalaryID, $SalaryConfID) { $xml_content .= "" . $head->FirstName . "\n"; $xml_content .= "" . $head->LastName . "\n"; $xml_content .= "NO:EMAIL\n"; - $xml_content .= "" . $head->FakturabankEmail . "\n"; + $xml_content .= "" . "Change to scheme value" . "\n"; $xml_content .= "" . (empty($head->SocietyNumber) ? $head->IDNumber : $head->SocietyNumber) . "\n"; $xml_content .= "" . $head->Email . "\n"; diff --git a/modules/fakturabank/model/fakturabankvoting.class.php b/modules/fakturabank/model/fakturabankvoting.class.php index 5931c905..ac165000 100644 --- a/modules/fakturabank/model/fakturabankvoting.class.php +++ b/modules/fakturabank/model/fakturabankvoting.class.php @@ -572,12 +572,6 @@ public function find_account_plan_type($identity, $scheme_id, $type) { return $r; } else if(preg_match("/:EMAIL$/", $scheme_id)) { - $query = "SELECT a.AccountPlanID FROM fakturabankemail e, accountplan a WHERE e.Email = '$identity' AND a.AccountPlanID = e.AccountPlanID AND a.AccountPlanType = '$type'"; - $r = $_lib['storage']->get_row(array('query' => $query)); - if($r) - return $r; - - /* fall back to normal email */ $query = "SELECT AccountPlanID, OrgNumber FROM accountplan WHERE Email = '$identity' AND AccountPlanType = '$type'"; $r = $_lib['storage']->get_row(array('query' => $query)); if($r) @@ -632,12 +626,6 @@ public function find_account_plan($identity, $scheme_id) { return $_lib['storage']->get_row(array('query' => $query)); } else if(preg_match("/:EMAIL$/", $scheme_id)) { - $query = "SELECT AccountPlanID FROM fakturabankemail WHERE Email = '$identity'"; - $r = $_lib['storage']->get_row(array('query' => $query)); - if($r) - return $r; - - /* fall back to normal email */ $query = "SELECT AccountPlanID, OrgNumber FROM accountplan WHERE Email = '$identity'"; $r = $_lib['storage']->get_row(array('query' => $query)); if($r) diff --git a/modules/salary/view/edit.php b/modules/salary/view/edit.php index 5b73b774..2db9bb50 100755 --- a/modules/salary/view/edit.php +++ b/modules/salary/view/edit.php @@ -33,7 +33,6 @@ $query_head = sprintf(" select - F.Email as FEmail, S.*, E.*, A.ProsentTrekk as AP_ProsentTrekk, @@ -43,11 +42,9 @@ salary as S left join (salaryextra as E) on (S.SalaryID = E.SalaryID), - fakturabankemail F, accountplan A where S.SalaryID = '%d' - and F.AccountPlanID = S.AccountPlanID and A.AccountPlanID = S.AccountPlanID ", $SalaryID); @@ -57,7 +54,6 @@ if(!$head->isUpdated || isset($_POST['action_salary_update_extra'])) { $query_head = " select - F.Email as FEmail, S.*, A.AccountName, A.Address, @@ -69,12 +65,10 @@ A.ProsentTrekk as AP_ProsentTrekk from salary as S, - fakturabankemail F, accountplan as A where S.SalaryID='$SalaryID' and S.AccountPlanID=A.AccountPlanID - and F.AccountPlanID = A.AccountPlanID "; $head = $_lib['storage']->get_row(array('query' => $query_head)); $query_arb = "select a.Percent from kommune as k, arbeidsgiveravgift as a where a.Code=k.Sone"; @@ -631,10 +625,7 @@ - + - + @@ -91,61 +91,62 @@ - + - + - + - + - + + + - + - + - + - + @@ -158,75 +159,74 @@ - + + + + - + - + - + - - + + + - + - + - + - + - + - + @@ -242,20 +242,19 @@ print("AGA " . $res->Percent . "%"); } ?> - - + - + - + @@ -263,14 +262,14 @@ - + - @@ -284,63 +283,50 @@ ?> - + - - - + + + - - - - + + + - - - + + + - + - - + - - + - + @@ -353,38 +339,38 @@ - + - + - - get_person('AccessLevel') >= 2) { ?> + From a3b60edc7861ca0f244ca997960cb55578a87257 Mon Sep 17 00:00:00 2001 From: Baxxx Date: Tue, 9 May 2017 13:47:32 +0200 Subject: [PATCH 3/5] Disable phone and email inputs in employee --- modules/accountplan/view/employee.php | 15 ++++++--- modules/accountplan/view/record.inc | 46 +++++++++++++++----------- modules/accountplan/view/reskontro.php | 17 ---------- modules/accountplan/view/schemeid.php | 18 +++++++++- 4 files changed, 54 insertions(+), 42 deletions(-) diff --git a/modules/accountplan/view/employee.php b/modules/accountplan/view/employee.php index 643c49bc..577bf9e4 100755 --- a/modules/accountplan/view/employee.php +++ b/modules/accountplan/view/employee.php @@ -47,6 +47,11 @@ Empatix - kontoplan - ansatte + @@ -147,12 +152,12 @@ - + - + @@ -161,9 +166,9 @@ - - - + + + diff --git a/modules/accountplan/view/record.inc b/modules/accountplan/view/record.inc index 63d28eb8..53515295 100755 --- a/modules/accountplan/view/record.inc +++ b/modules/accountplan/view/record.inc @@ -52,26 +52,26 @@ function clean_org_number($orgnr) { return preg_replace('/\s/', '', $orgnr); } +function update_accountplan_field_from_scheme($field, $SchemeType) { + global $_lib; + $q = "UPDATE accountplan ap + LEFT JOIN accountplanscheme aps + ON ap.AccountPlanID = aps.AccountPlanID AND + aps.FakturabankSchemeID = (SELECT FakturabankSchemeID from fakturabankscheme WHERE SchemeType = '$SchemeType') + SET ap.$field = aps.SchemeValue + WHERE ap.AccountPlanID = '". $_POST["accountplan_AccountPlanID"] ."';"; + $_lib['db']->db_query($q); +} + // updates OrgNumber and VatNumber from firmaids function update_orgnr_vat_from_firmaid() { - global $_lib; + update_accountplan_field_from_scheme("OrgNumber", "NO:ORGNR"); + update_accountplan_field_from_scheme("VatNumber", "NO:VAT"); +} - $q_orgnr = "UPDATE accountplan ap - LEFT JOIN accountplanscheme aps - ON ap.AccountPlanID = aps.AccountPlanID AND - aps.FakturabankSchemeID = (SELECT FakturabankSchemeID from fakturabankscheme WHERE SchemeType = 'NO:ORGNR') - SET ap.OrgNumber = aps.SchemeValue - WHERE ap.AccountPlanID = '". $_POST["accountplan_AccountPlanID"] ."';"; - - $q_vat = "UPDATE accountplan ap - LEFT JOIN accountplanscheme aps - ON ap.AccountPlanID = aps.AccountPlanID AND - aps.FakturabankSchemeID = (SELECT FakturabankSchemeID from fakturabankscheme WHERE SchemeType = 'NO:VAT') - SET ap.VatNumber = aps.SchemeValue - WHERE ap.AccountPlanID = '". $_POST["accountplan_AccountPlanID"] ."';"; - - $_lib['db']->db_query($q_orgnr); - $_lib['db']->db_query($q_vat); +function update_phone_email_from_firmaid() { + update_accountplan_field_from_scheme("Phone", "NO:PHONE"); + update_accountplan_field_from_scheme("Email", "NO:EMAIL"); } // Removes all the firmaids whose accountplan is missing. This is useful in cases @@ -380,7 +380,11 @@ elseif($_lib['input']->getProperty('action_del_scheme')) { $query = sprintf("delete from accountplanscheme where AccountPlanSchemeID = %d", $id); $_lib['db']->db_query($query); } - update_orgnr_vat_from_firmaid(); + if ($AccountPlanType == "employee") { + update_phone_email_from_firmaid(); + } else { + update_orgnr_vat_from_firmaid(); + } } elseif($_lib['input']->getProperty('action_save_scheme')) { $no_sup_accnt_scheme = $_lib['db']->db_fetch_assoc($_lib['db']->db_query("SELECT FakturabankSchemeID FROM fakturabankscheme WHERE SchemeType = 'NO:SUP-ACCNT-RE';")); @@ -395,7 +399,11 @@ elseif($_lib['input']->getProperty('action_save_scheme')) { } } $_lib['storage']->db_update_multi_table($_POST, array('accountplanscheme' => 'AccountPlanSchemeID')); - update_orgnr_vat_from_firmaid(); + if ($AccountPlanType == "employee") { + update_phone_email_from_firmaid(); + } else { + update_orgnr_vat_from_firmaid(); + } if(!$accountexist) { $fb = new lodo_fakturabank_fakturabank(); if (in_array($AccountPlanType, array('supplier', 'customer'))) $fb->update_accountplan_from_fakturabank($AccountPlanID); diff --git a/modules/accountplan/view/reskontro.php b/modules/accountplan/view/reskontro.php index b6c2f679..2604fbc8 100755 --- a/modules/accountplan/view/reskontro.php +++ b/modules/accountplan/view/reskontro.php @@ -80,25 +80,10 @@ - @@ -229,9 +214,7 @@ function focusFirmaidSchemeWithSchemetype(scheme_type) { - - diff --git a/modules/accountplan/view/schemeid.php b/modules/accountplan/view/schemeid.php index 6622f9e3..885fb16a 100644 --- a/modules/accountplan/view/schemeid.php +++ b/modules/accountplan/view/schemeid.php @@ -1,3 +1,4 @@ + + @@ -92,5 +108,5 @@ function fixNoSupAccntRe(select_element) { - + From b99e07869ac9aa539dba186a68a6a1de335df0b7 Mon Sep 17 00:00:00 2001 From: Baxxx Date: Tue, 9 May 2017 15:08:41 +0200 Subject: [PATCH 4/5] Send all schemes with salary --- .../model/fakturabanksalary.class.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/fakturabank/model/fakturabanksalary.class.php b/modules/fakturabank/model/fakturabanksalary.class.php index 59a4d219..8a6cd2ef 100644 --- a/modules/fakturabank/model/fakturabanksalary.class.php +++ b/modules/fakturabank/model/fakturabanksalary.class.php @@ -51,6 +51,13 @@ public function createSalaryXML($SalaryID, $SalaryConfID) { $result_head = $_lib['db']->db_query($query_head); $head = $_lib['db']->db_fetch_object($result_head); + $query_schemes = "select fbs.SchemeType as scheme, aps.SchemeValue as value from accountplanscheme aps join fakturabankscheme fbs on fbs.FakturabankSchemeID = aps.FakturabankSchemeID where AccountPlanID = '$head->AccountPlanID'"; + $result_schemes = $_lib['db']->db_query($query_schemes); + $employee_schemes = array(); + while($row = $_lib['db']->db_fetch_object($result_schemes)) { + $employee_schemes[] = $row; + } + $accountplan_edit_url = "/lodo.php?view_mvalines=&view_linedetails=&t=accountplan.employee&accountplan_AccountPlanID=" . $head->AccountPlanID; if (empty($head)) { @@ -217,8 +224,14 @@ public function createSalaryXML($SalaryID, $SalaryConfID) { $xml_content .= "" . $head->AccountPlanID . "\n"; $xml_content .= "" . $head->FirstName . "\n"; $xml_content .= "" . $head->LastName . "\n"; - $xml_content .= "NO:EMAIL\n"; - $xml_content .= "" . "Change to scheme value" . "\n"; + + foreach ($employee_schemes as $scheme) { + $xml_content .= ""; + $xml_content .= "" . $scheme->scheme . "\n"; + $xml_content .= "" . $scheme->value . "\n"; + $xml_content .= ""; + } + $xml_content .= "" . (empty($head->SocietyNumber) ? $head->IDNumber : $head->SocietyNumber) . "\n"; $xml_content .= "" . $head->Email . "\n"; From 535b9fa9ea17ac96173331066cd3680eae9d936c Mon Sep 17 00:00:00 2001 From: Baxxx Date: Wed, 10 May 2017 10:27:25 +0200 Subject: [PATCH 5/5] Validate presence of email or phone on employee --- modules/accountplan/view/record.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/accountplan/view/record.inc b/modules/accountplan/view/record.inc index 53515295..e30d6dc4 100755 --- a/modules/accountplan/view/record.inc +++ b/modules/accountplan/view/record.inc @@ -45,6 +45,10 @@ function validate_employee($employee) { } } + if(empty($employee->Phone) && !filter_var($employee->Email, FILTER_VALIDATE_EMAIL)) { + $errors[] = "Must have email or phone."; + } + return $errors; }
E-Post privat
E-Post fakturabank
get_person('FakturabankExportPaycheckAccess')) { - if($head->FEmail) - print $_lib['form3']->Input(array('type'=>'submit', 'name'=>'action_salary_fakturabanksend', 'value'=>'Fakturabank (F)', 'accesskey'=>'F', 'disabled' => !$no_altinn_validation_errors)); - else - print "Mangler fakturabankepost"; + print $_lib['form3']->Input(array('type'=>'submit', 'name'=>'action_salary_fakturabanksend', 'value'=>'Fakturabank (F)', 'accesskey'=>'F', 'disabled' => !$no_altinn_validation_errors)); } ?> @@ -648,7 +639,7 @@ if($_lib['sess']->get_person('AccessLevel') > 1 && $head->UpdatedBy) echo $head->UpdatedAt . " lagret av " . $_lib['format']->PersonIDToName($head->UpdatedBy); ?> Fakturabankepost: FEmail; ?>
From a91654f0e8961672bf645c5a7a74a735797c0770 Mon Sep 17 00:00:00 2001 From: Baxxx Date: Tue, 9 May 2017 13:30:00 +0200 Subject: [PATCH 2/5] Display schemeid for employees --- db/changes/177_migrate_from_mail_to_phone.sql | 37 +++++ modules/accountplan/view/employee.php | 144 ++++++++---------- 2 files changed, 102 insertions(+), 79 deletions(-) create mode 100644 db/changes/177_migrate_from_mail_to_phone.sql diff --git a/db/changes/177_migrate_from_mail_to_phone.sql b/db/changes/177_migrate_from_mail_to_phone.sql new file mode 100644 index 00000000..a281a3e2 --- /dev/null +++ b/db/changes/177_migrate_from_mail_to_phone.sql @@ -0,0 +1,37 @@ +-- Find NO:EMAIL FakturabankSchemeID; +SET @emailid = (SELECT FakturabankSchemeID FROM fakturabankscheme WHERE SchemeType = 'NO:EMAIL'); + +-- Create FirmaIDs for Employee Accountplans which have OrgNumber, but no appropriate FirmaID +-- In case we have a NO:EMAIL FirmaID with different value from ap.Email, this will create a new additional one; +INSERT INTO accountplanscheme (AccountPlanID, FakturabankSchemeID, SchemeValue, CountryCode) +SELECT ap.AccountPlanID, @emailid, ap.Email, 'NO' +FROM accountplan ap +LEFT JOIN accountplanscheme aps ON + ap.AccountPlanID = aps.AccountPlanID AND + ap.Email = aps.SchemeValue AND + aps.FakturabankSchemeID = @emailid +WHERE + ap.Email != '' AND ap.Email is not null AND + aps.AccountPlanSchemeID is null AND + ap.AccountPlanType = 'employee'; + + +UPDATE fakturabankscheme SET SchemeType = REPLACE(SchemeType, ':TELEPHONE', ':PHONE'); + +-- Find NO:PHONE FakturabankSchemeID; +SET @phoneid = (SELECT FakturabankSchemeID FROM fakturabankscheme WHERE SchemeType = 'NO:PHONE'); + +-- Create FirmaIDs for Employee Accountplans which have OrgNumber, but no appropriate FirmaID +-- In case we have a NO:PHONE FirmaID with different value from ap.Phone, this will create a new additional one; +INSERT INTO accountplanscheme (AccountPlanID, FakturabankSchemeID, SchemeValue, CountryCode) +SELECT ap.AccountPlanID, @phoneid, ap.Phone, 'NO' +FROM accountplan ap +LEFT JOIN accountplanscheme aps ON + ap.AccountPlanID = aps.AccountPlanID AND + ap.Phone = aps.SchemeValue AND + aps.FakturabankSchemeID = @phoneid +WHERE + ap.Phone != '' AND ap.Phone is not null AND + aps.AccountPlanSchemeID is null AND + ap.AccountPlanType = 'employee'; + diff --git a/modules/accountplan/view/employee.php b/modules/accountplan/view/employee.php index 539f5ff2..643c49bc 100755 --- a/modules/accountplan/view/employee.php +++ b/modules/accountplan/view/employee.php @@ -81,7 +81,7 @@
Ansatt (underkonto til hovedbok)Ansatt (underkonto til hovedbok)
Aktiv Type_menu3(array('table'=>$db_table, 'field'=>'AccountPlanType', 'value' => $AccountPlanType, 'type'=>'AccountPlanType', 'required'=>'1', 'disabled'=>true)) ?> Viktig! Må settes riktig for at regnskapet skal fungereViktig! Må settes riktig for at regnskapet skal fungere
Navn
Fornavn (Kun for personer) Etternavn (Kun for personer)Etternavn (Kun for personer)
Adresse checkbox2($db_table, "EnableInvoiceAddress", $account->EnableInvoiceAddress,'') ?>
Postnummer Poststed - Poststed
Postboks checkbox2($db_table, "EnableInvoicePoBox", $account->EnableInvoicePoBox,'') ?> PostboksstedPostbokssted
Postbokspostnummer PostbokspostnummerstedPostbokspostnummersted
Land Country_menu3(array('table'=>'accountplan', 'field'=>'CountryCode', 'value'=>$account->CountryCode, 'class'=> 'lodoreqfelt')); ?>  
Telefon MobilMobil
Tekst informasjon
BilagsføringsinformasjonBilagsføringsinformasjon
Bank kontonummer
Kreditt tid - -checkbox2($db_table, "EnableCredit", $account->EnableCredit,''); */ ?> - -checkbox2($db_table, "EnableCredit", $account->EnableCredit,''); */ ?> DagerSiste lønnsendrings dato: - date(array('table'=>$db_table, 'field'=>'CreditDaysUpdatedAt', 'form_name' => $form_name, 'value'=>$account->CreditDaysUpdatedAt, 'class'=>'lodoreqfelt')) ?> - Siste lønnsendrings dato:date(array('table'=>$db_table, 'field'=>'CreditDaysUpdatedAt', 'form_name' => $form_name, 'value'=>$account->CreditDaysUpdatedAt, 'class'=>'lodoreqfelt')) ?>
Prosjekt checkbox2($db_table, "EnableProject",$account->EnableProject,'') ?> Standard: project_menu2(array('table' => $db_table, 'field' => 'ProjectID', 'value' => $account->ProjectID, 'tabindex' => $tabindex++, 'accesskey' => 'P', 'unset' => true)) ?> +
Avdeling checkbox2($db_table, "EnableDepartment",$account->EnableDepartment,'') ?> Standard: department_menu2(array('table' => $db_table, 'field' => 'DepartmentID', 'value' => $account->DepartmentID, 'tabindex' => $tabindex++, 'accesskey' => 'V', 'unset' => true)) ?>
Debit tekst Farge:Farge: Type_menu3(array('table'=>$db_table, 'field'=>'DebitColor', 'value'=>$account->DebitColor, 'type'=>'DebitColor', 'required' => 1)) ?>
Kredit tekst Farge:Farge: Type_menu3(array('table'=>$db_table, 'field'=>'CreditColor', 'value'=>$account->CreditColor, 'type'=>'CreditColor', 'required' => 1)) ?>
AnsatteAnsatte
Fødselsdag date(array('table'=>$db_table, 'field'=>'BirthDate', 'form_name' => $form_name, 'value'=>$account->BirthDate, 'class'=>'lodoreqfelt')) ?> (Brukes for beregning av arbeidsgiveravgift over/under 62 år)date(array('table'=>$db_table, 'field'=>'BirthDate', 'form_name' => $form_name, 'value'=>$account->BirthDate, 'class'=>'lodoreqfelt')) ?> (Brukes for beregning av arbeidsgiveravgift over/under 62 år)
Personnr text(array('table'=>$db_table, 'field'=>'SocietyNumber', 'value'=>$account->SocietyNumber, 'class'=>'lodoreqfelt')) ?>Ansatt vedAnsatt ved Subcompany_menu3(array('table'=>$db_table, 'field'=>'SubcompanyID', 'value'=>$account->SubcompanyID, 'class'=> 'lodoreqfelt')); ?>
ID nummer text(array('table'=>$db_table, 'field'=>'IDNumber', 'value'=>$account->IDNumber, 'class'=>'lodoreqfelt')) ?>
Kommune
Feriepengeprosent text(array('table'=>$db_table, 'field'=>'Feriepengeprosent', 'value'=>$account->Feriepengeprosent, 'class'=>'lodoreqfelt')) ?>
Tabelltrekk: text(array('table'=>$db_table, 'field'=>'TabellTrekk', 'value'=>$account->TabellTrekk, 'class'=>'lodoreqfelt')) ?>Prosenttrekk:Prosenttrekk: text(array('table'=>$db_table, 'field'=>'ProsentTrekk', 'value'=>$account->ProsentTrekk, 'class'=>'lodoreqfelt')) ?>
Arbeid start date(array('table'=>$db_table, 'field'=>'WorkStart', 'form_name' => $form_name, 'value'=>$account->WorkStart, 'class'=>'lodoreqfelt')) ?>Arbeid sluttArbeid slutt date(array('table'=>$db_table, 'field'=>'WorkStop', 'form_name' => $form_name, 'value'=>$account->WorkStop, 'class'=>'lodoreqfelt')) ?>
Stillingsprosent text(array('table'=>$db_table, 'field'=>'WorkPercent', 'value'=>$account->WorkPercent, 'class'=>'lodoreqfelt')) ?> + Stillingsprosent oppdatert: date(array('table'=>$db_table, 'field'=>'WorkPercentUpdatedAt', 'form_name' => $form_name, 'value'=>$account->WorkPercentUpdatedAt, 'class'=>'lodoreqfelt')) ?>
Altinn feltAltinn felt
Skifttype: - Generic_menu3(array('data' => $_lib['form3']->_ALTINN['ShiftTypes'], 'width'=>100, 'table'=> 'accountplan', 'field'=>'ShiftType', 'value'=>$account->ShiftType, 'class'=> 'lodoreqfelt')); ?> - Timer hver uke ved full stilling: - - Generic_menu3(array('data' => $_lib['form3']->_ALTINN['ShiftTypes'], 'width'=>100, 'table'=> 'accountplan', 'field'=>'ShiftType', 'value'=>$account->ShiftType, 'class'=> 'lodoreqfelt')); ?>Timer hver uke ved full stilling:
Arbeidstid: - Generic_menu3(array('data' => $_lib['form3']->_ALTINN['WorkTimeSchemeTypes'], 'table'=> 'accountplan', 'field'=>'WorkTimeScheme', 'value'=>$account->WorkTimeScheme, 'class'=> 'lodoreqfelt')); ?> - Ansettelsestype: - Generic_menu3(array('data' => $_lib['form3']->_ALTINN['TypeOfEmploymentTypes'], 'table'=> 'accountplan', 'field'=>'TypeOfEmployment', 'value'=>$account->TypeOfEmployment, 'width' => 32, 'class'=> 'lodoreqfelt')); ?> - Generic_menu3(array('data' => $_lib['form3']->_ALTINN['WorkTimeSchemeTypes'], 'table'=> 'accountplan', 'field'=>'WorkTimeScheme', 'value'=>$account->WorkTimeScheme, 'class'=> 'lodoreqfelt')); ?>Ansettelsestype:Generic_menu3(array('data' => $_lib['form3']->_ALTINN['TypeOfEmploymentTypes'], 'table'=> 'accountplan', 'field'=>'TypeOfEmployment', 'value'=>$account->TypeOfEmployment, 'width' => 32, 'class'=> 'lodoreqfelt')); ?>
Yrke - Occupation_menu3(array('table'=>$db_table, 'field'=>'OccupationID', 'value'=>$account->OccupationID, 'class'=> 'lodoreqfelt')); ?> - Samme posisjon siden: - date(array('table'=>'accountplan', 'field'=>'inCurrentPositionSince', 'form_name' => $form_name, 'value'=>$account->inCurrentPositionSince, 'class'=> 'lodoreqfelt')) ?> - Occupation_menu3(array('table'=>$db_table, 'field'=>'OccupationID', 'value'=>$account->OccupationID, 'class'=> 'lodoreqfelt')); ?>Samme posisjon siden:date(array('table'=>'accountplan', 'field'=>'inCurrentPositionSince', 'form_name' => $form_name, 'value'=>$account->inCurrentPositionSince, 'class'=> 'lodoreqfelt')) ?>
TimelisteTimeliste
Passord Ansatt logger inn med:Ansatt logger inn med:
Oversikt Vis oversiktDatabase:
- Brukernavn: eller AccountName ?>
- Passord: Password ?>		 + Database:
+ Brukernavn: eller AccountName ?>
+ Passord: Password ?> +
LoggLogg
Sist brukt i bilagOpprettet av PersonIDToName($account->InsertedByPersonID) ?> Date($account->InsertedDateTime) ?>
Endret av PersonIDToName($account->UpdatedByPersonID) ?> Date($account->TS) ?>
- get_person('AccessLevel') >= 2) { ?> + + get_person('AccessLevel') >= 2) { ?> - +
-
- hidden(array('name'=>'AccountPlanID', 'value'=>$AccountPlanID)) ?> - submit(array('value'=>'Deaktiver (D)', 'name'=>'action_accountplan_deactivate', 'accesskey'=>'D')) ?> - get_person('AccessLevel') > 3) { - print $_lib['form3']->submit(array('value'=>'Slett (D)', 'name'=>'action_accountplan_delete', 'accesskey'=>'', 'confirm' => 'Er du sikker på at du vil slette denne?')); - } ?> -
+
+ hidden(array('name'=>'AccountPlanID', 'value'=>$AccountPlanID)) ?> + submit(array('value'=>'Deaktiver (D)', 'name'=>'action_accountplan_deactivate', 'accesskey'=>'D')) ?> + get_person('AccessLevel') > 3) { + print $_lib['form3']->submit(array('value'=>'Slett (D)', 'name'=>'action_accountplan_delete', 'accesskey'=>'', 'confirm' => 'Er du sikker på at du vil slette denne?')); + } ?> +
Mobil
E-Post privat
Bilagsføringsinformasjon
Bilagsføringsinformasjon
Fakturabank Firma ID