Commit Graph

533 Commits

Author SHA1 Message Date
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
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 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 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 c341e58d63 Fix: Handle uploading of new fingerprint file
Chore: Used Black formatter
2019-04-06 09:43:12 +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 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 f8162f364d Fix: Changed formula of Service Charge to update the new way of keeping accounts
Fix: Changed the limit of ESI in line with govt. regulations
2018-07-16 17:59:15 +05:30
tanshu 1c10eec4ca Fix: isStarred was not set in empty employee and thus error in Save 2018-07-16 16:59:59 +05:30
tanshu adb7f25c9f Fix: InitDB Console script added to setup.py 2018-07-14 18:31:13 +05:30
tanshu 29b81cbd21 Fix: Employee was not saving because of isStarred, added that functionality to employee 2018-07-14 10:52:39 +05:30
tanshu 9f4eb334d7 Chore: Renamed the Ledger Table to Account
Chore: Renamed the Ledger Model to Account
Chore: Renamed LedgerType to AccountType
Chore: Renamed all properties of Account table to lowercase with underscores

Feature: Starred Accounts and their entries do not delete during a rebase.
Info: Starred Vouchers still delete. They can be starred, but have no effect.
2018-07-07 16:31:44 +05:30
tanshu 8996516978 Added loading bar
Fixed product, account and employee details for add new.
2018-06-10 13:58:01 +05:30
tanshu 6be1dd5a3a Moved to Angular 6.0
----

Pending
* Table width for the points column in incentive
* Linting
* keyboard navigation where it was used earlier
* can remove the unused totals calculated serverside in productledger
* spinner and loading bars
* Activate Guard for Employee Function tabs
* Progress for Fingerprint uploads
* deleted reconcile and receipe features as they were not being used
* focus the right control on component load
2018-06-09 17:05:11 +05:30
tanshu b3cb01da02 Moved the app into src/ directory to in preperation for angular 2018-05-18 13:38:55 +05:30
tanshu da8a148544 Package.json updated with postinstall 2018-05-18 12:47:30 +05:30
tanshu 552781b5c6 Fix: Delete confirmation was borked for all except Journal. 2018-05-18 12:19:40 +05:30
tanshu 98e97f63c0 Manual bootstrapping 2018-05-15 15:06:04 +05:30
tanshu d6aab88ce8 Moved base.html to index.html 2018-05-15 14:38:30 +05:30
tanshu 62fe28f25e Added ngLocale for India 2018-05-15 09:11:07 +05:30
tanshu 7209eeef5b Fix - didn't update base.html to show username based on Credentials and not $rootScopt 2018-05-15 01:09:15 +05:30
tanshu dc0c21a841 Removed mdDateLocaleProvider accidentally left on removal of ngMaterial 2018-05-15 01:00:35 +05:30
tanshu 9464117a2f Removed ngMaterial dependency 2018-05-15 00:39:21 +05:30
tanshu f3c1bfa57b - Started using TypeScript
- Using SystemJS as Module Loader
 - Auth and Permissions moved to Credentials.service from $rootScope
 - Toasts moved to Messages.service
 - Massive Changes
 - Sprint 1 done to move to Angular.io from AngularJS
 - Should be fully working!! :)
