Commit Graph

533 Commits

Author SHA1 Message Date
Amritanshu Agrawal 584be9f349 Fix: Forgot to add this 2021-11-10 11:19:28 +05:30
Amritanshu Agrawal e44fc4d313 Version Bump v10.2.0 2021-11-10 11:01:33 +05:30
Amritanshu Agrawal ffd46bf717 Feature: Recipe module mostly working. What needs to be done is duplicating recipes and export for checking.
Feature: Non Contract Purchases Report
2021-11-10 10:57:18 +05:30
Amritanshu Agrawal 3b8c972c48 Version Bump v10.1.5 2021-11-08 17:19:52 +05:30
Amritanshu Agrawal 952f030e8d Fix: Deleting voucher fucked up due to cascading changes was not 2021-11-08 17:19:27 +05:30
Amritanshu Agrawal 3d5d02a416 Version Bump v10.1.4 2021-11-08 10:08:55 +05:30
Amritanshu Agrawal ff52aa40bc Fix: Blank voucher error as incentives was not supplied 2021-11-08 10:08:25 +05:30
Amritanshu Agrawal 40d5914684 Chore: Updated dependencies 2021-11-08 07:48:52 +05:30
Amritanshu Agrawal 2d2a6a785b Fix: All entries was not working as assert was truthy and not checking for None 2021-11-07 18:48:06 +05:30
Amritanshu Agrawal 98b574307d Version Bump v10.1.3 2021-11-07 18:32:03 +05:30
Amritanshu Agrawal abe99f0187 Chore: Added type hints for sqlalchemy and checked a lot of them using mypy
There can be many errors now
2021-11-07 18:30:14 +05:30
Amritanshu Agrawal fa6aa514bc Fix: Employee attendance was not showing 2021-11-07 12:44:52 +05:30
Amritanshu Agrawal ca99aa00ed Version Bump v10.1.2 2021-11-02 16:39:31 +05:30
Amritanshu Agrawal 4df8c916ab Fix: Recipe was crashing the whole thing 2021-11-02 16:39:15 +05:30
Amritanshu Agrawal 5e66db381b Version Bump v10.1.1 2021-11-02 14:15:13 +05:30
Amritanshu Agrawal 7a5ccdfbbb Fix: Upgrade failed when multiple skus 2021-11-02 14:15:00 +05:30
Amritanshu Agrawal 49aaa2fbe3 Version Bump v10.1.0 2021-11-02 14:01:51 +05:30
Amritanshu Agrawal 30e3288b1e DB Normalization: Moved fractionUnits back to Product from SKU as it is better suited there.
Feature: Created the ProductSku schema for the product/sku autocomplete
2021-11-02 14:00:15 +05:30
Amritanshu Agrawal b3075577e6 Version Bump v10.0.2 2021-11-02 12:31:18 +05:30
Amritanshu Agrawal e06c8b484e Change the default sort in Closing Stock 2021-11-02 12:31:12 +05:30
Amritanshu Agrawal ce01a4d1f3 Version Bump v10.0.1 2021-11-02 12:00:34 +05:30
Amritanshu Agrawal b6ef6f79e5 Fix: Closing stock on update was not working as it was not able to encode/parse creation date and last edit date 2021-11-02 12:00:26 +05:30
Amritanshu Agrawal b69a38d8e9 Version Bump v10.0.0 2021-10-31 18:54:21 +05:30
Amritanshu Agrawal 0574f9df14 Chore: Changed the account_type and voucher_type enum.
The account type enum is not stored in the database as an enum.
The voucher_type enum is now a table in the database.

