Saurabh
|
52c2affc9c
|
[fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts
|
2016-06-28 14:41:48 +05:30 |
|
Saurabh
|
9a6c6663c1
|
[minor][fix] throw if payment modes are not set
|
2016-06-27 18:16:07 +05:30 |
|
Saurabh
|
82b8b38b3d
|
[fix] fix filter in previous link mapper
|
2016-06-27 17:51:29 +05:30 |
|
Rushabh Mehta
|
d362b734a2
|
Merge pull request #5529 from saurabh6790/module_flow
[fix] previous document links
|
2016-06-27 17:23:46 +05:30 |
|
Saurabh
|
93d68ac0c2
|
[fixes] change is group to check box
|
2016-06-27 17:16:56 +05:30 |
|
Saurabh
|
99892c7ce7
|
[fix] provision to convert group to ledger and vice versa
|
2016-06-27 17:16:56 +05:30 |
|
Rohit Waghchaure
|
d6c986da8f
|
[Enhancement] Time log wages and multiple active salary structure
|
2016-06-27 16:46:39 +05:30 |
|
Saurabh
|
b6d6b8420d
|
[fix] add filters and child doc name in previous link mapper
|
2016-06-27 14:48:26 +05:30 |
|
Saurabh
|
2a0b111726
|
[fix] mark completed docuemts on document flow
|
2016-06-27 12:28:55 +05:30 |
|
Saurabh
|
8f24ecb173
|
[fix] set previous doc links for document flow
|
2016-06-27 12:28:55 +05:30 |
|
Saurabh
|
78333c7e07
|
[fixes] check group condition
|
2016-06-26 14:27:46 +05:30 |
|
Saurabh
|
7fecb50360
|
[enhance] rename warehouse account type to stock
|
2016-06-26 14:27:46 +05:30 |
|
Rushabh Mehta
|
723cd64249
|
[fix] tree view hooks and patch fix
|
2016-06-25 18:30:03 +05:30 |
|
Nabin Hait
|
7b6cdf4a63
|
Merge pull request #5518 from saurabh6790/warehouse_tree
Warehouse tree
|
2016-06-25 13:49:15 +05:30 |
|
Saurabh
|
dc2fa86222
|
[fixes] rename ctype to doctype
|
2016-06-25 11:16:55 +05:30 |
|
Saurabh
|
3a0f96bd00
|
[patch] patch to move all warehouses under all warehouse group
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
4d02949814
|
[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
ec8babe7ac
|
[minor][fix]
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
1702273968
|
[fix] rename account browser and sales browser to tree/doctype for view
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
ac53357f53
|
[fixes] renamed _treeview to _tree
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
a9ba7343c4
|
[fix] deprecate browser pages for accounts, cost_center, sales , bom, item group
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
554f6f70aa
|
[fixes] nested set fix for warehouse, tree for accounts and cost center
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
0e47bfeb16
|
[enhance] treeview to BOM, sales person, Cost Center and Chart of acounts
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
777f556b14
|
[fixes] set default values to cheque print and set background image only if attachment exist
|
2016-06-23 20:25:37 +05:30 |
|
Nabin Hait
|
a531ebea8a
|
Merge branch 'master' into develop
|
2016-06-21 16:44:05 +05:30 |
|
Rohit Waghchaure
|
c65c38d293
|
[POS] Minor fixes
|
2016-06-16 11:49:37 +05:30 |
|
Rushabh Mehta
|
2cb7a9f235
|
[ux] taxes table editable
|
2016-06-15 16:45:03 +05:30 |
|
Rohit Waghchaure
|
9fe40d557f
|
[POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes.
|
2016-06-14 01:11:09 +05:30 |
|
Rushabh Mehta
|
e0686b32f3
|
[minor] cleanups
|
2016-06-10 12:38:52 +05:30 |
|
Rohit Waghchaure
|
28c02fe51d
|
[Fix] POS page loading issue, if system has only one item
|
2016-06-10 00:48:03 +05:30 |
|
Anand Doshi
|
51ad436e16
|
[fix] sales and accounts browser name
|
2016-06-09 19:37:35 +05:30 |
|
Rushabh Mehta
|
cb29d9886c
|
[minor] fixes #5252
|
2016-06-08 17:31:11 +05:30 |
|
Rushabh Mehta
|
6e837599b1
|
[minor] added cost center to item wise sales register, fixes #5301
|
2016-06-08 16:35:10 +05:30 |
|
Anand Doshi
|
16e2442278
|
[cleanup] document flow
|
2016-06-07 18:55:23 +05:30 |
|
Saurabh
|
7d0e78d399
|
[fixes] this.frm instead of cur_frm
|
2016-06-07 17:19:36 +05:30 |
|
Saurabh
|
9df3d0fb8a
|
[enhance] show module flow on top of document
|
2016-06-07 17:19:36 +05:30 |
|
Rohit Waghchaure
|
690a0805f6
|
[Fixes] Purchase register, showing wrong value for total amount if tax has deducted.
|
2016-06-07 10:46:59 +05:30 |
|
Rushabh Mehta
|
eb1e0673e2
|
Merge pull request #5354 from saurabh6790/cheque_print
Cheque print
|
2016-06-02 17:48:58 +05:30 |
|
Rushabh Mehta
|
c5c0d96064
|
Merge pull request #5395 from saurabh6790/payment_request_ux
[enhance] ux fixes for payment request, added jinja for payment reque…
|
2016-06-02 17:48:36 +05:30 |
|
Nabin Hait
|
8e4ec8d84a
|
Merge pull request #5416 from nabinhait/tax_rule_based_on_county
Tax Rule based on County
|
2016-06-01 13:09:53 +05:30 |
|
Nabin Hait
|
cc07148336
|
Merge pull request #5428 from ShashaQin/patch-21
Update fiscal_year.py
|
2016-06-01 12:58:13 +05:30 |
|
Nabin Hait
|
9a5cf6000e
|
[fix] Test cases and editable fields settings for request for quotation
|
2016-06-01 12:54:26 +05:30 |
|
Nabin Hait
|
4eaeda710d
|
Tax Rule based on County
|
2016-06-01 12:54:26 +05:30 |
|
Rushabh Mehta
|
aa60fd9037
|
[fix] new_doc to frappe.new_doc
|
2016-06-01 11:46:33 +05:30 |
|
ShashaQin
|
5dd72fe196
|
Update fiscal_year.py
|
2016-06-01 11:39:53 +08:00 |
|
Nabin Hait
|
919b1b9d5b
|
Merge pull request #5408 from neilLasrado/hotfix-2
Fixed error in Gross Profit report
|
2016-05-31 17:41:19 +05:30 |
|
Nabin Hait
|
7ab088ed3f
|
Merge pull request #5414 from nabinhait/journal_entry_ux
Fetch party info in Journal Entry on selection of reference Invoice
|
2016-05-31 17:38:22 +05:30 |
|
Nabin Hait
|
6a110331e8
|
Merge pull request #5415 from nabinhait/company_permissions_fix
Ignore permissions for account/warehouse creation from Company
|
2016-05-31 17:38:08 +05:30 |
|
Nabin Hait
|
bb502f8588
|
Merge pull request #5417 from nabinhait/grid_editable_fields
[fix] Enabled editable fields in Budget
|
2016-05-31 17:37:36 +05:30 |
|
shreyas
|
2bb845e53f
|
[Fix] User allowed to delete the root account in Chart of Accounts
|
2016-05-31 17:15:28 +05:30 |
|
Rushabh Mehta
|
0dcb861b56
|
[minor]
|
2016-05-31 07:22:51 +05:30 |
|
Nabin Hait
|
37c53f0a04
|
[fix] Enabled editable fields in Budget
|
2016-05-30 18:20:31 +05:30 |
|
Nabin Hait
|
f169e5c04d
|
Ignore permissions for account/warehouse creation from Company
|
2016-05-30 12:15:36 +05:30 |
|
Nabin Hait
|
9fdd37e1ad
|
Fetch party info in Journal Entry on selection of reference Invoice
|
2016-05-30 11:49:16 +05:30 |
|
Neil Trini Lasrado
|
efccb8a704
|
Fixed error in Gross Profit report
|
2016-05-27 13:24:02 +05:30 |
|
Nabin Hait
|
0014aa9c26
|
[fix] Charts in report
|
2016-05-27 12:21:36 +05:30 |
|
Nabin Hait
|
591a5aba56
|
Added Project in GL Entry and General Ledger report
|
2016-05-26 17:51:20 +05:30 |
|
Nabin Hait
|
b46d021f2a
|
Charts on reports / activity page, deprecated financial analytics report
|
2016-05-26 15:26:01 +05:30 |
|
Nabin Hait
|
44c1b8e63b
|
Line/Bar chart in Balance Sheet / Profit and Loss statement
|
2016-05-26 15:26:01 +05:30 |
|
Nabin Hait
|
28bdff5a55
|
Pie chart for ageing analysis in accounts receivale/payable
|
2016-05-26 15:26:01 +05:30 |
|
Rohit Waghchaure
|
f2aa1764cc
|
[POS] enhancement and minor fixes
|
2016-05-25 15:04:46 +05:30 |
|
Saurabh
|
ed0816832d
|
[enhance] ux fixes for payment request, added jinja for payment request message
|
2016-05-25 11:55:30 +05:30 |
|
Rushabh Mehta
|
1885645d6d
|
[fix] [patch]
|
2016-05-24 16:10:21 +05:30 |
|
Saurabh
|
81501ddc6d
|
[fixes] add setting to mark cheque account pay only
|
2016-05-24 10:28:14 +05:30 |
|
Saurabh
|
2fc0ffad34
|
[fixes] js templating to get cheque print view
|
2016-05-24 10:28:14 +05:30 |
|
Saurabh
|
9ca9f2d551
|
[Fixes] UX fixes
|
2016-05-24 10:28:14 +05:30 |
|
Saurabh
|
bb95d36218
|
[fixes] field re-structuring
|
2016-05-24 10:28:14 +05:30 |
|
Saurabh
|
1b62ecea44
|
[enhancement] cheque print
|
2016-05-24 10:28:14 +05:30 |
|
Nabin Hait
|
79ddf67289
|
Merge pull request #5362 from nabinhait/budget
Budgeting
|
2016-05-23 17:56:42 +05:30 |
|
Nabin Hait
|
8f70370457
|
Chart of accounts fixed for Spain
|
2016-05-23 17:41:51 +05:30 |
|
Nabin Hait
|
03b08e7a91
|
[fix] Period closing voucher
|
2016-05-23 16:28:39 +05:30 |
|
Nabin Hait
|
832988e2fd
|
test case fixed
|
2016-05-23 13:04:26 +05:30 |
|
Nabin Hait
|
ca90963d5b
|
Redesigned budgets
|
2016-05-23 13:04:26 +05:30 |
|
Nabin Hait
|
b9bc7d6df3
|
[feature] New document for Budget
|
2016-05-23 13:04:26 +05:30 |
|
Rushabh Mehta
|
d0cee1b61b
|
[fix] minor fixes to pos
|
2016-05-20 12:54:59 +05:30 |
|
Rushabh Mehta
|
40b3a5bcc4
|
[optimize] communication query for heatmap
|
2016-05-20 12:54:59 +05:30 |
|
Nabin Hait
|
563bd056d7
|
Merge branch 'master' into develop
|
2016-05-20 12:18:28 +05:30 |
|
Nabin Hait
|
3956c94bbb
|
Merge pull request #5340 from rohitwaghchaure/support_week_new
[Fix] Sales Invoice shows default date while no default mentioned
|
2016-05-20 12:06:22 +05:30 |
|
Nabin Hait
|
5dfcfc5606
|
Merge pull request #5366 from saurabh6790/set_default_bank_acc_in_bank_reco
[fixes] set default bank account in bank reconciliation statement report
|
2016-05-20 11:36:44 +05:30 |
|
Rushabh Mehta
|
532eedf411
|
[enhance] more editable grids
|
2016-05-19 18:22:49 +05:30 |
|
Rohit Waghchaure
|
d818bcd888
|
[Fixes] tax rule, tax rule working even if tax template inside the rule is disabled.
|
2016-05-19 16:53:01 +05:30 |
|
Saurabh
|
c0c8af06da
|
[fixes] set default bank account in bank reconciliation statement report
|
2016-05-19 12:32:08 +05:30 |
|
Nabin Hait
|
1daebc04d0
|
Merge pull request #5360 from neilLasrado/hotfix
Fixed reports
|
2016-05-18 10:39:19 +05:30 |
|
Neil Trini Lasrado
|
4668a69cf5
|
Fixed reports
|
2016-05-17 19:04:08 +05:30 |
|
Rohit Waghchaure
|
5d97d89a03
|
[Fix] Sales Invoice shows default date while no default mentioned
|
2016-05-17 15:13:17 +05:30 |
|
Nabin Hait
|
a09285122f
|
Added root type for Income. Fixes #5356
|
2016-05-17 10:37:31 +05:30 |
|
Rushabh Mehta
|
72615977d7
|
Merge pull request #5337 from rohitwaghchaure/pos
[WIP] [POS] Some changes and fixes
|
2016-05-16 12:06:42 +05:30 |
|
Rohit Waghchaure
|
e0934d118f
|
[Fixes] Some changes and fixes
|
2016-05-16 12:01:16 +05:30 |
|
Nabin Hait
|
665568d87e
|
ignore permissions while creating records from charts builder portal
|
2016-05-13 15:56:11 +05:30 |
|
Nabin Hait
|
a21f49dd94
|
Tax rate in chart of accounts
|
2016-05-13 15:56:11 +05:30 |
|
Nabin Hait
|
e4670a9a45
|
Cleaned up chart of accounts
|
2016-05-13 15:56:11 +05:30 |
|
Nabin Hait
|
825070e504
|
Merge pull request #5331 from nabinhait/multi-fix-55
Multiple fixes
|
2016-05-12 12:27:42 +05:30 |
|
Anand Doshi
|
19fec06366
|
[fix] Validate Company in Account autoname
|
2016-05-11 13:27:18 +05:30 |
|
Nabin Hait
|
b81ed45b2b
|
fixed conflict
|
2016-05-11 12:52:31 +05:30 |
|
Nabin Hait
|
b3a0e05bae
|
included path fixed in report print formats
|
2016-05-11 12:38:11 +05:30 |
|
Nabin Hait
|
a1ec7f1eed
|
Add root account
|
2016-05-11 12:38:11 +05:30 |
|
Nabin Hait
|
3323d06be0
|
Mode of Payment columns and filters added in sales/purchase register
|
2016-05-10 13:17:02 +05:30 |
|
Rohit Waghchaure
|
6087fe178e
|
[Enhancement] POS
|
2016-05-09 23:36:15 +05:30 |
|
Nabin Hait
|
332d29f166
|
Merge branch 'master' into develop
|
2016-05-06 16:13:35 +05:30 |
|
shreyas
|
c2a49211a5
|
[Fix] Payment Tool, Fetch due date when user does 'Get Outstanding Vouchers'
|
2016-05-05 15:56:48 +05:30 |
|
shreyas
|
622fe3f1e3
|
[Fix] Fetch due date for Sales/Purchase invoice in payment tool
|
2016-05-05 15:11:04 +05:30 |
|
Rushabh Mehta
|
c711b82889
|
Merge pull request #5296 from KanchanChauhan/websitemakeover
New look to the website
|
2016-05-02 15:54:41 +05:30 |
|
Nabin Hait
|
863cb12426
|
minor fix
|
2016-05-02 13:48:27 +05:30 |
|
Kanchan Chauhan
|
239b351367
|
New look to the website
|
2016-05-02 11:43:44 +05:30 |
|
Nabin Hait
|
b78adcf279
|
Merge branch 'master' into develop
|
2016-04-29 18:26:46 +05:30 |
|
Neil Trini Lasrado
|
c33b5b74c6
|
Itemwise purchase and Itemwise sales
|
2016-04-29 18:21:51 +05:30 |
|
Rushabh Mehta
|
be2ee18de4
|
[fixed] frappe.require is now async 💥
|
2016-04-29 17:22:42 +05:30 |
|
Nabin Hait
|
6146cc1e33
|
Merge branch 'master' into develop
|
2016-04-29 11:44:55 +05:30 |
|
Nabin Hait
|
48577c15a2
|
Show all scheduled depreciation in dotted line
|
2016-04-28 18:12:41 +05:30 |
|
Nabin Hait
|
70f05df075
|
Asset Movement
|
2016-04-28 18:01:32 +05:30 |
|
Nabin Hait
|
ce35c56cd3
|
Added line graph in asset dashboard
|
2016-04-28 18:01:32 +05:30 |
|
Nabin Hait
|
92426f5e56
|
Added Image field in Asset
|
2016-04-28 18:01:32 +05:30 |
|
Nabin Hait
|
314246939f
|
[report][fix] Item-wise tax calculation if item appears multiple times in the same invoice
|
2016-04-28 17:32:36 +05:30 |
|
Nabin Hait
|
b7b7f0062d
|
[report][fix] Consider taxes only the tax contributed in invoice total
|
2016-04-28 17:31:27 +05:30 |
|
Anand Doshi
|
79c536acb5
|
Merge branch 'master' into develop
|
2016-04-27 15:44:11 +05:30 |
|
Anand Doshi
|
b5e700f3af
|
Merge pull request #5248 from saurabh6790/hotfix
[fixes] raise exception on deletion of fiscal year if fiscal year is set as Default
|
2016-04-27 14:25:58 +05:30 |
|
Neil Trini Lasrado
|
4c95ed49ed
|
Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports
|
2016-04-27 13:09:17 +05:30 |
|
Saurabh
|
9be40ee7c3
|
[fixes] raise exception while deleting fiscal year if fiscal year is set as default in Global Settings and while calculating get_month_details if year_start_date not found
|
2016-04-27 12:58:40 +05:30 |
|
Anand Doshi
|
c6479bcbb6
|
Merge pull request #5264 from neilLasrado/hotfix
Fixed Currency Symbol in Trial Balance and Trial Balance for Party re…
|
2016-04-27 12:32:05 +05:30 |
|
Neil Trini Lasrado
|
b93d525c96
|
Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports
|
2016-04-25 17:18:52 +05:30 |
|
Rushabh Mehta
|
621283c5c5
|
[enhancement] stock balance page
|
2016-04-21 19:00:34 +05:30 |
|
Rushabh Mehta
|
202cb7cdf1
|
Merge pull request #5249 from nabinhait/fixed_asset
Fixed asset
|
2016-04-21 11:41:11 +05:30 |
|
Nabin Hait
|
595d3c03ef
|
updated docs for fixed asset
|
2016-04-20 18:17:05 +05:30 |
|
Nabin Hait
|
85a2776e91
|
Depreciation Schedule considering already booked depreciations for existing asset and testcases
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
318fa287df
|
[report] Asset Depreciations and Balances
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
e58c26edca
|
[report] Added asset depreciation ledger report
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
cd0e8ce8ad
|
Fixes and modification in fixed asset
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
3d9c5c0c20
|
Fixed Asset module cleanup and fixes
|
2016-04-20 17:57:11 +05:30 |
|
Kanchan Chauhan
|
11638ba358
|
Changes 3
|
2016-04-20 16:24:25 +05:30 |
|
Kanchan Chauhan
|
704f248952
|
Changes 2
|
2016-04-20 16:24:24 +05:30 |
|
Rushabh Mehta
|
0525387328
|
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
|
2016-04-18 19:27:46 +05:30 |
|
Nabin Hait
|
c46c1f0288
|
[fix] Rejected serial nos in purchase invoice
|
2016-04-18 17:46:36 +05:30 |
|
Nabin Hait
|
14aa9c5320
|
[fix] Cleanup and fixes in update stock feature in Purchase Invoice
|
2016-04-18 16:59:47 +05:30 |
|
Saurabh
|
7fee1b8343
|
[fixes] set expence account to item on sales invoice
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
224737b9ed
|
[fixes] split make gl entry function into chuncks as per SI
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
fbb342c1ac
|
[enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
130c57b201
|
[fixes] code clean-up
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
e29248bcb3
|
[fixes] test-case to validate quantity after update stock and purchase return and code-cleaning
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
d697f3d6a3
|
[minor][fix] reset is_paid if company not selected
|
2016-04-18 15:58:42 +05:30 |
|
Saurabh
|
43520f93a1
|
[fixes] test cases, code cleanup.
|
2016-04-18 15:58:42 +05:30 |
|
Saurabh
|
2a0e2fe95c
|
[test-case] test update stock and payment
|
2016-04-18 15:57:56 +05:30 |
|
Saurabh
|
4bd34a58ba
|
[fixes] fix perpetual inventory
|
2016-04-18 15:57:55 +05:30 |
|
Saurabh
|
bd5fc8ecbe
|
[fixes] add posting time
|
2016-04-18 15:57:55 +05:30 |
|
jof2jc
|
c204775fe2
|
Added posting_time in purchase invoice
|
2016-04-18 15:57:55 +05:30 |
|
jof2jc
|
821f571640
|
added payments, make receipt field
|
2016-04-18 15:57:55 +05:30 |
|
jof2jc
|
524ebbcbb9
|
Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice
|
2016-04-18 15:57:55 +05:30 |
|
Umair Sayyed
|
72534deea2
|
removed Is Sales Item and Is Purchase Item
|
2016-04-15 12:57:00 +05:30 |
|
Nabin Hait
|
bd07ea43e8
|
fixed conflict
|
2016-04-15 11:06:41 +05:30 |
|
Nabin Hait
|
972c25f78d
|
Fixed conflict
|
2016-04-14 18:25:53 +05:30 |
|
Nabin Hait
|
e393c62086
|
[fix] Set debit / credit as per field precision
|
2016-04-14 18:15:42 +05:30 |
|