2018-05-15 00:11:28 +05:30
tanshu d05625ba39 Separated all controllers into their own files 2018-05-09 17:53:29 +05:30
tanshu ec9798f401 Changed the way Controllers are defined and DI 2018-05-09 14:29:40 +05:30
tanshu 00c0d1d46a Upgraded to Angularjs 1.6.9 2018-05-09 14:26:15 +05:30
Amritanshu Agrawal aeead4db76 Update 'brewman/views/auth/user.py'
dbsession was incorrectly spelt in add_groups
2017-10-10 06:21:05 +00:00
tanshu a2fbebca07 Fix: Employee Functions / Credit Salary 2017-02-13 17:24:05 +05:30
tanshu 00b81a7cb9 Fix: Memoize would for some reason would crash instead of updating 2017-02-13 10:40:30 +05:30
tanshu a77293e0b2 Fix: Would not navigate as the search was referencing unresolved variables. 2017-02-10 13:33:40 +05:30
Gogs 374664e9ab Forgot to close tags in getters/setters 2017-02-10 06:15:45 +00:00
Gogs 52997f7322 Forgot to add getter/setter tag to record date pickers in employee functions 2017-02-10 06:10:05 +00:00
tanshu 57624c2804 Cash Flow updated with opening and closing cash balance 2017-02-10 00:09:32 +05:30
tanshu 2ac10f16c3 Fix: Employee Functions 2017-02-09 19:22:19 +05:30
tanshu c09515fbfe Fix: Employee Attendance and Account Detail 2017-02-09 19:02:20 +05:30
tanshu e3d60f8c53 Fix: Forgot to add route for static/app 2017-02-09 10:57:41 +05:30
tanshu 1468d43144 Chore: Changed layout to confirm better with the Style Guide 2017-02-09 10:49:53 +05:30
tanshu 90c8e50cfa Upgraded to Bootstrap UI v2.5.0
Upgraded to Bootstrap v3.3.7
Had to prefix Typeahead and Datepicker with uib
Had to convert dates from String to Date object in all files for the datepicker
2017-02-09 09:18:16 +05:30
tanshu 5a2278add5 Added: Tax LedgerType
Change: Changed unused is_current LedgerType to CashFlowClassification so that cash flow can be properly classified
Fix: Account update (missing get_code function)
Chore: Upgrade to angular 1.6
Feature: Change Cash Flow to new format to match international guidelines.  Still a work in progress.
Fix: Removed memoizing doFilter in the Tokenizer Service as it was giving errors. There is not that much processing, so it may also not be required. Will judge the impact later.
2017-02-06 13:09:15 +05:30
tanshu 71898ceca7 Feature: In journal, balances are only shown for Accounts which appear in the Balance Sheet 2016-12-24 17:40:42 +05:30
tanshu 0ff8397a4c Fix: Images could not be attached with vouchers as lodash depreciated the "any" function in v4.0 2016-12-24 17:22:36 +05:30
tanshu be8f71259c Changed: Moved from global DBSession to dbsession injected into request
Version: Bumped to 4.0
Added: Dependency of pyramid_tm
Changed: Changed from ACL Authorization to custom Permission Authorization Policy
Using more of inbuilt functions. This should reduce the number of DB hits and improve performance
2016-12-24 17:11:01 +05:30
tanshu 569da5a69e Refactor: Moved routes to their own file. 2016-12-22 19:18:40 +05:30
tanshu 65d95308ae Fix: Edit is Payment/Receipt was not working as mathSolver was not injected 2016-12-21 12:30:54 +05:30
tanshu e56b35dd53 Journal / Payment / Receipt forms show Account balances when account is selected.
Journals Validation now checks for negative amount and not just signed amounts.
Journal form supports negative amounts by changing the Debit / Credit.
Removed Messaging and Dashboard from Home screen and all its dependencies
 - Ace Editor
 - D3
 - Chosen

