Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Financial #19

Merged
merged 66 commits into from
Feb 6, 2018
Merged
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
bd02774
DB initialization 1
jhaniot Nov 15, 2017
f327377
Initial Database Migration
jhaniot Nov 16, 2017
1b5e233
Init Finance DB - contraints addition
jhaniot Nov 16, 2017
84f4378
Init Finance DB - change in invoice/expenditures fk relations
jhaniot Nov 16, 2017
dfa6e05
Database percentage check correction
jhaniot Nov 17, 2017
87de4c7
Init Finance DB - suppl_id fk in expenditues
jhaniot Nov 17, 2017
27c3981
CRUD KAE + Supplier
jhaniot Nov 17, 2017
28358fd
Suppliers + KAE + KAECredit + TaxOffice
jhaniot Nov 20, 2017
0ffd1c6
DB changes in Invoice table
jhaniot Nov 21, 2017
4aed1fd
UI changes
jhaniot Nov 21, 2017
770e018
Changes in DB/UI, Collapse Panel etc
jhaniot Nov 21, 2017
4b428d7
Check working year - db improvements
jhaniot Nov 22, 2017
847bedc
Start of KAE credits section
jhaniot Nov 22, 2017
817d427
KAE credits
jhaniot Nov 23, 2017
6ea6c94
Weekendgit status!
jhaniot Nov 24, 2017
9d8c0ff
Withdrawlals
jhaniot Nov 27, 2017
e6bbd62
Year & Kae Credits
jhaniot Nov 28, 2017
d04469f
Make year currently working
jhaniot Nov 29, 2017
65d0bad
Integrity, FinanceKae...
jhaniot Nov 29, 2017
e63cd66
Minor Changes in Integrity class
jhaniot Nov 29, 2017
72808e4
Credits integrity constraints
jhaniot Nov 30, 2017
535a819
Modifications in KaeYear, KaeCredits and addition of finance_kaecredi…
jhaniot Nov 30, 2017
8c9f738
Minor changes
jhaniot Nov 30, 2017
6746806
Kae credits percentages
jhaniot Dec 1, 2017
b962119
Percentages (cont.)
jhaniot Dec 4, 2017
04761cc
Credit Percentages completion
jhaniot Dec 5, 2017
761e48a
Minor Changes (breadcrumbs, actioncolumn etc)
jhaniot Dec 5, 2017
83f5648
Internationalization
jhaniot Dec 6, 2017
92ed672
Translation cont.
jhaniot Dec 7, 2017
271a597
Internationalization
jhaniot Dec 8, 2017
9734e3d
Withdrawals
jhaniot Dec 11, 2017
8159fb3
Kae Withdrawals
jhaniot Dec 12, 2017
1b092a7
Minor literal changes
jhaniot Dec 12, 2017
960236b
Access control
jhaniot Dec 14, 2017
a9aed18
Access control (addmap migrations return back)
jhaniot Dec 14, 2017
9bf7ab1
UI tidy up
jhaniot Dec 15, 2017
71e3ab9
CRUD changes
jhaniot Dec 18, 2017
d7a9ce4
Expenditure States
jhaniot Dec 19, 2017
3b39a49
VAT options
jhaniot Dec 20, 2017
aa5ce88
Deductions init
jhaniot Jan 4, 2018
3cc505c
Deductions complete
jhaniot Jan 5, 2018
2622336
Create expenditures
jhaniot Jan 9, 2018
e8c6d8e
Database change to allow multiple withdrwals connection on an expendi…
jhaniot Jan 9, 2018
82f3450
Expenditures cont.
jhaniot Jan 10, 2018
06fe1a4
Expenditures cont. 11/01/2018
jhaniot Jan 11, 2018
f9eb29f
Expenditures cont. 3
jhaniot Jan 12, 2018
1e9fc39
Bootstrap Modal
jhaniot Jan 16, 2018
e233abf
Bootstrap Modal
jhaniot Jan 16, 2018
3b6d456
State forward/backward + expenditure deletion
jhaniot Jan 16, 2018
43665b7
Deductions in expenditures
jhaniot Jan 16, 2018
a41ac5c
Finance Deductions and Invoices (init.)
jhaniot Jan 17, 2018
73330ae
Invoices init.
jhaniot Jan 18, 2018
0a1f95d
Invoices cont. 2
jhaniot Jan 19, 2018
499e9b2
Tidy up
jhaniot Jan 22, 2018
85a5f64
Corrections
jhaniot Jan 23, 2018
4b1a938
Currency Format
jhaniot Jan 25, 2018
051899e
Deductions changes, Widthdrawals UI etc.
jhaniot Jan 26, 2018
bd76eb8
Improvements 29012018
jhaniot Jan 29, 2018
ce2e1b3
Improvements & Expenditure Report
jhaniot Jan 30, 2018
2f235fc
Payment report
jhaniot Jan 31, 2018
ced23c7
Info panel chart
jhaniot Jan 31, 2018
b515c5a
Roles
jhaniot Feb 1, 2018
eac3419
Chart + Update of exp states
jhaniot Feb 2, 2018
83c75f8
Search fix
jhaniot Feb 5, 2018
dcc1cad
Expenditures Search & Chart improvements
jhaniot Feb 6, 2018
831c471
Merge branch 'develop' into Financial
jhaniot Feb 6, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Database percentage check correction
  • Loading branch information
jhaniot committed Nov 17, 2017
commit dfa6e0548c828279fb90b309c6846449faa8907a
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function safeUp()
$create_command = "CREATE TABLE IF NOT EXISTS " . $dbFinTables['table_deduction'] .
"(`deduct_id` INTEGER NOT NULL AUTO_INCREMENT,
`deduct_name` VARCHAR(100) NOT NULL,
`deduct_percentage` DECIMAL(3, 2) NOT NULL CHECK (deduct_percentage >= 0.00 AND deduct_percentage >= 100.00),
`deduct_percentage` DECIMAL(3, 2) NOT NULL CHECK (deduct_percentage >= 0.00 AND deduct_percentage <= 100.00),
`deduct_description` VARCHAR(1000),
`deduct_date` DATETIME NOT NULL,
`detuct_obsolete` BOOLEAN NOT NULL DEFAULT 0,
Expand Down Expand Up @@ -208,4 +208,4 @@ public function safeDown()
$this->dropTable($dbtable);
}
}
}
}