Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,475 Commits 3 Branches 0 Tags 1 GiB
38351587fc
Commit Graph

25475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
38351587fc
Merge pull request #17197 from nabinhait/training-feedback 
fix: training feedback code cleanup
 2019-04-11 11:36:50 +05:30
rohitwaghchaure
4898d1936b
Merge pull request #17200 from Anurag810/pos_running 
fix: order by idx(v11)
 2019-04-11 10:57:05 +05:30
rohitwaghchaure
22d6eb3eaa
Merge pull request #17191 from rohitwaghchaure/asset_depreciation_rate_hotfix 
fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method
 2019-04-11 09:58:02 +05:30
rohitwaghchaure
6cd114b467
Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice 
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
 2019-04-11 09:57:45 +05:30
rohitwaghchaure
2521b1347b
Merge pull request #17201 from rohitwaghchaure/fix_test_cases_for_item_variant 
Fix: item variant test cases
 2019-04-10 19:16:51 +05:30
Rohit Waghchaure
f3a9552e48 fix: item variant test cases 2019-04-10 17:57:09 +05:30
Anurag Mishra
5ab5f77fd4 fix: order by idx 2019-04-10 17:53:45 +05:30
Rohit Waghchaure
49907e746b fix: test cases 2019-04-10 17:33:32 +05:30
Rohit Waghchaure
45d0b31d44 fix: test cases 2019-04-10 17:25:08 +05:30
Rohit Waghchaure
b286fc99b8 fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled 2019-04-10 16:16:30 +05:30
Nabin Hait
c8c678f747 fix: training feedback code cleanup 2019-04-10 15:56:16 +05:30
Rohit Waghchaure
bb0d4e37b9 fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method 2019-04-10 03:14:11 +05:30
Nabin Hait
7dcdb93596
Merge pull request #17178 from Anurag810/timesheet_report_fixes 
fix: timesheet_report (WN-SUP41913)
 2019-04-09 17:28:22 +05:30
Anurag Mishra
22867f7fa5 fix: added currency 2019-04-09 15:06:49 +05:30
Anurag Mishra
3e8b8a4359 fix: filters and some conditions 2019-04-09 14:34:56 +05:30
Anurag Mishra
17fbafa390 fix: filters,added total,only submitted doc,considered fraction 2019-04-09 11:31:11 +05:30
Faris Ansari
aac7719dd9
fix: Translated string method in Jinja (#17174) 2019-04-08 21:50:58 +05:30
Rushabh Mehta
2cce72412d
Merge pull request #17168 from frappe/revert-17086-check-version-hf 
Revert "fix: Raise exception if apps are on incompatible branches"
 2019-04-08 17:11:15 +05:30
Rushabh Mehta
1412a681f3
Revert "fix: Raise exception if apps are on incompatible branches" 2019-04-08 17:10:56 +05:30
Saurabh
b0c939d280 Merge branch 'hotfix' 2019-04-08 15:09:04 +05:30
Saurabh
00a5e7a1d0 bumped to version 11.1.20 2019-04-08 15:39:03 +06:00
Nabin Hait
f1698bb2df fix: unique variant based on 2019-04-08 14:59:43 +05:30
Nabin Hait
79c9d5d24a
Merge pull request #17146 from Anurag810/timesheet-report 
feat: Timesheet report
 2019-04-08 10:33:44 +05:30
Saurabh
c32f8eb0cb Merge branch 'hotfix' 2019-04-05 16:59:22 +05:30
Saurabh
63fabc3723 bumped to version 11.1.19 2019-04-05 17:29:22 +06:00
Nabin Hait
d70476fbc8
Merge pull request #17139 from hrwX/pe_supp_inv_v11 
fix(Payment Entry): Return Bill No for Payment Entry
 2019-04-05 15:59:43 +05:30
Nabin Hait
8cf76e74e0
Merge pull request #17133 from hrwX/validate_stock_transaction_v11 
fix(Item): check transactions for batch, serial check
 2019-04-05 15:41:35 +05:30
Nabin Hait
843e440191
Merge branch 'hotfix' into validate_stock_transaction_v11 2019-04-05 15:41:26 +05:30
Nabin Hait
1580e24946
Merge pull request #17137 from netchampfaris/item-group-clean-description 
fix(Item Group): Don't clean description html
 2019-04-05 15:39:44 +05:30
Nabin Hait
603dce428b
Merge pull request #17144 from nabinhait/variant-fix 
fix: Default variant Based on
 2019-04-05 15:38:15 +05:30
Anurag Mishra
0dc62e8747 fix: Removed raw query and used frappe.get_all 2019-04-05 14:36:43 +05:30
Anurag Mishra
f71c147ea8 Added mandatory feilds to the report 2019-04-05 14:36:43 +05:30
Anurag Mishra
5c17e7760b fix: readability 2019-04-05 14:36:43 +05:30
Anurag Mishra
b57c024ff7 feat: Project Billing Summary for timesheet 2019-04-05 14:36:43 +05:30
Anurag Mishra
61aab377b6 Minor Fixes 2019-04-05 14:36:42 +05:30
Anurag Mishra
3d27aabdeb Commonify code 2019-04-05 14:36:42 +05:30
Anurag Mishra
94514ffee9 feat: timesheet Employee Summary Report 2019-04-05 14:36:42 +05:30
rohitwaghchaure
e334413b34
Merge pull request #17141 from rohitwaghchaure/incorrect_pos_profile_selected_if 
fix: incorrect auto POS profile selected in the sales invoice
 2019-04-05 13:04:05 +05:30
Nabin Hait
a3357e4e86 fix: Default variant Based on 2019-04-05 12:10:36 +05:30
Rohit Waghchaure
4324f43a06 always set the company from the POS Profile 2019-04-05 09:54:55 +05:30
Rohit Waghchaure
f7a83cb4f5 fix: incorrect POS profile selected 2019-04-05 00:42:48 +05:30
Himanshu Warekar
6443d7dd10 refactor: declare bill_on at function start 2019-04-04 19:54:23 +05:30
Himanshu Warekar
ad32324c4c fix: get bill_no 2019-04-04 19:50:23 +05:30
Faris Ansari
7a0a05d8f1 fix(Item Group): Don't clean description html 2019-04-04 15:53:16 +05:30
Himanshu Warekar
7f253b679a pull from hotfix 2019-04-04 15:19:44 +05:30
Himanshu Warekar
28db545947 fix: check transactions for batch, serial check 2019-04-04 15:02:25 +05:30
Nabin Hait
82bd388993
Merge pull request #17122 from frappe/asbasawaraj-remove-location-from-abbreviation-doctypes 
fix: Removed Location from Abbreviation Update DocTypes
 2019-04-04 11:50:33 +05:30
Nabin Hait
e0a9835f30
Merge pull request #16987 from SaiFi0102/Party-Ledger-Summary-Fix 
fix(Party Ledger Summary): Show all adjustment entries as columns
 2019-04-04 11:45:36 +05:30
Nabin Hait
0747273ea4
Merge pull request #17028 from sagarvora/field_order 
fix(accounts): dependent field should be displayed after source link field
 2019-04-04 11:45:01 +05:30
Nabin Hait
9eeb3715f0
Merge pull request #16992 from hrwX/cost_center 
fix(Purchase Invoice): Cost Centre as per company
 2019-04-04 11:43:35 +05:30