Rohit Waghchaure
|
61b4a43d84
|
[Fix] POS auto set paid amount with outstanding amount issue
|
2016-07-20 17:01:29 +05:30 |
|
Nabin Hait
|
3edefb19b9
|
Demo data for fixed asset depreciation
|
2016-07-20 16:14:30 +05:30 |
|
Rushabh Mehta
|
649e2538e5
|
[fix] merge conflict?
|
2016-07-20 15:30:17 +05:30 |
|
Rushabh Mehta
|
2f0dbd9bd8
|
[fix] test
|
2016-07-20 15:28:39 +05:30 |
|
Faris Ansari
|
8908d19bc9
|
[mobile ui] fix buttons
|
2016-07-20 14:00:08 +05:30 |
|
Nabin Hait
|
e2d0d7c5db
|
Merge pull request #5799 from nabinhait/fix104
Fixes
|
2016-07-20 12:38:49 +05:30 |
|
Nabin Hait
|
430a97aeba
|
Merge pull request #5800 from nabinhait/fix105
Patch fixed for expense claim type
|
2016-07-20 12:17:15 +05:30 |
|
Nabin Hait
|
9a5dc452f1
|
Patch fixed for expense claim type
|
2016-07-20 12:16:35 +05:30 |
|
Rushabh Mehta
|
fc8e589295
|
[fix] party status updating bug, fixes #5794, #5796
|
2016-07-20 12:09:27 +05:30 |
|
Nabin Hait
|
9d93ad92bc
|
minor fixes
|
2016-07-20 11:28:50 +05:30 |
|
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 |
|
Rushabh Mehta
|
f997c6981d
|
Merge pull request #5770 from saurabh6790/demo_expense_claim
[enhance] demo for expense claim #5731
|
2016-07-19 21:34:30 +05:30 |
|
Rohit Waghchaure
|
88514a246b
|
set paid amount with grand amount on invoice form
|
2016-07-19 20:04:44 +05:30 |
|
Rushabh Mehta
|
636acc2565
|
[minor] run stock reco in background if more than 100 items, fixes #4904
|
2016-07-19 17:14:48 +05:30 |
|
Saurabh
|
9cba6e1f25
|
[fix] test case fix for expense claim
|
2016-07-19 11:38:16 +05:30 |
|
Saurabh
|
718d835f45
|
[enhance] Add Accounts table in to mention expense account based on company #5777
|
2016-07-19 11:38:16 +05:30 |
|
Saurabh
|
f589c82d68
|
[enhance] demo for expense claim #5731
|
2016-07-19 11:38:15 +05:30 |
|
Rushabh Mehta
|
771773240b
|
Merge pull request #5788 from rohitwaghchaure/clean_timesheet
billable field access from grid and create timesheet without employee
|
2016-07-19 10:43:09 +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
|
f14bf502ef
|
billable field access from grid
|
2016-07-18 23:30:46 +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
|
5c52fa9785
|
[fix] variant error message
|
2016-07-18 14:40:14 +05:30 |
|
Rushabh Mehta
|
76b134192f
|
[fix] grid columns now restricted to 10
|
2016-07-18 14:30:27 +05:30 |
|
Nabin Hait
|
4fddff1606
|
Merge pull request #5767 from nabinhait/fix101
Payment Improvements
|
2016-07-16 11:55:12 +05:30 |
|
Nabin Hait
|
2842a86225
|
Merge pull request #5775 from revant/patch-1
Issue #5774
|
2016-07-16 11:28:15 +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 |
|
Revant Nandgaonkar
|
88e16a7f82
|
removed force=True
|
2016-07-16 11:00:37 +05:30 |
|
Nabin Hait
|
37dd714e6c
|
Is Stock Item checkbox visibility
|
2016-07-16 11:00:29 +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 |
|
Nabin Hait
|
e6cdb01bea
|
[fix] Query for account fields in Company
|
2016-07-16 10:59:48 +05:30 |
|
Nabin Hait
|
530b86b9b2
|
Merge pull request #5752 from KanchanChauhan/employee-holiday-attendance-report-renamed
Employee Attendance report renamed to Employees working on a holiday
|
2016-07-16 10:58:52 +05:30 |
|
Nabin Hait
|
4d64f6d4b4
|
Merge pull request #5772 from rohitwaghchaure/demo_records
Demo records for timesheet
|
2016-07-16 10:52:03 +05:30 |
|
Revant Nandgaonkar
|
cc08682879
|
Issue #5774
|
2016-07-15 23:41:22 +05:30 |
|
Rohit Waghchaure
|
ecb2031bbe
|
[Fix] Timesheet workstation holiday issue
|
2016-07-15 20:11:01 +05:30 |
|
Rohit Waghchaure
|
8002d47ff6
|
Demo records for timesheet
|
2016-07-15 19:24:21 +05:30 |
|
Rushabh Mehta
|
8d8bbb0588
|
[bugfix] opportunity naming
|
2016-07-15 16:50:52 +05:30 |
|
Rushabh Mehta
|
55ea7b1f61
|
[minor] set applicant name automatically
|
2016-07-15 16:43:25 +05:30 |
|
Rushabh Mehta
|
95383bb281
|
[fix] item attribute validation and tests
|
2016-07-15 15:12:06 +05:30 |
|
Kanchan Chauhan
|
9846b945d9
|
Patch to delete previous report
|
2016-07-15 14:06:20 +05:30 |
|
Kanchan Chauhan
|
7ff0c4eef4
|
Employee Attendance report renamed to Employees working on a holiday
|
2016-07-15 13:42:36 +05:30 |
|
Rushabh Mehta
|
3f549980c9
|
Merge pull request #5748 from rohitwaghchaure/v7_timesheet_issue
[WIP] Timesheet overlap issue and fields rearranged
|
2016-07-15 12:44:27 +05:30 |
|
Rushabh Mehta
|
20122aef79
|
[minor] optimize item attribute validation for #5756
|
2016-07-15 12:42:41 +05:30 |
|
Rushabh Mehta
|
b8bdfbcead
|
[minor] optimize item attribute validation for #5756
|
2016-07-15 12:41:08 +05:30 |
|
Rohit Waghchaure
|
3bc6a958c7
|
[Fix] Timesheet overlap issue
|
2016-07-14 18:27:49 +05:30 |
|
Saurabh
|
c63f2e2993
|
[fix] patch fix
|
2016-07-14 18:24:20 +05:30 |
|
Rushabh Mehta
|
176b63b354
|
[fix] remove first row on mapping, fixes #5707
|
2016-07-14 17:43:48 +05:30 |
|
Rushabh Mehta
|
62fcaa7900
|
Merge pull request #5758 from saurabh6790/is_group_fixes
[fix] alter fieldtype for is_group from select to check
|
2016-07-14 16:57:01 +05:30 |
|
Rushabh Mehta
|
528e145a54
|
[docs] fixes #5697
|
2016-07-14 17:00:05 +05:30 |
|
Rushabh Mehta
|
92d1b8cc6d
|
[fix] [demo] permissions for accounting
|
2016-07-14 16:18:20 +05:30 |
|
Rohit Waghchaure
|
de8418efe5
|
[Fix] Timesheet patch
|
2016-07-14 14:36:47 +05:30 |
|
Saurabh
|
6bc7b892c4
|
[fix] alter fieldtype for is_group from select to check
|
2016-07-14 14:06:28 +05:30 |
|
Rushabh Mehta
|
b814a54f2f
|
[demo] mute emails
|
2016-07-13 18:17:19 +05:30 |
|
Rushabh Mehta
|
ffa70e34de
|
[demo] [minor] fixes
|
2016-07-13 17:47:37 +05:30 |
|
Anand Doshi
|
d9b3c5ca60
|
[fix] use base.html's title block in home.html
|
2016-07-13 11:29:50 +05:30 |
|
Rushabh Mehta
|
8cfe18eccd
|
[demo] help
|
2016-07-13 11:30:10 +05:30 |
|
Rohit Waghchaure
|
e3fe828ea6
|
[Fix] Added note in timesheet and minor fixes
|
2016-07-13 09:40:35 +05:30 |
|
Rushabh Mehta
|
1f15cf43d6
|
Merge pull request #5715 from donysukardi/documentation-fixes
[fix] Documentation Fixes
|
2016-07-12 11:16:12 +05:30 |
|
Rushabh Mehta
|
4beba3aff9
|
Merge pull request #5705 from KanchanChauhan/fixed-employee-holiday-attendance-report
Added Holiday List filter
|
2016-07-12 11:11:43 +05:30 |
|
Dony Sukardi
|
84c9e6bb4a
|
[fix] Documentation Fixes
Fixes for the following issues:
- Render code block
- Fix ordered-list numbering
|
2016-07-12 04:01:06 +08:00 |
|
Rushabh Mehta
|
29b80b2233
|
Merge pull request #5701 from saurabh6790/item_reorder
[fix] fix get query for sub warehouse in reorder level table
|
2016-07-11 17:14:50 +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 |
|
Kanchan Chauhan
|
54860cd57d
|
Added Holiday List filter
|
2016-07-11 15:16:47 +05:30 |
|
Rohit Waghchaure
|
3e012b7e16
|
[Fix] Time sheet rename issues
|
2016-07-11 15:00:38 +05:30 |
|
Saurabh
|
7151f91862
|
[fix] fix get query for sub warehouse in reorder level table
|
2016-07-11 13:19:06 +05:30 |
|
Rushabh Mehta
|
391c0efcee
|
[fix] make grids editable
|
2016-07-11 13:01:58 +05:30 |
|
Rushabh Mehta
|
cca33b2ff0
|
[cleanup]
|
2016-07-11 13:01:58 +05:30 |
|
Nabin Hait
|
e37625b0c2
|
Merge pull request #5693 from rohitwaghchaure/v7_pos_issue
[Fix] POS minor fixes.
|
2016-07-11 12:52:47 +05:30 |
|
Nabin Hait
|
54bd79bd93
|
Merge pull request #5690 from nabinhait/fix100
Deleted report Customers Not Buying Since Long Time
|
2016-07-11 12:52:35 +05:30 |
|
Nabin Hait
|
bbc394fd72
|
Changed patch order to fix old patches
|
2016-07-11 12:40:18 +05:30 |
|
Rohit Waghchaure
|
89ee3091af
|
[Fix] POS minor fixes.
|
2016-07-08 15:17:04 +05:30 |
|
Nabin Hait
|
f176cc03df
|
Deleted report Customers Not Buying Since Long Time
|
2016-07-08 09:03:13 +05:30 |
|
Nabin Hait
|
12e8277b6b
|
Merge pull request #5681 from nabinhait/sal_slip_print
Print formats for salary slip
|
2016-07-08 08:35:31 +05:30 |
|
Rohit Waghchaure
|
0d4a9c225f
|
[Salary Structure] Make salary_component field mandatory if salary_slip_based_on_timesheet is true
|
2016-07-07 17:04:54 +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
|
7333eb280f
|
[minor] typo in customer.js
|
2016-07-07 15:34:01 +05:30 |
|
Rushabh Mehta
|
ea0ff23891
|
[cleanup] form dashboards
|
2016-07-07 14:28:05 +05:30 |
|
Rushabh Mehta
|
964ad0fcae
|
[cleanup] rename "links" to "dashboard"
|
2016-07-07 14:28:05 +05:30 |
|
Rushabh Mehta
|
2a1e3bb31b
|
[fix] sender name in lead
|
2016-07-07 14:28:05 +05:30 |
|
Nabin Hait
|
027acde4f4
|
Print formats for salary slip
|
2016-07-07 13:17:21 +05:30 |
|
Nabin Hait
|
cfa9df2842
|
Merge pull request #5679 from nabinhait/pull_button_visibility
[fix] Condition for visibility of 'Get Items from Open Material Requests' in PO
|
2016-07-07 12:47:58 +05:30 |
|
Nabin Hait
|
ade217c0e0
|
Merge pull request #5678 from nabinhait/exchange_rate_issue
[fix] Dont set currency and exchange rate while Quotation made from Opportunity for lead
|
2016-07-07 12:47:36 +05:30 |
|
Nabin Hait
|
804b8f7baf
|
Merge pull request #5645 from KanchanChauhan/task-status-update-in-website
Task statuses updated in website
|
2016-07-07 12:46:46 +05:30 |
|
Rohit Waghchaure
|
2b590fd804
|
[Fix] Pricing rule issue
|
2016-07-07 12:22:22 +05:30 |
|
Kanchan Chauhan
|
6d76359c31
|
[WIP] Task statuses updated in website
|
2016-07-07 12:19:01 +05:30 |
|
Nabin Hait
|
a9d3981c86
|
[fix] Condition for visibility of 'Get Items from Open Material Requests' in PO
|
2016-07-07 11:34:34 +05:30 |
|
Nabin Hait
|
3950507d4b
|
[fix] Currency and exchange rate while Quotation made from Opportunity for lead
|
2016-07-07 11:12:44 +05:30 |
|
Nabin Hait
|
821367fee8
|
[fix] Dont set currency and exchange rate while Quotation made from Opportunity for lead
|
2016-07-07 10:55:47 +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
|
8019ea73aa
|
Merge pull request #5653 from saurabh6790/V7_fixes_2
[fix] task visibility fix #5601
|
2016-07-07 10:35:02 +05:30 |
|
Nabin Hait
|
b71a14ceca
|
minor fix
|
2016-07-06 23:38:05 +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 |
|
Nabin Hait
|
abd6c5debb
|
Fixed asset item property and validations
|
2016-07-06 23:38:04 +05:30 |
|
Nabin Hait
|
2dec0db3bd
|
Is Fixed Asset and Asset Category field added in Item
|
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
|
21f443e37c
|
Merge pull request #5674 from rohitwaghchaure/v7_fixes
[Fixes] RFQ contact and multiple creation of supplier quotation issue
|
2016-07-06 17:51:56 +05:30 |
|
Saurabh
|
38d261653f
|
[fix] load task table for project on saving of project
|
2016-07-06 17:26:21 +05:30 |
|
Rohit Waghchaure
|
f154c611bb
|
[Fixes] RFQ contact and multiple creation of supplier quotation issue
|
2016-07-06 17:26:15 +05:30 |
|
Saurabh
|
838dd6c530
|
[fix] task visibility fix #5601
|
2016-07-06 17:00:30 +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
|
819ed21ab5
|
Removed Pro Order from Quick Entry
|
2016-07-06 16:13:44 +05:30 |
|
Nabin Hait
|
df2200b417
|
Added Valuation Rate field in Item for opening stock
|
2016-07-06 16:05:15 +05:30 |
|
Nabin Hait
|
4671038211
|
Item Name added in Stock Reconciliation
|
2016-07-06 16:05:15 +05:30 |
|
Nabin Hait
|
5f82a5387d
|
Query for warehouse and editable fields in grid
|
2016-07-06 15:35:23 +05:30 |
|
Nabin Hait
|
f3090b01c1
|
Merge pull request #5662 from KanchanChauhan/template-selection-salesorder
template selection of item disabledin Sales Order
|
2016-07-06 15:27:42 +05:30 |
|
Rohit Waghchaure
|
3188b56694
|
[Fixes] Time sheet fixes
|
2016-07-06 14:31:14 +05:30 |
|
Kanchan Chauhan
|
6cb5710ffc
|
template selection of item disabledin Sales Order
|
2016-07-06 13:25:44 +05:30 |
|
Nabin Hait
|
7796c2f0c0
|
Update rename_salary_components.py
|
2016-07-06 13:11:51 +05:30 |
|
Rohit Waghchaure
|
c8d231b26b
|
[Fix] Patch salary component
|
2016-07-06 12:33:54 +05:30 |
|
Rohit Waghchaure
|
a71d9d33af
|
Rename prevdoc field in purchase order and purchase receipt doctype
|
2016-07-06 12:13:29 +05:30 |
|
Nabin Hait
|
4647f24865
|
Merge pull request #5625 from KanchanChauhan/salary-component-cleanup
Salary component cleanup
|
2016-07-06 12:06:05 +05:30 |
|
Kanchan Chauhan
|
d963b76a4b
|
Salary component cleanup
|
2016-07-06 12:04:38 +05:30 |
|
Nabin Hait
|
d1a83d43ab
|
Merge pull request #5652 from saurabh6790/V7_fixes_1
[fix] link fixes for tree structures #5651
|
2016-07-06 10:54:54 +05:30 |
|
Anand Doshi
|
3177138655
|
[fix] moved disable setup wizard access to frappe
|
2016-07-05 21:34:21 +05:30 |
|
Saurabh
|
52ec0ed134
|
[fix] link fixes for tree structures #5651
|
2016-07-05 18:05:45 +05:30 |
|
Saurabh
|
c03a3bf580
|
[minor][fix] fix base_grand_total
|
2016-07-05 15:58:14 +05:30 |
|
Saurabh
|
1c5c511d2e
|
[fix] add payment entry in document flow
|
2016-07-05 12:46:38 +05:30 |
|
Saurabh
|
066ae8e4c4
|
[fix] make cheque print compatible with payment entry
|
2016-07-05 12:46:38 +05:30 |
|
Nabin Hait
|
04f0e61331
|
Merge pull request #5639 from saurabh6790/customer_save_fix
[fix] set addr_list and contact_list attr #5635
|
2016-07-05 10:57:34 +05:30 |
|
Nabin Hait
|
1e42a05c2d
|
Merge pull request #5636 from nabinhait/payment_entry_fix
Payment entry fix
|
2016-07-05 10:56:54 +05:30 |
|
Saurabh
|
bce02c4364
|
set addr_list and contact_list attr #5635
|
2016-07-04 18:28:20 +05:30 |
|
Nabin Hait
|
281b07cdb6
|
Warehouse patch fix
|
2016-07-04 18:17:57 +05:30 |
|
Nabin Hait
|
7f3938b19f
|
Warehouse patch fix
|
2016-07-04 18:12:08 +05:30 |
|
Rushabh Mehta
|
e38872294a
|
[fix] [patch]
|
2016-07-04 17:34:25 +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 |
|
Rushabh Mehta
|
1d797f717b
|
[fix] warehouse validation for parent_account
|
2016-07-04 17:07:08 +05:30 |
|
Rushabh Mehta
|
bc10431b7d
|
Merge pull request #5631 from KanchanChauhan/address-viewww-fixed
Address view fixed for website
|
2016-07-04 15:50:40 +05:30 |
|
Kanchan Chauhan
|
1605ff02c6
|
[WIP] Address view fixed
|
2016-07-04 15:41:07 +05:30 |
|
Rushabh Mehta
|
a123025d78
|
Merge pull request #5630 from rohitwaghchaure/v7_time_log_batch_patch_fixes
[Fixes] Time log batch patch
|
2016-07-04 14:07:58 +05:30 |
|
Rohit Waghchaure
|
240407b155
|
[Fixes] Time log batch patch
|
2016-07-04 13:21:54 +05:30 |
|
Saurabh
|
51f66efc7a
|
[minor][fix] set transactions_exist on load of company
|
2016-07-04 13:06:29 +05:30 |
|
Saurabh
|
c2934ba9da
|
[minor][fix] holiday list exception message fix
|
2016-07-04 13:06:29 +05:30 |
|
Rushabh Mehta
|
c1d2247f2c
|
Merge pull request #5620 from nabinhait/payment_entry
Payment Entry
|
2016-07-04 13:01:16 +05:30 |
|