Charles-Henri Decultot
8d36b362d1
Merge conflict resolution
2019-01-07 15:24:39 +00:00
Charles-Henri Decultot
4c57fae726
Codacy correction
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
2d1b5b0769
Codacy corrections
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
1d7646f31f
Codacy corrections
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
1a19746904
Codacy corrections
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
e7fec6e659
Codacy corrections
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
c45e271b3e
Add button to unlink bank account
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
422d483baf
Move actions menu to standard menu
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
c56f771c81
UX corrections + additional tests
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
89923b84b1
UX enhancements
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
c936f07a1e
Correct Travis error
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
aea2fbf82d
Correct test case for Travis
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
7a1ea42271
Addition of test cases
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
58438f4e5b
Duplicate query to avoid SQL injection
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
f6d18e81e9
Modify SQL queries and add a test case
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
e8f3050e27
Codacy corrections
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
cbe63ec418
Codacy corrections
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
94899981d3
Dev cleanup
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
6a4dae3a9d
Codacy corrections + sql queries
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
57c6b49d1a
Dev cleanup
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
eae7424984
Cleanup dev
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
e394cec194
Bank reconciliation dashboard
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
818492387a
WIP
2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
31cb24f48d
Bank reconciliation WIP
2019-01-07 15:20:06 +00:00
Charles-Henri Decultot
590d8d3d3e
Bank reconciliation wip
2019-01-07 15:20:06 +00:00
Charles-Henri Decultot
6025e498f2
Bank reconciliation wip
2019-01-07 15:20:06 +00:00
Charles-Henri Decultot
09cad814cd
Reconciliation dashboard wip
2019-01-07 15:20:06 +00:00
Charles-Henri Decultot
c75a2b1eed
Plaid integration
2019-01-07 15:20:06 +00:00
Saif
e5091cbc0f
chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs ( #16356 )
...
* chore: Updated DocType json files to clean up git diff of other PRs
* fix: remove auto-generated file
2019-01-07 18:19:30 +05:30
Sagar Vora
f14c56488f
Merge pull request #16325 from rohitwaghchaure/not_able_to_access_report_quoted_item_comparison
...
fix: report quoted item comparison not working
2019-01-07 14:55:14 +05:30
Sagar Vora
fd78339a7c
Merge branch 'staging-fixes' into not_able_to_access_report_quoted_item_comparison
2019-01-07 14:54:44 +05:30
Sagar Vora
db40ea4f76
Merge pull request #16328 from rohitwaghchaure/fixed_salary_structure_employee_reqd
...
fix: employee is reqd to preview salary slip from salary structure
2019-01-07 14:30:57 +05:30
Sagar Vora
26e5c9480b
Merge branch 'staging-fixes' into fixed_salary_structure_employee_reqd
2019-01-07 14:30:23 +05:30
Sagar Vora
1310c238a9
Merge pull request #16350 from rohitwaghchaure/code_cleanup_general_ledger
...
fix: replaced str to cstr in genral ledger report
2019-01-07 14:28:27 +05:30
Rohit Waghchaure
ed6725172d
Replaced str to cstr in genral ledger report
2019-01-06 20:07:18 +05:30
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
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
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
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
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
Charles-Henri Decultot
94e35e7a7e
Fix #15917 ( #16311 )
2019-01-01 22:25:13 +05:30
Rohit Waghchaure
c186f153ff
Added test cases
2019-01-01 15:03:56 +05:30
Rohit Waghchaure
8f62aec2e3
[Fix] Not able to delete department
2019-01-01 14:06:40 +05:30
Nabin Hait
137a24f457
Merge pull request #16253 from chdecultot/sales_summary_correction
...
[Fix] Filter cancelled and draft payments in sales payment summary
2018-12-31 12:02:19 +05:30
rohitwaghchaure
f07cde6351
Merge pull request #16306 from rohitwaghchaure/removed_duplicate_fields
...
[Fix] Duplicate fieldnames operation and allow_alternative_item in BOM Item
2018-12-28 17:49:52 +05:30
sahil28297
50f0a99330
fix: Checks for status in employee and for date range in upload attendance. ( #16279 )
...
* fix: checks for status in employee and for date range in upload attendance.
1. Earlier the status of an amployee can be set to 'Left' even though other employees are reporting to this employee, added checks to prevent this behaviour.
2. Earlier the range of dates added to the template were not checked for date of joining and relieving date. Now the range of dates added in the template are between the date of joining and relieving date.
* remove "import erpnext"
* fix: replace frappe.db.sql with frappe.db.get_all
* fix: refactored using list comprehension
* fix: query refactoring
* fix: combining list comprehensions
* travis debugging
* fix: doc.save
2018-12-28 17:15:56 +05:30
