100 Commits
Author SHA1 Message Date
tanshu e3286c87ba Incentive Done!!
Employee Benefit Done!!
2020-05-23 09:45:02 +05:30
tanshu 814d289758 Employee Benefit Done!!
Db Integrity, Reset Stock and Rebase done!!
2020-05-22 10:10:45 +05:30
tanshu b2f2e742f5 Lock Information and Maintenance Done!! 2020-05-22 02:28:37 +05:30
tanshu c0ddfc95c4 Issue Done!!
Payment and Receipt Done!!
2020-05-22 01:38:07 +05:30
tanshu 98edca5f60 Renamed "Salary Deduction" to "Employee Benefit"
Journal, Purchase and Purchase Return vouchers done!!

Changed the column type of "date" columns from "datetime" to better fit the data.
2020-05-21 13:11:47 +05:30
tanshu a0f27fe364 Attendance and Employee Attendance done!!
Journal Done!!
But there is issue of validation in purchase due to lack of proper journals when getting data from the frontend.
The proposed solution is to create different schemas for various vouchers and then reexport and import them in a master schema for persisting

Also, change "Supplier" to vendor in Purchase, etc.
Also, convert all date field to date from datetime

Rename "Salary Deduction" to "Employee Benefits" across the board
2020-05-17 15:38:13 +05:30
tanshu cda157f05c Employee Attendance Done!!
TODO: Only need to reload Attendance and Employee Attendance on Save
2020-05-14 22:13:34 +05:30
tanshu bd05e6bb17 Attendance Done!!
Changed the datatype of dates in attendance and employee to date from datetime
this might bork things in other places
2020-05-14 21:49:22 +05:30
tanshu 0a79b1acbb Unposted Done!! 2020-05-14 16:33:08 +05:30
tanshu 0df442e541 Trial Balance Done!! 2020-05-14 16:24:03 +05:30
tanshu 6a044f827b Stock Movement Done!! 2020-05-14 16:09:31 +05:30
tanshu 2dba0012be Raw Material Cost Done!! 2020-05-14 15:43:20 +05:30
tanshu 2462818abf Purchases done!! 2020-05-14 14:59:16 +05:30
tanshu da58528768 Purchase Entries Done!! 2020-05-14 14:39:19 +05:30
tanshu e62bb0a825 Profit & Loss Done!! 2020-05-14 13:49:40 +05:30
tanshu 48d03ab832 Product Ledger Done!! 2020-05-14 13:38:13 +05:30
tanshu 6ec4068ed0 Net Transactions!! 2020-05-14 12:34:27 +05:30
tanshu 5f783e1f45 Daybook done!! 2020-05-14 12:27:15 +05:30
tanshu 01cf6c2da1 Closing Stock Done!! 2020-05-14 12:18:45 +05:30
tanshu a4b9fb7408 Works:
Balance sheet
 Ledger
 Cash Flow

along with urls
Balance sheet schema does not enforce multiple_of for amounts as multiple_of borks on random figures
2020-05-14 11:26:28 +05:30
tanshu 708a60baf7 Ledger now working with response_model
get_edit_url workaround found with transform clientside
2020-05-12 23:21:12 +05:30
tanshu 9c9f0dfdd6 Renamed Service Charges to Incentives including account fixture and permission
replaced my custom ValidationErro with FastAPI HTTPException
Fixed?:
 Attendance
 Employee Attendance
2020-05-12 20:52:07 +05:30
tanshu de4d248de7 Done:
Issue Grid
 Batch
2020-05-12 11:53:20 +05:30
tanshu 8dcda9cb56 Moved the session to core from routers 2020-05-12 09:55:33 +05:30
tanshu d62119882d All Reports done. Except where get_url is used 2020-05-12 09:23:27 +05:30
tanshu 2b2430c5b2 Done upto reconcile
Pending:
 stock movement
 trial balance
 unposted
2020-05-12 03:52:25 +05:30
tanshu 85d05392b8 Added session support, but right now it is defaulting to 2 week long session
Reports working:
 Ledger
 Balance Sheet
 Profit & Loss
 Closing Stock
