Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,509 Commits 3 Branches 0 Tags 1 GiB
f997c6981d
Commit Graph

15509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rushabh Mehta
c748e9c991 Merge pull request #5724 from rohitwaghchaure/v7_timesheet_issue 
[Fix] Added note field in timesheet and fixes in timesheet patch
 2016-07-13 10:53:01 +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
57585aa98d Merge pull request #5711 from nabinhait/payment_fix_10 
[fix] Advance payment adjustment in sales/purchase invoice
 2016-07-11 17:07:28 +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
Nabin Hait
f366f4d915 Merge pull request #5703 from rohitwaghchaure/timesheet_rename_issue 
[Fix] Time sheet rename issues
 2016-07-11 15:08:32 +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
dceb2e99b6 Merge pull request #5699 from nabinhait/patch_fixes 
Changed patch order to fix old patches
 2016-07-11 12:50:17 +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
Rushabh Mehta
f3a50dc1c5 Merge pull request #5684 from rohitwaghchaure/v7_ts_issue 
[Salary Structure] Make salary_component field mandatory if salary_slip_based_on_timesheet is true
 2016-07-07 17:44:05 +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
Nabin Hait
621ef1ea5c Merge pull request #5680 from rohitwaghchaure/pricing_rule_issue 
[Fix] Pricing rule issue
 2016-07-07 12:33:53 +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
ac418d44d9 Merge pull request #5666 from nabinhait/fixed_asset_revisited 
Fixed asset revisited
 2016-07-07 10:33:53 +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