Moved from TryCatch Decorator to View deriver, it is available in Pyramid 1.7+ and the decorator is not working.
Updated Lodash to 4.17.2 (online hosted)
Updated Loading Bar to 0.9.0
Updated Moment.js to 2.17.1
Updated Mousetrap to 1.6.0
2016-12-16 18:57:06 +05:30
tanshu 0fecc02e1a Feature: Math Solver for the Amounts in Journal, Payment and Receipt. 2016-12-04 13:02:37 +05:30
tanshu c90651aa8c Disabled autocomplete
Autocomplete has been disabled by setting the autocomplete="off" tag in
each form.
2016-12-04 11:34:44 +05:30
tanshu da11ab8bc7 fix: Sort Permissions in Group List 2016-10-14 16:03:15 +05:30
tanshu 4529cd5fca Sort Permissions in Group List 2016-10-14 15:51:06 +05:30
Gogs b90f1294b0 Fix: Forgot to import servicecharge in rebase 2016-09-25 03:18:38 +00:00
Gogs a58ab4b6f3 Using https link in base.html 2016-09-25 03:16:14 +00:00
Gogs 824e20ab78 Updated rebase to delete ServiceCharge 2016-09-25 03:14:39 +00:00
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 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
Amritanshu 09a27e099e Fix: Error in ledger where show results were not updated as the $watch was only for hidden items and did not detect and filter the change in the list.
Fix: Error in ledger where if an entry was selected, if show button was triggered using the return key, it would open that entry instead of loading data
2014-06-12 01:30:21 +05:30
Amritanshu d99fc89e34 Chore: Variable renaming in JavaScript to camelCase
Feature: Keyboard navigation in Accounts, Employees and Product List.
Chore: Removing unused JavasScript variables in function for JSHint
2014-06-09 13:08:36 +05:30
Amritanshu 1989c54e92 Fix: Spelling in ProductYield 2014-06-07 13:37:19 +05:30
Amritanshu 791b41437d Feature: Search on Yield in Product List 2014-06-07 13:35:33 +05:30
Amritanshu 2fa7e33383 Fix: Error in Product Detail Controller 2014-06-07 13:27:10 +05:30
Amritanshu 1d03a590ec Fix: journalDebit comparison was wrong 2014-06-07 12:28:55 +05:30
Amritanshu f667481d71 Chore: Major variable renaming from python style underscores to camel case.
Chore: Replace undefined checks with angular.isUndefined
2014-06-06 16:09:32 +05:30
Amritanshu 358b235d8f Chore: Removed redundant Running Total calculation from Ledger python view as it is not calculated client side. 2014-06-04 19:07:58 +05:30
Amritanshu 248a841695 Feature: Keyboard navigation in ledger with Remove and Undo. 2014-06-04 16:02:33 +05:30
Amritanshu 4e85d97e47 Feature: Images of vouchers can be uploaded with vouchers for verification.
Note: Massive breaking changes in how vouchers are uploaded.  Make sure that the client-side code is not cached.
Also, need to implement Database Integrity to check for orphan images.
2014-06-03 17:12:52 +05:30
Amritanshu 2201a90278 Fix: Do not throw error if not flags are allowed. 2014-05-28 16:47:03 +05:30
Amritanshu e8f4931d29 Fix/Feature: Tokenizer improved to support flags and files missed in last commit updated. 2014-05-28 16:43:52 +05:30
Amritanshu fb8e217c81 Feature: Filtering and sorting in Products and Accounts list pages. 2014-05-28 13:17:06 +05:30
Amritanshu 811ec89c62 Feature: Searching and sorting in product works perfectly. Will work now to refactor it to make it usable. 2014-05-27 19:40:13 +05:30
Amritanshu b1aa130421 Fix: Other instances of Capitalized labels. 2014-05-27 12:18:09 +05:30
Amritanshu eb63166f39 Fix: in the current sqlalchemy non-lowercased labels are not being quoted causing an error. 2014-05-27 12:01:45 +05:30
unknown 17750f7721 Fix: Due to some reason, sqlalchemy on webfaction was not escaping upper case labels in sql statements. Fixed now. 2014-05-25 16:14:28 +05:30
Amritanshu c419b3ae2e Fix: hopefully the reloading bug on onReturn now fixed 2014-05-24 19:42:44 +05:30
Amritanshu 018391f733 Fix: For some reason, the last commit is not updating the webapp on webfaction. This is to try and fix it.
Chore: Bumped the version to 3.3
2014-05-24 19:15:45 +05:30
Amritanshu 29653b524a Fix: Bug in the onReturn directive which refreshed the page. 2014-05-24 18:51:22 +05:30
Amritanshu 1f8b6f0c63 Fix: Recipe quantity was not having any effect or being updated. 2014-04-30 13:42:31 +05:30
Amritanshu a5ec16b644 Fix: Product Yield needs to be > 0 and <= 1 2014-04-30 13:12:29 +05:30
Amritanshu 0436a5de2c Feature: Product list allows for displaying extended information and search bar shows the legend. 2014-04-30 12:13:21 +05:30
Amritanshu 30442ffecb Fix: Error is recipe quantity
Fix: Update did not change the recipe quantity, units, fraction, fraction_units
2014-04-29 16:54:54 +05:30
Amritanshu 35413166d4 Fix: Units not showing in recipe list
Fix: Recipe update gave error
2014-04-29 16:38:31 +05:30
Amritanshu 1448120941 Removed: Pyramid Debug Toolbar dependency removed.
Recipe: Recipe list and Add / Delete recipe created.
Breaking: Major updates to old databases needed as structure has changed significantly
Product table is not a inherited table similar to ledger table
table prefixes for entities removed
renamed a few tables
removed file types not used from the manifest
README.txt now contains the installation procedure on an Ubuntu 14.04 machine
Product.ShowForPurchase column removed
Product.Discountinued renamed to !Product.IsActive
2014-04-29 15:38:44 +05:30
Amritanshu 246f8465d7 Updates: Twitter Bootstrap updated to v3.1.1
AngularJS updated to v1.2.16
jQuery updated to v2.1.0
angular-loading-bar updated to v0.3.0
Lo-Dash updated to v2.4.1
mousetrap.js updated to v1.4.6
angular-ui bootstrap updated to v0.10.0 (the min file updated to point to the corrected location of the templates and the templates updated to match the latest needed)
chosen updated to v.1.1.0
2014-04-17 00:08:01 +05:30
Amritanshu d2e08d09cc Fix: On update issue, it will update price / discount / tax from the batch (if changed) 2014-04-08 13:13:24 +05:30
Amritanshu 69071182a3 Feature: The app checks if the database schema is not created and creates it automatially on first run.
Fix: While user login try to catch None password error.
Fix: Rename Yeild to the correct spelling Yield.
Fix: Wrong column type for IsReconciled in Voucher.
Fix: Redirect user on login to last page.
Fix: Validate input in save/update of employee and product
2014-03-12 22:49:29 +05:30
Amritanshu f4551c8b5a Fix: Error in purchase return where the check for batch date was wrong.
Fix: Added some common validation for inputs
Feature: created a to_uuid function which will return uuid if the string is correct else None to parse uuid inputs.
Fix: Proper modal template so that the modal is proper width
2014-02-08 14:42:57 +05:30
Amritanshu 89e1443b48 Feature: Charts in the dashboard for Cash Flow and Creditors using nvd3.js and d3.js
It is still a work in progress with not all charts supporting dynamic data.  But working enough to be put in production use.
2013-12-17 15:56:36 +05:30
Amritanshu e5f8a4f86f Feature: Added timeout / loading button for vouchers and a few other forms. 2013-12-17 15:48:22 +05:30
Amritanshu 66aca999e2 Fixed: Attendance update was broken due to wrong comparison. 2013-12-07 11:39:04 +05:30
Amritanshu 835e20bd30 Update: AngularJS 1.2.3, AngularUI 0.7.0, Loading bar 0.1.0 2013-12-03 04:03:06 +05:30
Amritanshu 4a65c58aed Fixed: Error is voucher_post and check_delete_permission due to changing from lock_date to lock_info
Fixed (maybe): Save product updated to gather better information in case of an error during save.

