Nabin Hait
|
85648d9bd6
|
payment entry fixes
|
2016-07-20 11:28:50 +05:30 |
|
Nabin Hait
|
b1234fa5e8
|
Set missing values in asset
|
2016-07-20 11:28:50 +05:30 |
|
Nabin Hait
|
df2a75ad1d
|
Updated standard chart of accounts
|
2016-07-20 11:27:58 +05:30 |
|
Rushabh Mehta
|
c0cc9902d9
|
Merge pull request #5776 from saurabh6790/warehouse_accounting_fix
[fix] for setting warehouse in account head
|
2016-07-19 21:35:09 +05:30 |
|
Rohit Waghchaure
|
88514a246b
|
set paid amount with grand amount on invoice form
|
2016-07-19 20:04:44 +05:30 |
|
Rushabh Mehta
|
02ba94784b
|
Merge pull request #5785 from rohitwaghchaure/batch_added_in_pos
[POS] Added batch and fixed issue of searching serial no #5779
|
2016-07-19 10:19:52 +05:30 |
|
Rushabh Mehta
|
6ecc0888ab
|
[minor] dont make tax template default, by default. #5695
|
2016-07-19 10:17:30 +05:30 |
|
Rohit Waghchaure
|
03da40ba4c
|
[Fix] Added batch in POS
|
2016-07-18 17:50:50 +05:30 |
|
Rushabh Mehta
|
5f9566f3af
|
[fix] text field for sales, purchase invoice advance fixes #5773
|
2016-07-18 14:44:12 +05:30 |
|
Rushabh Mehta
|
76b134192f
|
[fix] grid columns now restricted to 10
|
2016-07-18 14:30:27 +05:30 |
|
Nabin Hait
|
94105b04b8
|
Asset category mandatory validation while fetching item details
|
2016-07-16 11:20:50 +05:30 |
|
Saurabh
|
dcb41da02a
|
[fix] for setting warehouse in account head
|
2016-07-16 11:17:43 +05:30 |
|
Nabin Hait
|
96376b2345
|
Trigger receive/paid amount on change of paid from/to
|
2016-07-16 11:00:29 +05:30 |
|
Nabin Hait
|
6831b9422b
|
payment entry improvements and deletion of payment tool
|
2016-07-16 11:00:29 +05:30 |
|
Nabin Hait
|
4f5f8d7806
|
Set target exchange rate from source if currency is same
|
2016-07-16 10:59:48 +05:30 |
|
Rushabh Mehta
|
176b63b354
|
[fix] remove first row on mapping, fixes #5707
|
2016-07-14 17:43:48 +05:30 |
|
Rushabh Mehta
|
528e145a54
|
[docs] fixes #5697
|
2016-07-14 17:00:05 +05:30 |
|
Rushabh Mehta
|
8cfe18eccd
|
[demo] help
|
2016-07-13 11:30:10 +05:30 |
|
Nabin Hait
|
cc2083ebd0
|
[fix] Advance payment adjustment in sales/purchase invoice
|
2016-07-11 16:12:18 +05:30 |
|
Rushabh Mehta
|
3ce24d64c2
|
[cleanup] payment entry form view
|
2016-07-11 16:08:46 +05:30 |
|
Rohit Waghchaure
|
3e012b7e16
|
[Fix] Time sheet rename issues
|
2016-07-11 15:00:38 +05:30 |
|
Rushabh Mehta
|
391c0efcee
|
[fix] make grids editable
|
2016-07-11 13:01:58 +05:30 |
|
Rohit Waghchaure
|
89ee3091af
|
[Fix] POS minor fixes.
|
2016-07-08 15:17:04 +05:30 |
|
Rushabh Mehta
|
408d2c5db3
|
Merge pull request #5683 from rohitwaghchaure/v7_pos_issue_and_enhancement
[Fix] Access is pos from sales invoice form.
|
2016-07-07 16:46:32 +05:30 |
|
Rohit Waghchaure
|
539e913b46
|
[Fix] Access is pos from sales invoice form.
|
2016-07-07 16:44:40 +05:30 |
|
Rushabh Mehta
|
964ad0fcae
|
[cleanup] rename "links" to "dashboard"
|
2016-07-07 14:28:05 +05:30 |
|
Rohit Waghchaure
|
2b590fd804
|
[Fix] Pricing rule issue
|
2016-07-07 12:22:22 +05:30 |
|
Nabin Hait
|
6a66138764
|
Merge pull request #5675 from rohitwaghchaure/rename_time_sheet_doctype
Rename Time Sheet doctype
|
2016-07-07 10:38:55 +05:30 |
|
Nabin Hait
|
378f5c48e5
|
[fix] Test cases
|
2016-07-06 23:38:05 +05:30 |
|
Nabin Hait
|
c19691632e
|
Button to make Depreciation Entry manually
|
2016-07-06 23:38:05 +05:30 |
|
Nabin Hait
|
e417000bbb
|
Fetch Fixed Asset property from item in Sales / Purchase Invoice
|
2016-07-06 23:38:05 +05:30 |
|
Nabin Hait
|
cea353a638
|
Validate expected value after useful life
|
2016-07-06 23:38:05 +05:30 |
|
Nabin Hait
|
e3e1b80fcc
|
Editable grid and query in asset category
|
2016-07-06 23:38:05 +05:30 |
|
Nabin Hait
|
b30acc7ddb
|
Fixes in Account
|
2016-07-06 23:38:04 +05:30 |
|
Nabin Hait
|
668d090eed
|
Fetch deatils from Item and Asset Category
|
2016-07-06 23:38:04 +05:30 |
|
Rohit Waghchaure
|
e94d18b4cd
|
Rename Time Sheet doctype
|
2016-07-06 20:38:50 +05:30 |
|
Nabin Hait
|
70a1ddb6a1
|
Merge pull request #5671 from nabinhait/fixes90
Multiple fixes
|
2016-07-06 16:53:31 +05:30 |
|
Rohit Waghchaure
|
53bea82514
|
[Fixes] POS amount calculation issue
|
2016-07-06 16:15:10 +05:30 |
|
Nabin Hait
|
4671038211
|
Item Name added in Stock Reconciliation
|
2016-07-06 16:05:15 +05:30 |
|
Saurabh
|
c03a3bf580
|
[minor][fix] fix base_grand_total
|
2016-07-05 15:58:14 +05:30 |
|
Saurabh
|
066ae8e4c4
|
[fix] make cheque print compatible with payment entry
|
2016-07-05 12:46:38 +05:30 |
|
Nabin Hait
|
f6a0d789d0
|
Payment entry fixes
|
2016-07-04 17:26:02 +05:30 |
|
Nabin Hait
|
e4bbb696ab
|
Payment Entry minor improvements
|
2016-07-04 17:26:02 +05:30 |
|
Nabin Hait
|
ff2f3ef1b1
|
Test Case Fixes
|
2016-07-04 11:42:25 +05:30 |
|
Nabin Hait
|
e196190d10
|
minor fix
|
2016-07-04 11:42:25 +05:30 |
|
Nabin Hait
|
56548cbfa2
|
Payment against negative invoice, negative outstanding allocation and much more
|
2016-07-04 11:42:25 +05:30 |
|
Nabin Hait
|
9db1b223da
|
Payment Entry: Test cases and default remarks
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
13093b4b68
|
Make payment entry aginst order, payment request and patch to rename advance table fields
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
05aefbbf5d
|
Payment Entry from invoice
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
221fa98b51
|
Payment Entry: Payment period based on invoice date
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
16d6959d01
|
Payment Entry included in Bank Reconciliation and related reports
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
1991c7b17d
|
Payment Reconciliation changes for Payment Entry
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
28a0528ae4
|
Advance Payment Entry adjustment against Invoice
|
2016-07-04 11:42:04 +05:30 |
|
Nabin Hait
|
e3a10170f7
|
Payment Entry submission and more
|
2016-07-04 11:41:24 +05:30 |
|
Nabin Hait
|
12e2a51519
|
[new][feature] Payment Entry
|
2016-07-04 11:41:24 +05:30 |
|
Rushabh Mehta
|
2be94f7675
|
Merge pull request #5615 from rohitwaghchaure/v7_rfq_fixes
[RFQ Enhancement] Added button on supplier row to download PDF for particular supplier
|
2016-07-04 10:58:33 +05:30 |
|
Rohit Waghchaure
|
ad884b9fa9
|
[Fixes] Time sheet dependency removed from sales invoice and patch fixes
|
2016-07-02 22:28:29 +05:30 |
|
Rohit Waghchaure
|
fc1fa9a774
|
[RFQ Enhancement] Added button on supplier row to download PDF for particular supplier
|
2016-07-01 14:53:11 +05:30 |
|
Saurabh
|
621247807a
|
[fix] BOM tree as default view
|
2016-06-30 15:05:06 +05:30 |
|
Rushabh Mehta
|
a11839307f
|
Merge pull request #5553 from saurabh6790/pos_fixes
[minor][fix] throw if payment modes are not set
|
2016-06-29 21:56:20 +05:30 |
|
Rohit Waghchaure
|
3fa0b51e5e
|
[Fixes] Time sheet fixes and changed timesheets to time_logs
|
2016-06-29 19:04:16 +05:30 |
|
Rushabh Mehta
|
da43539c53
|
Merge pull request #5558 from saurabh6790/doc_flow_fix
[minor][fix] fix filter in previous link mapper
|
2016-06-29 12:19:54 +05:30 |
|
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 |
|