Commit Graph

24996 Commits

Author SHA1 Message Date
Sagar Vora
3c74266763
fix: PEP8 recommended whitspace 2019-01-07 13:13:16 +05:30
Sagar Vora
23a1b98957
fix: remove unnecessary code 2019-01-07 13:10:18 +05:30
Rohit Waghchaure
ed6725172d Replaced str to cstr in genral ledger report 2019-01-06 20:07:18 +05:30
Deepesh Garg
0eca1646e6
Merge branch 'staging-fixes' into loyalty-program-fix 2019-01-06 12:16:54 +05:30
Deepesh Garg
4772ae2755
Merge branch 'staging-fixes' into stock-recon 2019-01-06 12:16:45 +05:30
Deepesh Garg
16745c2553
Merge branch 'staging-fixes' into update_items_bug 2019-01-06 12:16:37 +05:30
Deepesh Garg
627b566445
Merge branch 'develop' into opportunity-lost-reason 2019-01-06 12:16:26 +05:30
Deepesh Garg
b12c7358b1
Merge branch 'staging-fixes' into report-fix 2019-01-06 12:16:11 +05:30
Deepesh Garg
f840c92c10
Merge branch 'staging-fixes' into accounts-receivable-fix 2019-01-06 10:35:12 +05:30
Frappe Bot
fdd5d54d41 Merge branch 'staging' into develop 2019-01-05 09:11:15 +00:00
Frappe Bot
094d539cd9 Merge branch 'staging-fixes' into staging 2019-01-05 09:11:14 +00:00
Frappe Bot
0d54271d15 bumped to version 11.0.3-beta.33 2019-01-05 09:11:14 +00:00
finbyz
5efc7973ea Minor Fix for Rounded Total 2019-01-05 11:12:11 +05:30
Mangesh-Khairnar
e2ea987610 fixed edge cases for yearly, weekly and monthly views 2019-01-05 00:15:31 +05:30
Mangesh-Khairnar
676a106d7a (refactor) removed unnecessary code 2019-01-05 00:15:31 +05:30
Mangesh-Khairnar
8e47a543f6 (fix) multiple years in yearly view 2019-01-05 00:15:31 +05:30
Himanshu
75ab042632
removed lowercase regex 2019-01-04 17:13:43 +05:30
Deepesh Garg
1bb9287b2d
Merge branch 'staging-fixes' into update_items_bug 2019-01-04 14:15:40 +05:30
Suraj Shetty
aea25b147f
Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component 2019-01-04 13:45:56 +05:30
Sagar Vora
53cac1b616
Merge pull request #16338 from sahil28297/remove_print_from_test_case
fix: Remove print statement from test case
2019-01-04 13:31:00 +05:30
Sahil Khan
3ac57c756b fix: remove print statement from test case 2019-01-04 12:57:34 +05:30
deepeshgarg007
eabf260706 fix :Test cases for accounts receivable report 2019-01-04 12:34:28 +05:30
Anurag Mishra
bb6a7eb9d3 refractor 2019-01-04 12:32:51 +05:30
Anurag Mishra
add6bf35a3 Fix: Employee Onboarding/Seperation task Assignment 2019-01-04 11:36:30 +05:30
Anurag Mishra
68aedfd176 typo 2019-01-04 11:00:07 +05:30
deepeshgarg007
9de81cda77 Added Customer contact column in accounts Receivable 2019-01-04 10:54:24 +05:30
Anurag Mishra
f2b29a0488 typo 2019-01-04 10:54:05 +05:30
Himanshu
547229fef1
PAN card validation in GST 2019-01-03 23:20:38 +05:30
deepeshgarg007
32f054b901 Added customer group column in item-wise-sales-history report 2019-01-03 22:57:18 +05:30
Suraj Shetty
6fe5c5c84d
Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component 2019-01-03 16:59:30 +05:30
Sagar Vora
cda289dc27
Merge pull request #16323 from sagarvora/fix_tests
fix: leave application and timesheet tests
2019-01-03 16:38:46 +05:30
Rohit Waghchaure
8bac5b6e73 [minor] Employee is reqd to preview salary slip from salary structure 2019-01-03 16:20:35 +05:30
Nabin Hait
47c9826b6f test(reco-warehouse): Get items for group warehouse 2019-01-03 15:24:59 +05:30
Himanshu
53c040f838
Gst number validation fix 2019-01-03 12:50:18 +05:30
Himanshu
a09a6e4020
Merge pull request #2 from frappe/hotfix
Hotfix
2019-01-03 12:47:03 +05:30
Rohit Waghchaure
3dc5b93db7 [Fix] Report quoted item comparison not working 2019-01-03 12:19:44 +05:30
Sagar Vora
c14c7c84e3 fix: leave application and timesheet tests 2019-01-02 21:28:11 +05:30
Rohit Waghchaure
1ff1fc4725 [Fix] Negative amount showing in the bank clearance summary 2019-01-02 17:56:08 +05:30
Anurag Mishra
4c8c50e464 test case fixed 2019-01-02 17:52:28 +05:30
Suraj Shetty
0f8eb37e1c
Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component 2019-01-02 17:47:59 +05:30
Saif Ur Rehman
016f29f09b fix: error due to passing None in scrub 2019-01-02 16:22:22 +05:00
Saif Ur Rehman
e194a655df fix: is_opening != 'Yes' 2019-01-02 16:09:34 +05:00
Anurag Mishra
772e2c4e20 test cases 2019-01-02 15:59:58 +05:30
rohitwaghchaure
9c69e40970
Merge pull request #16312 from rohitwaghchaure/fix_not_able_to_delete_department
[Fix] Not able to delete department
2019-01-02 15:58:24 +05:30
Anurag Mishra
5865fcca3c fix: expense head of asset items in purchase invoice 2019-01-02 14:36:07 +05:30
Deepesh Garg
74306cc5ea
Merge branch 'staging-fixes' into update_items_bug 2019-01-02 14:10:23 +05:30
deepeshgarg007
f9f753c95c fix: Added missing semicolon 2019-01-02 13:59:42 +05:30
deepeshgarg007
8c4bd951a8 fix(Codacy): Deleted unused imports and files 2019-01-02 13:24:12 +05:30
deepeshgarg007
9c0c633259 fix: Added validation for stock reconciliation in stock ledger entry 2019-01-02 11:31:55 +05:30
Suraj Shetty
c349ae26b9 Add patch to rename additional salary component
- Should fix https://pastebin.com/xsNHPAh6
(happens when clicking links option in menu of Employee master)
2019-01-02 09:31:11 +05:30