Feature: Closing stock can now be saved and in each department.
2021-10-31 18:41:06 +05:30
Amritanshu Agrawal f8de1cd3cf Fix: Fingerprint upload 2021-10-05 15:04:05 +05:30
Amritanshu Agrawal e96ef38173 Fix: Purchase update error. There is no longer product_id in Inventory. Also, now issuing direct updates instead of updating the models. 2021-09-30 17:19:36 +05:30
Amritanshu Agrawal 1647d356c9 Feature: Added product Stock Keeping Units to prevent duplicate products. A lot of refactoring because of this.
Removed: Reset Stock as it was never used and don't think it is even needed with this new batch system.
Fix: Incentive update was not working
2021-09-27 14:22:31 +05:30
Amritanshu Agrawal 4f907e965b Fix: Incentives was not working 2021-09-26 09:34:16 +05:30
Amritanshu Agrawal 119c5b71f1 Fix: Purchase edit will make sure that there are no backdated issues.
Fix: Purchase edit will also update issue prices.
Chore: Simplify loop-in-loops
2021-09-25 10:58:21 +05:30
Amritanshu Agrawal 6d0d95070b Moved the batch integrity report from settings to its own report in products with permission of product ledger.
It also automatically fixes the issue prices.
2021-09-24 14:40:51 +05:30
Amritanshu Agrawal b1557bef88 DB Integrity checks for batch integrity and also updates quantities when it can. 2021-09-21 09:54:11 +05:30
Amritanshu Agrawal 6212eead20 Fix: Update purchase was wrong. It would stop after the first product as break would exit the loop instead of going to the next iteration. It was actually not needed and was a holdover from the previous loop in loop code. 2021-09-21 07:01:36 +05:30
Amritanshu Agrawal f2d617bbce Fix: Add / Update user error when a role was added. 2021-09-16 12:32:15 +05:30
Amritanshu Agrawal 176559466a Feature: Changed the unposted report to entries report with paging, sorting, etc. 2021-09-14 12:49:01 +05:30
Amritanshu Agrawal d34c8ea0a4 Rate Contract is checked during save and update of Purchase at the backend 2021-09-13 13:01:34 +05:30
Amritanshu Agrawal ceaf93d1cd Fix: Prevent duplicate valid attendances 2021-09-11 17:21:01 +05:30
Amritanshu Agrawal dee053c115 Added: Rate Contract Module. To implement: Checking this during purchase. 2021-09-11 15:43:18 +05:30
Amritanshu Agrawal 20ce1a297e Fix: Batch autocomplete was not working so Issue / Return was not working 2021-09-11 13:25:05 +05:30
Amritanshu Agrawal 074e45fe69 Chore: Renamed the auth tables to remove the prefix 2021-09-11 06:02:09 +05:30
Amritanshu Agrawal ca352649f0 Fix: The lock was not working because:
1. The Account Types sent were sqlqueries and not integer literals
2. Voucher Types and Account Types were being compared to VoucherTypesSelected and AccountTypesSelected objects and not their ids.
2021-09-10 22:36:07 +05:30
Amritanshu Agrawal 2820813cb6 Refactor: Moved various Schemas into their files
Feature: Complex voucher locking where specific types of vouchers and accounts can be locked and the locks can also be times to expire after some time.
Highest index takes priority
2021-09-10 13:21:43 +05:30
Amritanshu Agrawal 350edf7126 Removed timezone information from columns. Time will be stored in UTC coordinates.
Moved to Sqlalchemy 1.4 model and SessionFuture.

Upgraded to Angular 12

