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

15877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Nabin Hait
e739c0cf4e Merge pull request #5670 from rohitwaghchaure/v7_fixes 
[Fixes] POS amount calculation issue
 2016-07-06 16:20:59 +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
018b6a4bdd Merge pull request #5668 from nabinhait/stock_reco_fix 
Query for warehouse and editable fields in grid
 2016-07-06 15:47:25 +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
Nabin Hait
479c92a1ea Merge pull request #5664 from rohitwaghchaure/v7_fixes 
[Fixes] Time sheet fixes
 2016-07-06 15:12:32 +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
Nabin Hait
be81522958 Merge pull request #5661 from rohitwaghchaure/v7_fixes 
[Fix] Patch salary component
 2016-07-06 12:41:02 +05:30
Rohit Waghchaure
c8d231b26b [Fix] Patch salary component 2016-07-06 12:33:54 +05:30
Nabin Hait
f1439c8f78 Merge pull request #5641 from rohitwaghchaure/rename_prevdoc_fields 
Rename prevdoc field in purchase order and purchase receipt doctype
 2016-07-06 12:21:38 +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