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

31834 Commits

Author SHA1 Message Date
Deepesh Garg
0eacc99ab7 test: Fixes in test case 2022-04-23 12:08:30 +05:30
Deepesh Garg
8a8476bb5c test: Add test coverage for bank clearance 2022-04-21 18:53:18 +05:30
Deepesh Garg
3d0e68acaa fix: select doctype as payment_document 2022-04-20 19:49:53 +05:30
Deepesh Garg
c3e27b5556 fix: Loan doctypes in bank reconciliation 2022-04-20 19:07:53 +05:30
Rucha Mahabal
789fa31b82
Merge branch 'develop' into shift-type-null-in-employee-checkin 2022-04-19 13:39:32 +05:30
Rucha Mahabal
3cddc1e97e test: shift fetching when assignment has an end date 2022-04-19 13:39:03 +05:30
Rucha Mahabal
98cccf221e fix: shift fetching fails in Employee Checkin if shift assignment has an end date 
Co-authored-by: Ejaaz Khan <ejaazrkhan@gmail.com>
 2022-04-19 13:17:36 +05:30
Rucha Mahabal
7c547f152f
fix(patch): check if column is present while fixing reverse linking (#30737) 2022-04-19 12:18:46 +05:30
Deepesh Garg
d96bfe13a8 Merge pull request #30721 from ruthra-kumar/bug_so_analysis_report 
fix: SO's without delivery note will also be fetched
 2022-04-18 19:58:37 +05:30
Deepesh Garg
264ec65255
Merge pull request #30728 from deepeshgarg007/pricing_rule_apply_mapped_doc 
fix: Price changing on creating Sales return from Delivery Note
 2022-04-18 14:34:28 +05:30
Deepesh Garg
9c081947ec fix: Price changing on creating Sales retrun from Delivery Note 2022-04-18 10:21:15 +05:30
Deepesh Garg
5cdd0d6719 fix: Move tax withholding category field 2022-04-16 20:34:56 +05:30
Deepesh Garg
0a67b0239e fix: Consistent customer and supplier forms 2022-04-16 19:43:59 +05:30
ruthra kumar
13487e2408 test: Sales order analysis report 2022-04-16 12:02:32 +05:30
Bhavesh Maheshwari
72757994f8 fix: process statement to_date override 
(cherry picked from commit 378d15d388ae9cac7a5f897af83c99605403503a)
 2022-04-14 13:14:11 +00:00
ruthra kumar
e28e6726f1 fix: SO analysis rpt will fetch SO's without Delivery note as well 2022-04-14 18:37:46 +05:30
Ankush Menat
9af2d68945 refactor: convert queries to ORM/QB, add types 2022-04-14 18:05:38 +05:30
Ankush Menat
ba29323e11 test: increase assertions to cover all cases 2022-04-14 18:05:38 +05:30
Ankush Menat
e278ee359a test: item attribute columns 2022-04-14 18:05:38 +05:30
Ankush Menat
febc74a21b refactor: rewrite stock balance query to QB 2022-04-14 18:05:35 +05:30
Ankush Menat
8a499e95d3 test: uom conversion in stock balance report 2022-04-14 18:01:43 +05:30
Ankush Menat
af0ea7b532 test: assert balanaces against SLE 2022-04-14 18:01:42 +05:30
Ankush Menat
f4766ae4eb test: opening balance in stock balance report 2022-04-14 18:01:42 +05:30
Ankush Menat
8b2432dfa0 test: stock balance report tests 2022-04-14 18:01:42 +05:30
Ankush Menat
64ac22af82 refactor: add filter type info 2022-04-14 18:01:42 +05:30
HENRY Florian
e6aa28ea14
fix: update translation (#30716) 
* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation
 2022-04-14 17:46:47 +05:30
Ankush Menat
15576c1ce8
Merge pull request #30707 from marination/values-out-of-sync-jv 
fix: Remove "Values Out of Sync" validation
 2022-04-14 17:39:18 +05:30
Deepesh Garg
1659f1eb6d
Merge pull request #29963 from nabinhait/income-tax-computation 
feat: Income tax computation Report
 2022-04-14 15:31:17 +05:30
Deepesh Garg
e2fa9f708e
Merge pull request #30710 from deepeshgarg007/advance_jv_allocation 
fix: Exchange gain and loss on advance Journal Entry allocation
 2022-04-14 15:10:04 +05:30
Nabin Hait
cd2ab32242 fix: orginised code 2022-04-14 14:05:21 +05:30
Nabin Hait
bc7007d588
fix: get enabled deduction components 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2022-04-14 14:02:01 +05:30
Nabin Hait
d06b7378f8
fix: get enabled and submitted income tax slab 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2022-04-14 14:01:44 +05:30
Nabin Hait
67086e618d
fix: get enabled earning components 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2022-04-14 14:00:28 +05:30
Marica
87117313a1
Merge branch 'develop' into values-out-of-sync-jv 2022-04-14 13:41:27 +05:30
Deepesh Garg
c38be53ce8 test: Update customer in Sales Invoice 2022-04-14 13:26:47 +05:30
Suraj Shetty
11fa187263
Merge pull request #30715 from surajshetty3416/fix-exotel-call-log 2022-04-14 12:45:15 +05:30
Suraj Shetty
77599fe443 fix: Set correct options for link field 
issue introduced via https://github.com/frappe/erpnext/pull/30711
 2022-04-14 12:32:31 +05:30
Deepesh Garg
86cfa3a53f
Merge pull request #30712 from frappe/mergify/bp/develop/pr-30700 
fix: Payment reco query with max invoice and payment amount limit (backport #30700)
 2022-04-14 12:32:11 +05:30
marination
d75d5ebe8d chore: Remove Values Out of Sync from Repost hourly job 
- It runs after repost (after commiting), so it has 0 impact on repost itself
- Just that scheduled job log shows up as failed, while actually repost is done and repost document is "Completed"
- The check is inaccurate also, so best to remove this
- Users cant do anything about it anyway. This just piles up phantom failed jobs unneccessarily
 2022-04-14 12:30:06 +05:30
Deepesh Garg
065c38152a Merge branch 'develop' of https://github.com/frappe/erpnext into item_wise_provisional_accounting 2022-04-14 12:04:21 +05:30
Deepesh Garg
ad171c6225 test: Update test case 2022-04-14 12:03:12 +05:30
Deepesh Garg
e6cb948a96 fix: Payment reco query with max invocie and payment amount limit 
(cherry picked from commit 4008c95ac6afc3b06a0a602e3f469db61e1f0453)
 2022-04-14 05:42:17 +00:00
Deepesh Garg
972d9ec5b4 test: Update customer 2022-04-14 11:10:41 +05:30
Suraj Shetty
6e837bcdfc style: Fix linter warning 2022-04-14 10:02:15 +05:30
Suraj Shetty
c272170b86 fix(call log): Convert Data to Link for type_of_call 
Convert `Data` to `Link` for type_of_call,
employee_user_id and call_received_by fields
 2022-04-14 09:51:54 +05:30
Deepesh Garg
31883b699d fix: Exchange gain and loss on advance jv allocation 2022-04-13 20:52:25 +05:30
Ankush Menat
79fbc2c504
test: flaky PR close test (#30709) 2022-04-13 20:42:25 +05:30
Suraj Shetty
d890ee9495
Merge pull request #29962 from nemesis189/exotel-fixes 
fix: Exotel Call Log fixes
 2022-04-13 20:36:03 +05:30
Suraj Shetty
ff41b8da4e fix: Update received_by if "to" is changed 2022-04-13 20:12:08 +05:30
Suraj Shetty
cef28df8db test: Do not overwrite frappe.form_dict to retain proxy reference 
Set frappe.local.form_dict instead
 2022-04-13 19:10:19 +05:30