Upgraded the python dependencies
2021-09-07 12:59:18 +05:30
Amritanshu Agrawal 0bd6f8eb03 Version Bump v9.4.4 2021-04-03 07:55:17 +05:30
Amritanshu Agrawal 0786a634b0 Chore: Updated a few dependencies 2021-04-03 07:54:39 +05:30
Amritanshu Agrawal f1be068d0b Fix: joinedload_all was depreciated in sqlalchemy 1.2 and removed in 1.4 2021-04-03 07:54:00 +05:30
Amritanshu Agrawal 39c1f61dc5 Version Bump v9.4.3 2021-04-02 18:43:52 +05:30
Amritanshu Agrawal d54c5a5cf9 Fix: Users could not be added as password was not supplied in the BlankUser schema and it gave an error 2021-04-02 18:43:17 +05:30
Amritanshu Agrawal 15be0d5009 Version Bump v9.4.2 2021-02-04 08:50:17 +05:30
Amritanshu Agrawal 0cf948b4c8 Fix: Purchase Return was not showing the vendor on load 2021-02-04 08:47:21 +05:30
Amritanshu Agrawal 5d0852a74d Version Bump v9.4.1 2021-01-27 09:21:38 +05:30
Amritanshu Agrawal a883d5ab1c Version Bump v9.4.0 2021-01-25 13:15:34 +05:30
Amritanshu Agrawal f2df28ca9c Fix: Incentive takes into account the date chosen
Fix: Employee query was querying AccountBase and errored out as it did not have the designation column
Fix: Incentive update set_date was wrong
Fix: Incentive amount takes into account the current date but not any incentive voucher for the date
2021-01-25 13:07:52 +05:30
Amritanshu Agrawal d7f635b7b6 Chore: Split models into their own files 2021-01-25 12:44:17 +05:30
Amritanshu Agrawal 9e1da1d59a Version Bump v9.3.3 2020-12-18 14:43:16 +05:30
Amritanshu Agrawal 1127ee0ebc I think that when logging in with a client which will be deleted in the later command, there was an error 2020-12-18 14:30:11 +05:30
Amritanshu Agrawal fc7c85d592 Fix: Purchase Return did not show default vendor 2020-12-18 13:47:06 +05:30
Amritanshu Agrawal 0b589a3ab6 Version bump v9.3.2 2020-12-12 10:27:49 +05:30
Amritanshu Agrawal 24ea8096c4 Version bump v9.3.1 2020-12-11 07:48:20 +05:30
Amritanshu Agrawal 158f3e0e36 Fix: Raw material cost detail report borked on sort at the end as order was not in RawMaterialCost schema. Although it is not needed in the frontend, added it as optional. 2020-12-11 07:47:36 +05:30
Amritanshu Agrawal ccf2f704b6 Fix: Post voucher was not working. Replace command had borked the url.
Fix: Attendace report file name contained single quotes and did not open in excel
2020-12-08 13:05:38 +05:30
Amritanshu Agrawal 1f21438a4c Version Bump v9.3.0 2020-12-08 12:10:35 +05:30
Amritanshu Agrawal 57ef355170 Fix: Login deleting old clients was conflicting with login history
Chore: Moved to angular linting using the recommended plugins / settings
2020-12-08 12:09:19 +05:30
Amritanshu Agrawal d5048bc455 Version Bump v9.2.0 2020-12-05 09:04:11 +05:30
Amritanshu Agrawal 9aeb71d566 User and Client lists show the last logins. 2020-12-05 09:03:11 +05:30
Amritanshu Agrawal c2e8c0382a Version bump to v9.1.1 2020-12-05 08:08:18 +05:30
Amritanshu Agrawal 4042a49896 Fix: was storing the client id instead of code in the cookie 2020-12-04 14:50:11 +05:30
Amritanshu Agrawal 02b87262a4 Version bump to v9.1.0 2020-12-04 13:03:01 +05:30
Amritanshu Agrawal 2d81f80c63 Moved all the schemas into their own logical files. 2020-12-04 13:02:13 +05:30
Amritanshu Agrawal 8ff8d6bc91 Version bump to v9.0.1 2020-11-26 07:07:06 +05:30
Amritanshu Agrawal 4c4c1b994e Fix: Employee and Account showed [object Object] in Department instead of the department name.
This is due to enabling strict mode in Typescript and changing the list department from string to object. But the html was not updated.
2020-11-26 07:06:09 +05:30
Amritanshu Agrawal 9cd4a4ef20 Version bump to v9.0.0 2020-11-24 08:05:27 +05:30
Amritanshu Agrawal af343cb7f9 All datasources done. Now to wire them up in the components.
Plus ElementRefs are now optional as they cannot be initialized
2020-11-23 10:25:53 +05:30
Amritanshu Agrawal 30b1a3ef7d Version bump v8.2.4 2020-11-09 12:51:10 +05:30
Amritanshu Agrawal c8681b2994 Fix: Add product was borking as during check_inventories_are_valid the product_id of inventory was Null 2020-11-09 12:50:16 +05:30
Amritanshu Agrawal 2e3e451c35 Fix: Fingerprint now checked and is working
Version bump:
 v8.2.3