Signed-off-by: Amritanshu <tanshu@gmail.com>
2013-11-26 15:50:50 +05:30
Amritanshu d566493787 Fix: type in get_lock_info view 2013-11-26 13:58:38 +05:30
Amritanshu 8d5d7e6601 Feature: Added lock date from before/after and rolling lock dates. 2013-11-26 13:55:04 +05:30
Amritanshu 7ec55eb0aa Fixed: Update purchase failed when date was changed
Signed-off-by: Amritanshu <tanshu@gmail.com>
2013-11-26 12:55:27 +05:30
Amritanshu 1498e46302 Fix: Added try/catch to product delete as it would bork at times deleting products where narration would exceed the field length 2013-11-20 18:44:11 +05:30
Amritanshu 536bf27403 Feature: Created a tanClick directive which disables button on click while loading
Fix: Could not change the main ledger in payment/receipt edit
Fix: Added try/catch to client delete
2013-11-20 18:24:38 +05:30
Amritanshu d1a4fc1164 Updated: Angularjs to v1.2.0 final.
Updated: Loading-bar to v0.0.5
Updated: Using the $promise of function to return promises instead of $q and callback function.
2013-11-12 00:29:23 +05:30
Amritanshu 4ace61cdee Added: Purchases report 2013-10-30 12:50:32 +05:30
Amritanshu 76c7a7218b Fixed: Create user
Fixed: Delete client
2013-10-30 11:23:48 +05:30
Amritanshu 3fe3a7f7f3 Feature: Product deletion created including advanced delete.
Feature: Product list filtering created.
2013-10-14 23:23:00 +05:30
Amritanshu 2c714dfe98 Fixed: Issues were negative in Stock Movement 2013-10-14 15:16:21 +05:30
Amritanshu 8df9298724 Fixed: Stock Movement report showed purchase instead of issue 2013-10-14 15:11:33 +05:30
Amritanshu cc89a548a5 Feature: Created stock movement report. 2013-10-14 15:03:26 +05:30
Amritanshu bc7b4217cd Rebase: Moved the whole structure down one directory depth. 2013-10-14 09:29:57 +05:30
Tanshu 88b641b4f2 Feature: Debounced the filtering of employees to 350ms to make it smoother. 2013-10-07 13:21:59 +05:30
Tanshu ff3c375295 Fixed: Issue batch update failed because of wrong date check. 2013-10-06 16:14:54 +05:30
Tanshu 8bc0950e23 Fix: Right aligned numbers in issue 2013-10-06 13:24:22 +05:30
Tanshu 178fb90a6e Fixed: Issue grid not showing 2013-10-06 13:22:55 +05:30
Tanshu 8bb1579c1b Fix: Issue form had stopped working
Feature: Employee-list search saves query string on navigation.
2013-10-06 13:09:10 +05:30
Tanshu d3e3584e9b Fix: TryCatch added to Employee.delete view
Feature: Added filtering to employee-list partial
2013-10-06 11:43:23 +05:30
Tanshu db6b7a4881 Feature: Started using lo-dash for many javascript functions
Feature: Payment and receipt last account selected and choose it instead of cash in hand on history back.
Fix: Focus on account typeahead in payment and receipt.
Refactor: Refactored blank_voucher to use additional info only and to output chosen account in purchase / receipt