2020-05-12 02:57:48 +05:30
tanshu 6dbab6442f Renamed groups to roles in the frontend
Working:
 Account
 Cost Centre
 Employee
 Product Group
 Product
 Role
 User
 Client
2020-05-12 01:44:57 +05:30
tanshu cd764be49c angular2-hotkeys beyond this breaks with Angular 8.x
logout now works.
Only the clientID does not work as of now
2020-05-12 00:31:53 +05:30
tanshu ae8c46084c Working as a drop-in replacement for the last 2020-05-11 23:45:52 +05:30
tanshu 37b4faabf4 Updated to new api structure 2020-05-11 22:46:41 +05:30
tanshu 5f3649990f Simplified unnecessary complex logic 2020-05-11 22:46:17 +05:30
tanshu 02fbd0984e Updated to reflect renamed schemas 2020-05-11 22:42:13 +05:30
tanshu 07b7248b4e Changes in the login so that the token works with my solution 2020-05-11 21:53:38 +05:30
tanshu 9dff72aaed Clients should now work.
Blacked a lot of files
2020-05-10 22:38:35 +05:30
tanshu 06fd0db3f6 Checked the alembic migration. It is fine
Fixed errors in user / roles / etc. mostly introduced due to the renaming of tables
2020-05-10 22:25:37 +05:30
tanshu 899b5f31ab Alembic updated to current schema 2020-05-10 21:52:23 +05:30
tanshu 3cd7ff11f6 Added Alembic
Breaking: Changed a lot of column names
2020-05-10 20:36:19 +05:30
tanshu 9383cf84d4 Done: Product Group
Done: Product
2020-05-10 16:05:39 +05:30
tanshu aae48faf91 Renamed service points to points consistently
Renamed Schemas to shorten them
Added the name validators for Account Base
Added joining_date/leaving_date validators for employees
Employees should be working now
2020-05-10 13:32:08 +05:30
tanshu 6765f0a93e Account done 2020-05-08 16:18:50 +05:30
tanshu 2466efb208 Permissions are now stored in and gotten from the jwt 2020-05-08 16:18:25 +05:30
tanshu fe74ef44bf Moving to FastAPI
Config is not properly working with .env file as of now
Cost Centre is mostly working, going to work on Accounts now
2020-05-08 10:22:25 +05:30
Amritanshu 72044476a8 Feature: Lazy loading
Lazy loaded everything
TODO: The cash flow module when clicking on sub-links, it reloads the whole page, it needs to be diagnosed and fixed, this problem also exists in the other modules
TODO: Rename folders and modules such as account to accounts to match the url
2019-06-13 16:36:43 +05:30
Amritanshu fea48e1a3e Chore: Upgraded to Angular, Angular Material and Angular Flex layout 8.0 2019-06-12 17:25:10 +05:30
Amritanshu 40eaa25c76 Feature: Reports now change the start and end period dates similar to vouchers.
Chore: cleaned up the layout of the functions in the reports to make them easier to understand and follow standard practices
2019-06-12 15:36:52 +05:30
Amritanshu 120b9544f8 Feature: Added hotkeys in vouchers for selecting date (f2), save (ctrl+s) and post (ctrl+p) 2019-05-07 14:59:51 +05:30
Amritanshu 017c828474 Fix: Trim the narration of vouchers to remove cruft
Fix: Do no tabstop on row edit buttons for a more consistent feel.
2019-04-18 16:04:42 +05:30
Amritanshu 403b9a207a Fix: ProductLedger was crapping out because of ambiguous join in opening balace. (Probably triggered by upgrade in sqlalchemy)
Chore: Updated the dev dependencies as Angular 7 does not support Typescript 3.2 and further
2019-04-15 13:34:16 +05:30
Amritanshu 72e8801472 Fix: Error in navbar, didn't do anything, but showed up in the errors. 2019-04-13 12:12:08 +05:30
Amritanshu c341e58d63 Fix: Handle uploading of new fingerprint file
Chore: Used Black formatter
2019-04-06 09:43:12 +05:30
Amritanshu dd59bfdfb4 Fix: On row edit, the value of the control was set as number and not text, leding to error on add row. 2018-11-26 09:07:58 +05:30
Amritanshu bdb8bc7005 Refactor: Flush opening vouchers to database before cleaning of lint.
This removes the need to keep of list of accounts/batches to not be deleted.
Do not delete employees with attendance and fingerprints.
2018-11-26 08:54:39 +05:30
Amritanshu cfdd49f96f Fix: Layout was getting squashed, now working properly 2018-11-26 08:46:23 +05:30
Amritanshu 75ea08f678 Chore: Update to Angular 7.1.0, Angular Material 7.1.0 and Angular Flex Layout 7.0.0-beta.19
Fix: Prod build will now build properly
TODO: The width of content is very less and everything is squashed
2018-11-26 08:46:03 +05:30
Amritanshu 1984c1fc90 Fix: Rebase url error, double slash before date 2018-09-05 00:09:37 +05:30
Amritanshu eb22eace69 Fix: Incentives was not saving
Fix: Employee edit was not working
2018-08-25 11:28:23 +05:30
Amritanshu cd20982753 Feature: Download Products
Fix: Add user
Fix: Added 5000 page size in products
Fix: Local Time Pipe was showing the wrong time
2018-07-29 23:43:26 +05:30
tanshu a77293e0b2 Fix: Would not navigate as the search was referencing unresolved variables. 2017-02-10 13:33:40 +05:30
tanshu 5b562051e7 Fix: Ledger (Alt+R/U) was not working because the $watchGroup does not
do object equality.  Reverted the change.
Fix: Major parts for keyboard navigation were missing.  Added.
Fix: Autocomplete="off" added to major parts
2016-04-15 00:02:28 +05:30
tanshu 9b516fa41c Fix: Ledger was not updating because $watch was not firing. 2016-04-13 15:56:38 +05:30
tanshu e868a213b1 Update: Changed the Reconcile report so that it shows all the unreconciled entries and also shows the balance according to the reconcile date. 2016-04-12 13:57:24 +05:30
tanshu 33c385ea91 Fix: Typo 2016-03-22 13:23:27 +05:30
tanshu 3f7ae4225d Fix: New Recipe would not recognize that is product is sold. 2016-03-22 13:22:06 +05:30
tanshu e9504753a5 Feature: Recipe list shows the group and is also sortable on name, group and dates, etc. 2016-03-17 18:18:09 +05:30
tanshu 1439befc46 Fix: Errors in the comparators in Tokenizer
Feature: Product list shows more information
2016-03-16 21:11:08 +05:30
tanshu 3df2146ba2 Fix: Date filtering works properly in Tokenizer (requires moment.js)
Feature: Selecting Start/Finish Date in Recipe list updates the search string.
2016-03-16 14:41:58 +05:30
tanshu 3c4f24989c Fix: Accidentally had another Sale Price inputbox (readonly) 2016-03-15 16:18:46 +05:30
tanshu bf79638d4b Fix: Recipe edit never showed is_sold as it was not part of the json 2016-03-15 16:13:40 +05:30
tanshu 99439b63e8 Fix: Recipe details shows the current sale price of product and also lets you edit the sale price. 2016-03-15 16:11:19 +05:30
tanshu 1b80c52763 Fix: Recipe Ingredient autocomplete focusing and clearing properly 2016-03-14 16:48:36 +05:30
tanshu 6653121a6f Fix: l18n link was broken.
Fix: disabled cacheing in autocomplete
2016-03-14 16:22:44 +05:30
tanshu abc77fb5a6 Chore: Using angularjs 1.5.0 online hosted.
Refactor: Simplified MenuItem and Hierarchical Product table.
Feature: Recipe now follows temporat (Point in time) feature.
It should be fully working and records the recipe cost for a period based on the issue price and as on date.
Feature: Using Angular Material for recipe form and also or product form.
2016-03-14 15:28:17 +05:30
tanshu 2e670c06ec Fix: Updated to match the fingerprint uploader to the new attendance machine 2016-02-29 23:41:08 +05:30
Tanshu 33b14b1ec0 Feature: Take some of the parameters from the Environment so that it can work in a containerized environment 2016-01-31 13:58:15 +05:30
Tanshu 4b795a6f5d Merge branch 'master' of http://git.tanshu.com/tanshu/brewman 2016-01-29 19:58:56 +05:30
Tanshu 0ef8696d65 Added a seperate requirements file for PIP and updated setup.py to use with while reading README and CHANGES 2016-01-29 19:58:36 +05:30
tanshu 8e8cc78489 Fix: Dr/Cr did not show in Journal Voucher because of Type error with the debit filter. 2015-08-11 17:01:01 +05:30
tanshu 1cc9ba6a01 Removed unused AttendanceTypes 2015-03-16 14:52:27 +05:30
tanshu 6a815692bd Feature: Credit Service Charge with adjustable service points
Refactor: Renamed column, table, and uses of Cost Center to Cost Centre
Refactor: Renamed costcenter to cost_centre
2015-02-12 17:42:46 +05:30
tanshu fdcedb262c Feature: Added a maintenance mode which locks all other users out 2015-02-12 16:12:32 +05:30
tanshu cb7e6e89a5 Fix: Added a 5 minute timeout for rebase 2015-02-02 15:44:29 +05:30
tanshu 9c70286258 Fix: The new focusing directive wanted exclusive scope and it conflicted at times. Fixed. 2015-01-11 12:28:27 +05:30
tanshu 948b45b2ce Feature: Check Db Integrity
- Right now it only checks for duplicate attendances.
2015-01-09 12:31:08 +05:30
tanshu e0d3887fa9 Chore: Replaced jQuery.focus() with a focus-on directive 2015-01-09 12:29:42 +05:30
tanshu e27424c41e Fix: SubControllers not working due to breaking changes in AngularJS 1.3 where global functions as controllers are no longer allowed. Overrode the setting with allowGlobals() config. 2014-12-27 12:39:29 +05:30
tanshu 7c54e4b0c7 Feature: Automatic Crediting of Service Points. Plus now service points can be decimals 2014-12-25 16:40:47 +05:30
tanshu c27276cc05 Fix: Removed link in base.html for removed hack.css 2014-12-25 16:28:14 +05:30
tanshu 8347a3e603 Updates: Bootstrap updated to 3.3.1
Chosen updated to 1.3.0
AngularJS updated to 1.3.8
jQuery updated to 2.1.3
angular-loading-bar updated to 0.6.0
ui-bootstrap updated to 0.12.0
  -- All the datepickers updated for is-open so that they open on focus.
