- Ansatt (underkonto til hovedbok)
+ Ansatt (underkonto til hovedbok)
@@ -95,149 +96,142 @@
Type_menu3(array('table'=>$db_table, 'field'=>'AccountPlanType', 'value' => $AccountPlanType, 'type'=>'AccountPlanType', 'required'=>'1', 'disabled'=>true)) ?>
- Viktig! Må settes riktig for at regnskapet skal fungere
+ Viktig! Må settes riktig for at regnskapet skal fungere
Etternavn (Kun for personer)
+ Etternavn (Kun for personer)
checkbox2($db_table, "EnableInvoiceAddress", $account->EnableInvoiceAddress,'') ?>
Poststed Poststed
+
checkbox2($db_table, "EnableInvoicePoBox", $account->EnableInvoicePoBox,'') ?>
Postbokssted
+ Postbokssted
Postbokspostnummersted
+ Postbokspostnummersted
Country_menu3(array('table'=>'accountplan', 'field'=>'CountryCode', 'value'=>$account->CountryCode, 'class'=> 'lodoreqfelt')); ?>
-
+
Mobil
- Mobil
+
-
-
-
+
+
+
- Bilagsføringsinformasjon
+ Bilagsføringsinformasjon
-
-
+ Siste 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')) ?>
checkbox2($db_table, "EnableProject",$account->EnableProject,'') ?>
Standard: project_menu2(array('table' => $db_table, 'field' => 'ProjectID', 'value' => $account->ProjectID, 'tabindex' => $tabindex++, 'accesskey' => 'P', 'unset' => true)) ?>
+
checkbox2($db_table, "EnableDepartment",$account->EnableDepartment,'') ?>
Standard: department_menu2(array('table' => $db_table, 'field' => 'DepartmentID', 'value' => $account->DepartmentID, 'tabindex' => $tabindex++, 'accesskey' => 'V', 'unset' => true)) ?>
+
Farge:
+ Farge:
Type_menu3(array('table'=>$db_table, 'field'=>'DebitColor', 'value'=>$account->DebitColor, 'type'=>'DebitColor', 'required' => 1)) ?>
Farge:
+ Farge:
Type_menu3(array('table'=>$db_table, 'field'=>'CreditColor', 'value'=>$account->CreditColor, 'type'=>'CreditColor', 'required' => 1)) ?>
- Ansatte
+ Ansatte
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)
text(array('table'=>$db_table, 'field'=>'SocietyNumber', 'value'=>$account->SocietyNumber, 'class'=>'lodoreqfelt')) ?>
- Ansatt ved
+ Ansatt ved
Subcompany_menu3(array('table'=>$db_table, 'field'=>'SubcompanyID', 'value'=>$account->SubcompanyID, 'class'=> 'lodoreqfelt')); ?>
text(array('table'=>$db_table, 'field'=>'IDNumber', 'value'=>$account->IDNumber, 'class'=>'lodoreqfelt')) ?>
-
@@ -253,20 +247,19 @@
print("AGA " . $res->Percent . "%");
}
?>
-
text(array('table'=>$db_table, 'field'=>'Feriepengeprosent', 'value'=>$account->Feriepengeprosent, 'class'=>'lodoreqfelt')) ?>
-
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')) ?>
@@ -274,14 +267,14 @@
date(array('table'=>$db_table, 'field'=>'WorkStart', 'form_name' => $form_name, 'value'=>$account->WorkStart, 'class'=>'lodoreqfelt')) ?>
- Arbeid slutt
+ Arbeid slutt
date(array('table'=>$db_table, 'field'=>'WorkStop', 'form_name' => $form_name, 'value'=>$account->WorkStop, 'class'=>'lodoreqfelt')) ?>
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')) ?>
@@ -295,63 +288,50 @@
?>
- Altinn felt
+ Altinn felt
- 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:
+
- 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')); ?>
- 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')) ?>
- Timeliste
+ Timeliste
Ansatt logger inn med:
-
+ Ansatt logger inn med:
Vis oversikt Database: AccountName ?> Password ?>
-
+
+ Database: AccountName ?> Password ?>
+
- Logg
+ Logg
@@ -364,38 +344,38 @@
PersonIDToName($account->InsertedByPersonID) ?>
- Date($account->InsertedDateTime) ?>
PersonIDToName($account->UpdatedByPersonID) ?>
- Date($account->TS) ?>
-
- get_person('AccessLevel') >= 2) { ?>
+
+ get_person('AccessLevel') >= 2) { ?>
-
get_person('AccessLevel') >= 2) { ?>
-
+
+
diff --git a/modules/accountplan/view/record.inc b/modules/accountplan/view/record.inc
index 7dde742d..e30d6dc4 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 {
@@ -52,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;
}
@@ -59,26 +56,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
@@ -149,16 +146,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);
@@ -397,7 +384,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';"));
@@ -412,7 +403,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 @@
-
Bilagsføringsinformasjon
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 @@
+
+
Fakturabank Firma ID
@@ -92,5 +108,5 @@ function fixNoSupAccntRe(select_element) {
-
+
diff --git a/modules/fakturabank/model/fakturabanksalary.class.php b/modules/fakturabank/model/fakturabanksalary.class.php
index d3c60f79..8a6cd2ef 100644
--- a/modules/fakturabank/model/fakturabanksalary.class.php
+++ b/modules/fakturabank/model/fakturabanksalary.class.php
@@ -46,11 +46,18 @@ 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" . $head->AccountPlanID . " \n";
$xml_content .= "" . $head->FirstName . " \n";
$xml_content .= "" . $head->LastName . " \n";
- $xml_content .= "NO:EMAIL \n";
- $xml_content .= "" . $head->FakturabankEmail . " \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";
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 @@
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; ?>
+