Signed-off-by: Tanshu <tanshu@gmail.com>
2013-10-05 17:15:36 +05:30
Tanshu 68a41da5bf Fixed: Batch date check was wrong and was causing and error. 2013-10-04 17:05:58 +05:30
Tanshu 5afe7ddd73 Feature: Stock reset built. It resets last batch for the closing stock value. 2013-10-04 16:53:06 +05:30
Tanshu 1def5873bc Fixed: Employees would not autocomplete. 2013-10-03 17:46:01 +05:30
Tanshu 218a1781a8 Feature: Discontinued Ledgers / Products will not show up in Vouchers reducing confusion. 2013-10-03 15:58:16 +05:30
Tanshu 62918bcee5 Feature: Account reconcilliation built.
Fix: Made most of the columns on entities_vouchers NOT NULL.
Fix: Renamed ReconcilliationDate to ReconcileDate NOT NULL
Fix: IsReconciled is the check on reconcilliation.
Feature: Changed output of formatted currency to numbers with formatting in html.
Feature: Html number formatting with indian locale info enables lakhs and crores formatting of currency.
TODO: Started work on reset stock.  Not working yet
TODO: Satrted work on Server-sent Events directive, not working yet
Feature: Created accounting, clr and percent filters
2013-10-03 15:42:43 +05:30
Tanshu f8bdf9d731 Feature: Batch is not allowed to be issued to a previous date. Only exception is if purchase is made in a new date, product issued and then the purchase is moved to an old date. Will fix that in future commit. 2013-10-01 16:52:21 +05:30
Tanshu 414a1717a5 Feature: Account rebasing built. 2013-10-01 16:52:21 +05:30
Tanshu cd3cfa4861 Fix: Fixed errors in purchase / purchase return / issue vouchers due to setting columns non-nullable 2013-10-01 16:52:20 +05:30
Tanshu 64c1820867 Feature: Deletion of active accounts and employees built.
Feature: Many columns made non-nullable to better safeguard data.
Fixed: Employee save/update did not work due to misplaced date check.
2013-10-01 16:52:19 +05:30
Tanshu 9c965727df Fixed: Prouct Ledger is fixed 2013-10-01 16:52:19 +05:30
Tanshu d452e2ada9 Added: Support for fixtures in Ledger, Employee, Product, ProductGroup and CostCenter.
Database updated accordingly.
2013-10-01 16:52:18 +05:30
Tanshu 55741f49c3 Commented out jQuery UI and Mousetrap as they were not needed.
Fixed: Error in purchase-modal where it picked up the product price and not the new price entered.
2013-10-01 16:52:00 +05:30
Tanshu 8f58f42aef class="pull-right" does not work for right-aligning column data.
Removed from balance-sheet.  Will fix later
2013-10-01 16:51:58 +05:30
Tanshu ca8004015d Updated to Angular 1.2-rc.1 (at the moment rc.2 is not working with datepicker and typeahead of angular ui)
Using angular-ui for datepicker and typeahead.  Modified the source to set template folder in the root and not path relative.
Updated to twitter bootstrap 3.0.0
No longer using the offline.appcache method.  Using simple resource cacheing.