2020-11-06 12:56:55 +05:30
Amritanshu Agrawal 3e04d69419 Version bump
v8.2.2
2020-11-06 12:30:58 +05:30
Amritanshu Agrawal ad88dbf0d0 Fix:
Upload fingerprint
2020-11-06 12:29:52 +05:30
Amritanshu Agrawal 0f6484cd2f Version bump v8.2.1 2020-11-03 21:55:34 +05:30
Amritanshu Agrawal ba4f8a4831 Fix:
Update password works
 Updated the precision and nullability for models
 Batch was sending non round quantity_available
 Amounts were not being displayed in daybook

 Moved dockerfile from root to have a consistent build environment
2020-11-03 21:50:30 +05:30
Amritanshu Agrawal 0ab81b25d0 Chore:
v8.2.0
2020-11-03 11:28:50 +05:30
Amritanshu Agrawal 0118cc7c73 Moved dockerfile to project 2020-11-03 11:23:48 +05:30
Amritanshu Agrawal 8a4fa430ad Version bump to v8.1.0 2020-11-02 23:40:27 +05:30
Amritanshu Agrawal d64cb54702 Updated dependencies 2020-11-02 23:38:38 +05:30
Amritanshu Agrawal d9eb335ef3 Blacked, isorted, etc the python file
Was also moving the validation from schemas to models/validations
2020-11-02 23:18:56 +05:30
Amritanshu Agrawal 886b11be23 Error is batch list router fixed
v8.0.2
2020-10-11 16:29:19 +05:30
Amritanshu Agrawal 14930954a2 Fix: Batch autocomplete would bork on empty string as it would try to split Null
v8.0.1
2020-10-11 16:02:41 +05:30
Amritanshu Agrawal 889cac237c Moved brewman python project down a level into its own folder 2020-10-10 11:19:15 +05:30
Amritanshu Agrawal 5ea09df272 Prettied, Linted and updated angular.json according to the latest schematic of Angular CLI.
Now all that is needed is to make it ready for strict compiling.
Removed eslint-plugin-prettier as it is not recommended and causes errors for both eslint and prettier

Bumped to v8.0.0
2020-10-10 08:45:05 +05:30
Amritanshu Agrawal 438a98334d Showing the frontend and backend version in the settings panel.
Bumped the version to 7.6.0
2020-10-07 23:27:54 +05:30
Amritanshu Agrawal 7463846282 Blacked all files 2020-10-07 22:29:24 +05:30
Amritanshu Agrawal cb5f52fcc7 Chore:
Blacked and isorted all files
2020-10-07 21:29:42 +05:30
Amritanshu Agrawal 4e05131b41 Fix: Errors raised were not HTTP Errors, but were value errors. This raised 500 errors on the front end without valid details.
v7.4.0
2020-10-07 19:38:08 +05:30
Amritanshu Agrawal 40e79ff949 Fix:
Update in purchase/return would give wrong product changed error when a product was deleted as the id of the inventory was not checked properly
2020-10-01 12:38:54 +05:30
Amritanshu Agrawal 4685fa2528 Fix: Rounding being done manually to prevent floating point errors 2020-09-21 20:50:01 +05:30
Amritanshu Agrawal 80a8de5fea Fix: Product add was not working as the endpoint was configured wrongly 2020-09-20 18:10:42 +05:30
Amritanshu Agrawal 005d45032f Fix: Reset stock was not working because:
1. The frontend did not set the date format and that mangled the date string sent
 2. Backend was broken and was not acceping data in json format

