Commit Graph

655 Commits

Author SHA1 Message Date
Tanshu
5f4e96be88 Forgot to add fingerprint.py to the repository. 2012-11-30 23:22:32 +05:30
Tanshu
8331b18cce Added fingerprint import.
Fingerprint shows in attendance forms.
Upated the fingerprint table.  MUST EXECUTE SQL.
2012-11-30 22:53:16 +05:30
Tanshu
1cb0347c86 Merge branch 'master' of hopsngrains.com:webapps/git/repos/brewman 2012-11-29 18:40:54 +05:30
Tanshu
93efa15bd1 Added styles and dirty check for attendance.
UserCtrl is minifiable.
User route now works with names.
Fixed Payment / Receipt partials broken due to autocomplete changes.
2012-11-29 18:39:26 +05:30
Tanshu
cd408e3cde Added styles and dirty check for attendance.
UserCtrl is minifiable.
User route now works with names.
2012-11-29 15:47:16 +05:30
Tanshu
ecbbf65feb Merge branch 'typeahead' 2012-11-28 21:37:33 +05:30
Tanshu
5a28d9717b Changed the autocomplete from jQuery to Bootstrap.typeahead
Added DeepLabel factory to get values from inside nested json objects.
Split SalaryDeductionController into its own file.
2012-11-28 21:36:17 +05:30
Tanshu
105f72f50f Updated .gitignore to ignore egg-info 2012-11-28 17:18:04 +05:30
Tanshu
38b7f941d5 Fixed minor errors in SalaryDeduction 2012-11-28 16:11:00 +05:30
Tanshu
73b5520c4c Changed size of narration box. 2012-11-28 13:30:31 +05:30
Tanshu
055b208a08 Merge branch 'esipf' 2012-11-28 13:29:10 +05:30
Tanshu
f60cca97e6 Added salary deductions model / route.
Updated import queries to support deductions.
Added esi_pf expense and payable ledgers to LedgerBase.
2012-11-28 13:28:16 +05:30
Tanshu
517b56431a Removed redundant operations.
Removed Unnecessary update in Journal model.
Added refresh button to Unposted page.
Base, Account, Attendance, Journal, Login, Logout, Unposted,  Controllers are Minifiable.
Modal Service and Directives are Minifiable.
Fixed EmployeeAttendanceCtrl.
Fixed Save Account. Added validation to vouchers.
Added rounding to Journal Voucher.
Purchase now updates product price.
2012-11-20 23:21:10 +05:30
Tanshu
bb820febff Added client list, full management pending.
Added limiting of clients via cookies.
Added Attendence report download and credit salary in employee functions.
Renamed get_by_id and get_by_name in User, Group and Role models.
Added salary staff account in LedgerBase.
Voucher validation to be checked.
Added csv renderer for downloading csv files.
Added ngCookies module to process ClientID in login form on client side.
Modified the datepicker directive to process model properly.
Fixed Employee Attendance, was broken.
Allowed batch quantity to increase in multiple entries of same product batch in issue.
Ledger report would not reload data if ledger and dates were not changed, fixed that.
2012-11-09 00:13:04 +05:30
Tanshu
48c4d79bdf Removed redundant routes.
Removed code from voucher, cost center,
Changed the clean-table css to only add color and nothing else.
Added Reconcilliation Date to voucher.
Added rounding to two in amount and quantity to combat sqlalchemy storing decimals as floats.
2012-11-06 20:37:53 +05:30
Tanshu
c8ea23ca13 Removed redundant routes in pyramid.
Major changes to the autocomplete directive.
Modified autocomplete to use Angular Resources and target Attributes not Elements.
Edit in Purchase is not showing the right rate or amount.
Removed autobatch directive as it was no longer needed.
Added autocomplete method to resources for use in autocomplete.
Removed redundant print / console.log debug statements.
Purchase Return edit done.
Issue editing done.
2012-11-05 16:37:30 +05:30
Tanshu
16bbf37601 Added the Clents table to restrict the webapp on allowed clients via 10 yr long cookies and otp for intitial activation.
Added the reconcilable column to ledgers table for future implementation of reconcile account feature.
Purchase return should work now at.
Changed the class of add button in voucher forms to btn-info
Edit in Payment and Receipt should be working now.
JS Code Cleanup including missing ';', etc.
Added 'use strict'; to all js files
Added came_from in login in AngularJS.
Fixed error in purchase where it would look for purchase_ledger instead of ledger of product.
Added 'Clients' permission which is allowed remote logins and to authorize/deauthroize clients
Added JDBC Sqlite provider for use in PyCharm
2012-11-04 15:27:46 +05:30
Tanshu
bccad85099 Login was not angular, made it angular.
Editing entries in journal.html built.
modal-service.js now supports loading partials from urls.
Redirect from login to came_from enabled.
Created getOldJournal in JournalCtrl to enable editting of individual entries.
2012-11-03 14:55:12 +05:30
Tanshu
b990158554 Changed angular-1.0.2 to allow injection in resolve.
Dialog box for delete confirmation.
Fixed forbidden view as it is not compatible with xhr
2012-11-01 18:49:35 +05:30
Tanshu
56f2892c0f Reorganized 2012-10-30 13:35:52 +05:30
Tanshu
3f32344334 Fixed create user.
Fixed bugs in voucher forms.
2012-10-29 22:17:22 +05:30
Tanshu
412704a73e Converted most routes to use resolve.
Issue fixed (hopefully) :).
Error in payment / receipt resolved fixed.
2012-10-29 15:44:41 +05:30
Tanshu
7ab945464b Voucher permissions done (hopefully).
Backdated voucher check still pending
2012-10-29 01:02:22 +05:30
Tanshu
7594fd399a Product Ledger Role missed earlier, fixed.
Almost all reports are using resolve now to prevent flicker when data is loading.
2012-10-28 17:04:05 +05:30
Tanshu
44bab156f3 Employee functions dummy created.
Hopefully client side authorization fixed.
Post voucher fixed.
2012-10-28 15:40:33 +05:30
Tanshu
b1dd396556 database relocated.
Fixed permissions in html partials
2012-10-26 23:24:59 +05:30
Tanshu
0ad7dbbcb5 resolve: Daybook.js
Fixed incorrect css in a few forms
Resolve problem in Controllers where was wrongly returning the resource
Added permissions to controllers
2012-10-26 22:44:58 +05:30
Tanshu
4ee55a43aa Attendance and employee attendance working now.
Upgraded to twitter bootstrap 2.1.1
Table formatting using twitter table
Cleaned up old cruft.
Had accidently misplaced BaseController, fixed.
base.mako made fully html.
Changed certain permissions from specific to authenticated, need to check further such problems and change them.
They prevented the user from vieweing lists in other forms.
2012-10-26 01:03:57 +05:30
Tanshu
71c30ca04c Auth worked into Angular services.
Removed the templates of the nav bar and integrated into the base page
Removed helper module
Fixed auth model for wrong username.
Updated to anuglar 1.0.2
Closing stock with resolve.
Login with controller
2012-10-25 15:41:33 +05:30
Tanshu
27c97cbf88 Auth Group done.
Employee done.
ACL dynamically done.
VoucherFactory to be done.
2012-10-23 17:09:55 +05:30
Tanshu
4ffa033fd3 Drop Tax table.
Closing Stock and Raw Material Cost Reports working.
Added spinner for long ajax operations with interceptor.
2012-10-22 19:23:58 +05:30
Tanshu
c85b8669bd Fixed to use LedgerBase not Ledger in reports as that excluded salary accounts.
Some cleanup.
2012-10-18 00:18:20 +05:30
Tanshu
6edd04b817 Dropped Taxes table and changed script to modify ledgers.
Profit and loss fully done in new style.
2012-10-18 00:07:32 +05:30
Tanshu
a9aa9bd6ae Profit and Loss working / but working on a major rewrite. 2012-10-17 16:23:55 +05:30
Tanshu
f627fb1303 Employee list/add/edit done. 2012-10-17 13:27:14 +05:30
Tanshu
83a87c799d Daybook done.
Unposted Entries done.
2012-10-17 01:32:01 +05:30
Tanshu
d221a4f4e9 Cash flow done. 2012-10-17 00:21:43 +05:30
Tanshu
16b2e8dd51 Split the App js out or autocomplete.js into its own file.
Removed dead routes not in use.
Made the Home view angular.
Product Ledger is not Angular
2012-10-16 15:02:36 +05:30
Tanshu
9efcefe31e Purchase working
Issue sort of working, have to set the location for date and costcenters, but otherwise working mostly
updated product service to confirm with new db structure
2012-10-14 04:36:34 +05:30
Tanshu
89600d2cab Receipt Done 2012-10-13 20:04:40 +05:30
Tanshu
cf0da7e309 Purchase, Trial Balance, Journal, Product Group done.
Voucher Posting fixed.
2012-10-13 19:36:34 +05:30
Tanshu
eb8568b471 Dropped many columns for Prodct Table.
Merged product and account menu on page top.
Product working now.
2012-10-12 02:30:36 +05:30
Tanshu
a71999e3c8 Cost Center Done 2012-10-12 00:29:11 +05:30
Tanshu
0be9ce91d9 Added route for user management
Removed route for user groups and related views / templates
User management created.
Updated journal to full angular with routes
Added User service in angular
Added Journal Route.
Changed auth in BaseCtrl to use Permission service and do away with function.
2012-10-11 23:31:04 +05:30
Tanshu
427f667f3a Altered the convert sql to drop ParentLedgerID from Ledgers
Changed Ledger to Account in ui and made the list and detail form + view angular.
Added partial static view for AngularJS templates
Added services / routes for user permissions and account types
Removed post_voucher and delete_voucher route as they are no longer needed
Added Account / Ledger / Permission / Cost Center / Account Type service in angular
Added routes for /Accounts
Disabled the debug toolbar
2012-10-11 17:26:51 +05:30
unknown
9ef3f751f9 Voucher Service moved into its own directory.
Journal / Payment / Reciept / Purchase / Issue should be complete.
2012-09-12 13:52:28 +05:30
unknown
d2dc97695f Created Voucher Service to Get / Update / Delete / Post vouchers.
Moved all code to the service view.
Product Autocomplete Service returns price as well.
Ledger Service simplified.
Cost Center Service updated to return grid for AngularJS.
Moved common code to BaseCtl.
Working on Issue page.
Toasts now working fully.
Need to check for Journal/Inventories as undefined in all forms for all $watches as Service methods replace voucher with new {}.
Removed Code column from Batch.
Routes updated for the changes.
2012-09-10 17:52:24 +05:30
unknown
f5e47ef3ac changed json renderer to allow proper encoding uuid and decimal.
updated the database.
added sql server to sqlite converter and change scripts.
removed code from batch.
journal/payment/receipt/purchase should be working fully.
updated bootstrap to 2.1.0
removed rootscope to add intital data to the controller via global variables.
cannot update the environment because distribute on windows does not update on virtualenv.
2012-08-28 13:19:21 +05:30
unknown
e580e6d2da Journal working fully along with Payment. 2012-08-23 22:30:27 +05:30
unknown
d7789642c1 Journal virtually complete using AngularJS.
Footer / update amount input on add / delete / update with remaining amount left.
2012-08-23 13:09:01 +05:30