Profit & Loss split into Profit & Loss / Balance Sheet
2013-10-01 16:51:41 +05:30
Tanshu 909b468c9d Added a keypress directive.
Updated the Ledger html and controller to work with keyboard shortcut.
Still have to implement Remove entry and restore entry in ledger.

Signed-off-by: Tanshu <tanshu@gmail.com>
2013-10-01 16:51:07 +05:30
Tanshu b3ece30300 Added: Net Transactions report. Need to add roles in the Roles table in db.
Fixed: Single Client page gave 404 when opened directly

Add role query:
insert into auth_roles ("RoleID", "Name") VALUES ('2c40f7cf-67fc-4efa-a670-8d16a2e7884d', 'Net Transactions');
2013-07-11 17:55:51 +05:30
Tanshu d187c1ee2f Added settings table to store user settings.
Added settings page, view, route and controller.
Added lock_date setting to prevent changes to voucher upto and including that date.

The sql for this update is:

CREATE TABLE settings (
	"SettingID" UUID NOT NULL,
	"Name" VARCHAR(255) NOT NULL,
	"Data" BYTEA,
	PRIMARY KEY ("SettingID"),
	UNIQUE ("Name")
);

INSERT INTO auth_roles ("RoleID", "Name") VALUES ('d52de0be-9388-4b0b-a359-7e122ab6e53a', 'Lock Date');

Signed-off-by: Tanshu <tanshu@gmail.com>
2013-07-08 01:33:02 +05:30
Tanshu 30a38f7ed9 Updated Thread / Messaging to show unread / read messages
Showing subscribers in main.html
Messages are considered read when the message is opened by the user.
Fixed error left from before where batch date was not updated on updating purchase voucher.
2013-06-24 13:53:51 +05:30
Tanshu a2587cda60 Fixed critical error in Batch table 2013-06-21 16:27:27 +05:30
Tanshu 5972dd6b75 Updated batch to use a date instead of string as name.
to update this step, also execute the following sql in the database.

update entities_batches set "Name" = '01-Jan-2012' where "Name" = 'Old Products';
alter table entities_batches alter column "Name" type timestamp without time zone using "Name"::date;
2013-06-21 16:20:50 +05:30
Tanshu eae7220651 Error updating thread fixed. 2013-06-21 15:34:44 +05:30
Tanshu 1bd079ae74 Error where new thread could not be created because the check of old was wrong. 2013-06-21 15:12:01 +05:30
Tanshu 89e6f347cd Updating subscribers of threads now works. 2013-06-20 19:02:51 +05:30
Tanshu b9845a2dc1 Allowed superuser to edit posts in threads.
Catch IntegrityError in TryCatchDecorator
Check for duplicate title in threads
2013-06-20 14:28:35 +05:30
Tanshu c6c091bdcb Fixed error where wrong permission was checked while trying to update users. 2013-06-17 12:23:38 +05:30
Tanshu 69d6a76632 Fixed error where when super_user updated a Thread, it would always be maked closed and public 2013-06-08 14:39:07 +05:30
Tanshu 1fc2127835 Manifest added to MANIFEST.in 2013-06-07 19:15:55 +05:30
Tanshu 4629fbcacf Error in thread show_list fixed.
Updated jquery to 2.0.2
2013-06-07 19:13:58 +05:30
Tanshu 0ff8108ebe Allow filtering of Threads based on open / closed / all on home.html 2013-06-07 18:47:15 +05:30
Tanshu 970eea2979 Thread subscribers working.
TODO: Implement thread read status per user.
TODO: Implemented edit post functionality for privileged user.
2013-06-07 15:55:12 +05:30
Tanshu 6bf884da66 Hopefully now the probem displaying thread age should be fixed.
Default arguments of python funtions are evaluated only on definition time.