Fix: Ledger would occasionally crap out due to rounding and floating point madness, removed the rounding limitation
2020-09-20 09:56:35 +05:30
Amritanshu Agrawal 8b82cf8157 Fix: Purchase Return was being saved as Purchase entries
Fix: Receipt Vouchers could not be deleted as wrong permission was checked

v7.1.1
2020-09-13 07:25:27 +05:30
Amritanshu Agrawal a04cb4cd4d Update: to 7.0.4
Fix: Balance Sheet was showing account in random heads
Fix: Batch was not showing in issue
Fix: At times, the Product Ledger created error on rounding and did not show.
2020-07-16 13:09:22 +05:30
Amritanshu Agrawal ad8a2d2cc3 Fix: Save account error was because in constructor type did not end in underscore
Fix: Employee save as checking for in None instead of is None

Feature: Checking the existing token for validity in constructor of auth service, this should prevent last login showing
Feature: Moved the middleware secret key into the env file

Chore: Replaced my own GUID() with postgres UUID() type
2020-06-30 11:44:19 +05:30
Amritanshu Agrawal 6ccb3634be Tag: v7.0.2
Fix: Attendance Type and Account Type objects were borking as their convenience methods were not returning anything
Fix: Employee Benefits and Incentive post voucher did not reload the page
Fix: For all vouchers, to prevent double data loading on save / update either reload data or navigate, don't reload data and then navigate so that the data appears once and then disappears
2020-06-02 08:35:36 +05:30
Amritanshu Agrawal b7a1c5b816 Fix: Relations were not working as after setting the id, if the object was none, then it set to None again.
eg. in Inventory if product_id was supplied and not the product object, product_id was set, but then when the product was set to None, the product_id was also gone

Version bumped to 7.0.1
2020-06-01 20:42:16 +05:30
Amritanshu Agrawal 7b4756fe1a Bumped the version to 7
Fixed double exception being thrown
Currency pipe broke the accounts pipe
2020-06-01 09:02:52 +05:30
Amritanshu Agrawal 1c2c98e7b5 Blacked all lines with -l 120 2020-05-31 14:41:11 +05:30
Amritanshu Agrawal 6f5d9af6e3 removed accidentally committed file.
voucher.py is now formatted with standard width of 120 instead of 88
will now use that as the default in the future
2020-05-31 14:26:50 +05:30
Amritanshu Agrawal 013fce2e96 Settings working now. Everything working now.
Time for docker and beta test
2020-05-30 23:39:02 +05:30
Amritanshu Agrawal 95e92fc2bd Fixed: Star now showing in employee list 2020-05-30 16:18:25 +05:30
Amritanshu Agrawal d5bc818632 Clients also implemented.
I think the only things left are the login history and other past errors
2020-05-30 15:41:55 +05:30
Amritanshu Agrawal 7edac38435 Sliding session implemented by using jwt interceptor to refresh the token 10 minutes before expiry 2020-05-30 14:09:38 +05:30
Amritanshu Agrawal 8ae67863eb Voucher Post and Delete working!!
Also figured out why a lot of exceptions are generating 500 errors.
Those errors are again caught by the general exception catcher in the end and re thrown.
Need to fix this.
2020-05-30 12:06:37 +05:30
Amritanshu Agrawal 0177921e84 Disabled as it fucked with the return of Payment and Receipt as they had only one journal when sent to front end 2020-05-30 11:11:52 +05:30
Amritanshu Agrawal 9a1844100f Save file and upload file functions in vouchers de duplicated 2020-05-30 11:09:19 +05:30
Amritanshu Agrawal d49be23056 Merged payment and receipt routes and permissions into journal as they were not really needed. 2020-05-30 11:08:42 +05:30
Amritanshu Agrawal 10dbe6663d DbImage works!!
Credit Salary works!!

Refresh router created, now need to use it in angular

Errors should now show up in the frontend.
2020-05-30 01:58:17 +05:30
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 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 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