Chore: Replaces this in controllers with $scope. Don't know the downsides of using "this", but to prevent any unknown side-effects.
Chore: Rename Crtl to Controller for all controllers.
2014-12-25 16:26:41 +05:30
tanshu b323a85f3a PF Limit reaised to 15,000 as per new law 2014-12-10 12:37:49 +05:30
tanshu 666613fb54 Fix: came_from with query string was not being properly interpreted 2014-10-03 15:41:13 +05:30
tanshu 91b60fa76d Feature: Maybe? Login redirect now supports query string 2014-10-03 15:34:49 +05:30
Amritanshu d86880396d Fix: Allow enabled clients to be deleted and also delete the history to enable deletion 2014-09-12 12:59:09 +05:30
Amritanshu fcef417dfc Feature: Clients can be enabled from the client detail page. 2014-09-12 12:52:54 +05:30
Amritanshu 62c8b64370 Fix: Error in checking disabled clients which made new clients impossible 2014-09-12 12:46:09 +05:30
Tanshu fe811d9887 Fix: On new clients, trying to get Client.by_code(None) would raise an error 2014-09-01 21:59:42 +05:30
Amritanshu 78a064a723 Feature: Client list shows last login time. 2014-08-30 18:08:17 +05:30
Amritanshu f3b4e95072 Feature: Login history logging
Feature: Clear out old/unused clients using Creation Date
Breakage: Change in structure of Clients table and addition of Login History table
2014-08-30 17:46:43 +05:30
Amritanshu 25a82a2027 Fix: Catch DBApi error so that timeout errors don't lock up the software. 2014-08-23 16:52:57 +05:30
Amritanshu da6997afc6 Fix: Unable to change Employee Cost Center
Fix: Do not add 0 amount Journals to Salary Voucher
2014-08-12 13:17:41 +05:30