Signed-off-by: Tanshu <tanshu@gmail.com>
2013-06-07 14:57:56 +05:30
Tanshu d111c7b41c Angular_filter for localTime error fixed when input is undefined. 2013-06-06 23:53:53 +05:30
Tanshu 5ceb4e8f0c Hopefully show proper creation / last edit time in vouchers. 2013-06-06 23:47:04 +05:30
Tanshu 7650fffea0 get_age made more robust plus fixed minutes error.
Made Voucher.creation_date, last_edit_date and Attendance.creation_date tz aware
2013-06-06 23:24:27 +05:30
Tanshu 01298ebadb Fixed password change not allowed for non Privilaged users.
Fixed storing utc dates in message tables.
Created utc class for time-aware dates.
Updated home to show age of Threads and open in new window available.
Modified message detail template to show editable by privileged user.
Added subscribers to thread detail.
Improved markup for message-detail to use less space.
Improved the chosen directive for when there is no create option.
Added method 'Names' to user resource for use in message subscribers.
Payment and Receipt clear typeahead on adding ledgers.


TODO: Implement thread read status per user.
TODO: Implemented edit post functionality for privileged user.
TODO: Implement thread filtering on main page for subscribers

Signed-off-by: Tanshu <tanshu@gmail.com>
2013-06-06 16:56:05 +05:30
Tanshu d5dcd392f7 Error in message-detail.html partial
Public and Closed checkboxes should now be working.
Delete button in message-detail.html was accidentally left, removed.
Removed cacheing from an-autocomplete.
Message list now returns tags list also.
2013-05-30 18:28:41 +05:30
Tanshu 86b5beaa0d Added new styles based and layout
Update home list style to use widgets from the unicorn theme.
Creation Date is now formatted using filter to show local time.
2013-05-30 16:52:51 +05:30
Tanshu 37acebca06 Critical error in routes for api_tag_list fixed. 2013-05-29 13:35:12 +05:30
Tanshu 6225da9ec8 Added the full messaging module.
Added ace.ajax.org editor for messaging.
Added showdown for showing markdown in messaging.
Added chosen for multi-select tags.
2013-05-29 13:28:37 +05:30
Tanshu 762ff27ffc Updated json renderer to pyramid 1.4 format 2013-05-19 17:09:14 +05:30
Tanshu fa95e79e0f Updated the typeahead directive to cache queries. 2013-05-18 15:03:50 +05:30
Tanshu 572a630520 Added client enable / disable / rename form.
Fixed compile error in Purchase Return
2013-05-18 13:22:39 +05:30
Tanshu 1a4a136058 Hopefully fixed purchase return update journal. 2013-05-18 12:42:38 +05:30
Tanshu 9db47afb7a Now hopefully fixed 2013-05-18 12:23:44 +05:30
Tanshu 8985f1213a Fixed again 2013-05-18 12:18:02 +05:30
Tanshu 6e6113436b Error in Purchase Return where journal amounts do not match due to rounding fixed. 2013-05-18 12:13:06 +05:30
Tanshu 867935306d Changed the toasts to Growl notifications which floats. 2013-05-17 23:56:48 +05:30
Tanshu ec45880dea Forgot to add to user_list view. Fixed 2013-05-16 14:55:07 +05:30
Tanshu 1bf0914389 Updated bootstrap to v2.3.1 2013-05-16 14:43:41 +05:30
Tanshu bff0ef7ff9 Fixed employee_code references to employee_id in Fingerprint and related functions.
Updated windows install guide.
2013-04-17 14:08:09 +05:30
Tanshu ddd6883172 Made the model User.by_name() case insensitive 2013-04-15 12:43:33 +05:30
Tanshu eaa32d9c3a removed database trasfer code. 2013-04-15 00:24:57 +05:30