Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,369 Commits 3 Branches 0 Tags 1 GiB
5a176a78b7
Commit Graph

31369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
5a176a78b7
feat(Attendance): Add In and Out time to attendance (#21547) (#22212) 
* feat(Attendance): Add In and Out time to attendance

Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>

* fix:add depends in attendance IN time and OUT time

Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
(cherry picked from commit 90957b7f74)

Co-authored-by: Vignesh S <svignesh0308@gmail.com>
 2020-06-12 13:01:22 +05:30
Deepesh Garg
c962836423
Merge pull request #22187 from frappe/mergify/bp/version-13-beta-pre-release/pr-22186 
fix: Party validation for inter-warehouse transaction (bp #22186)
 2020-06-10 20:25:36 +05:30
Deepesh Garg
9e3d6755d7 fix: Party validation for inter-warehouse transaction 
(cherry picked from commit 7963e2b708)
 2020-06-10 14:37:53 +00:00
Deepesh Garg
ee9a4c54ad
Merge pull request #22165 from frappe/mergify/bp/version-13-beta-pre-release/pr-22164 
Revert "fix: docfield of sales_order is not fetching route options for new doc" (bp #22164)
 2020-06-09 17:55:12 +05:30
Deepesh Garg
c1bc819f18 Revert "fix: docfield of sales_order is not fetching route options for new doc (#21123)" 
This reverts commit 5c54adec28.

(cherry picked from commit e5fe00cf58)
 2020-06-09 12:18:25 +00:00
Deepesh Garg
023f35bed7
Merge pull request #22143 from deepeshgarg007/loan_amount_precision_v13 
fix: Precision in loan amount calculation
 2020-06-07 21:38:18 +05:30
Deepesh Garg
221076c258 Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into loan_amount_precision_v13 2020-06-07 21:32:50 +05:30
Deepesh Garg
df93589032 fix: Ignore GL Entry on cancel 2020-06-07 21:29:25 +05:30
Deepesh Garg
3fed098f16 fix: Precision in loan amount calculation 2020-06-07 21:28:32 +05:30
Deepesh Garg
76ddf4f0b5
Merge pull request #22132 from deepeshgarg007/tds_monthly_cancelled_v13 
fix: Cancelled entries in tds payable monthly report
 2020-06-07 00:08:57 +05:30
Deepesh Garg
cdd92d756d fix: Cancelled entries in tds payable monthly report 2020-06-07 00:03:28 +05:30
Deepesh Garg
70f7136c05
Merge pull request #22069 from frappe/revert-22066-deferred_accounting_hooks_v13 
Revert "fix: Method in hooks for processing deferred revenue"
 2020-06-01 12:03:49 +05:30
Deepesh Garg
2e55609a84
Revert "fix: Method in hooks for processing deferred revenue" 2020-06-01 12:03:31 +05:30
Deepesh Garg
b5affe5bdd
Merge pull request #22066 from deepeshgarg007/deferred_accounting_hooks_v13 
fix: Method in hooks for processing deferred revenue
 2020-06-01 11:50:59 +05:30
Deepesh Garg
1dd5efcfc4 fix: Method in hooks for proccesing deferred revenue 2020-06-01 11:46:29 +05:30
Suraj Shetty
4a54a43514
Merge pull request #22060 from frappe/surajshetty3416-patch-1 
chore: Delete redundant change-log file
 2020-05-30 23:22:36 +05:30
Suraj Shetty
8f17438723
chore: Delete redundant change-log file 
Not sure how this still exists even after renaming the file
- https://github.com/frappe/erpnext/pull/21923

- ccb9ae49aa (diff-05325be11cd93bcdb3c8cebcb60b2c35)
 2020-05-30 23:21:47 +05:30
Deepesh Garg
e602140ff0
Merge pull request #22058 from frappe/mergify/bp/version-13-beta-pre-release/pr-22057 
fix(ewb): remove checksum validation for TRANSIN (bp #22057)
 2020-05-30 20:22:27 +05:30
karthikeyan5
d9f7b4df8f fix(ewb): remove checksum validation for TRANSIN 
(cherry picked from commit ca46bedfcb)
 2020-05-30 14:22:25 +00:00
mergify[bot]
bfa93ea76f
fix: Migrate standard_tax_exemption_amount if field exists (#22036) (#22047) 
(cherry picked from commit 2186c223b9)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-29 21:31:28 +05:30
Deepesh Garg
295dcd87f9
Merge pull request #22038 from frappe/mergify/bp/version-13-beta-pre-release/pr-22037 
fix: check if swift_number exists in bank account (bp #22037)
 2020-05-29 13:22:21 +05:30
Chinmay D. Pai
9b36a9be26 fix: check if swift_number exists in bank account 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
(cherry picked from commit d6587fa1d5)
 2020-05-29 07:39:59 +00:00
mergify[bot]
25add7c9bf
crm onboarding typos (#22008) (#22025) 
(cherry picked from commit 8385fed042)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2020-05-29 09:34:14 +05:30
Sahil Khan
6a93feb9d2 Merge branch 'version-13-beta-pre-release' into version-13-beta 2020-05-28 20:28:09 +05:30
Sahil Khan
f42a37ea43 bumped to version 13.0.0-beta.2 2020-05-28 20:41:41 +05:50
Rucha Mahabal
fb6ad158a6
Merge pull request #22020 from frappe/mergify/bp/version-13-beta-pre-release/pr-22019 
fix: empty filters in Healthcare Charts (bp #22019)
 2020-05-28 19:25:51 +05:30
Rucha Mahabal
1a1447c2a1 fix: empty filters in Healthcare Charts 
(cherry picked from commit a3dd75e77f)
 2020-05-28 13:54:39 +00:00
sahil28297
11bd731d16
fix(set_purchase_receipt_delivery_note_detail): commit after every 100 sql updates (#22018) 2020-05-28 18:50:13 +05:30
sahil28297
a0f061abd9
fix(rename_bank_reconcilliation): do not delete doc after renaming (#22014) 2020-05-28 18:32:34 +05:30
Marica
354baf0c5e
fix: Delete Auto Email Reports (#22010) 2020-05-28 18:31:50 +05:30
Shivam Mishra
fa0b73ce25
refactor: clean up desk pages (#22004) (#22007) 
* refactor: clean up desk pages

* refactor: update label for CRM
 2020-05-28 15:20:22 +05:30
Deepesh Garg
82c6b9a9be
Merge pull request #22005 from scmmishra/fix-dashboard 
fix: set fiscal year for Profit and Loss chart
 2020-05-28 15:10:27 +05:30
Shivam Mishra
4afda76015 fix: set fiscal year for Profit and Loss chart 2020-05-28 15:06:38 +05:30
mergify[bot]
2f45fad47d
CRM dashboard fixes (#21989) (#22003) 
(cherry picked from commit f10771029a)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2020-05-28 14:43:38 +05:30
rohitwaghchaure
82de993a69
Merge pull request #21993 from rohitwaghchaure/display-draft-job-card-as-open-job-card 
refactor: display draft job card as Open job card
 2020-05-28 10:11:58 +05:30
Rohit Waghchaure
b8ffaa7f07 refactor: display draft job card as Open job card 2020-05-28 10:10:22 +05:30
rohitwaghchaure
02a2bb77a8
Merge pull request #21992 from rohitwaghchaure/fixed-forecasting-data-and-changed-columns-pre-release 
refactor: display the order's data for past period
 2020-05-28 09:59:23 +05:30
Rohit Waghchaure
5255b714ef refactor: showing the order's data for past period 2020-05-28 09:57:49 +05:30
rohitwaghchaure
962e9bcd71
fix: raw material warehouse in Production Planning Report (#21983) 2020-05-27 21:53:29 +05:30
Deepesh Garg
33bf90db0b
Merge pull request #21981 from frappe/mergify/bp/version-13-beta-pre-release/pr-21972 
fix: Total for ageing column 121-Above (bp #21972)
 2020-05-27 20:59:19 +05:30
Deepesh Garg
c63b689497 fix: Total for ageing column 121-Above (#21972) 
(cherry picked from commit 152377f84d)
 2020-05-27 15:27:23 +00:00
Marica
8f1aed73fd
fix: Buying Module fixes (#21966) 
* fix: Buying Module fixes

* fix: Delete Report files as well

* fix: Add Purchase Order Analysis to Stock & Accounting
 2020-05-27 20:57:02 +05:30
mergify[bot]
8644a7f1fc
fix: Do not allow backdated stock transactions in previous fiscal year (#21967) (#21980) 
(cherry picked from commit 873542bc7f)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-05-27 20:50:28 +05:30
mergify[bot]
01dda8a000
fix: Filtering issues in opneing invoice creation tool (#21969) (#21979) 
(cherry picked from commit 0030b95595)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-05-27 20:50:20 +05:30
rohitwaghchaure
c77a4b8486
Merge pull request #21978 from scmmishra/work-order-fix-v13-beta 
fix: compare start and end time to prevent negative diff
 2020-05-27 20:41:17 +05:30
Shivam Mishra
48b7a1a20f fix: use get_datetime instead of getdate 2020-05-27 20:39:52 +05:30
Shivam Mishra
402ed10004 fix: compare start and end time to prevent negative diff (#21974) 
* fix: compare start and end time to prevent negative diff

* feat: parse date when comparing
 2020-05-27 20:39:52 +05:30
mergify[bot]
4ea24687fc
fix: Module Onboarding for HR (#21963) (#21976) 
(cherry picked from commit d6d84a3c15)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-05-27 20:32:11 +05:30
mergify[bot]
97ca1e7e71
onbarding steps fix (#21959) (#21975) 
(cherry picked from commit a77032f926)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2020-05-27 20:31:43 +05:30
Marica
7634250e78
fix: Grammar fixes (#21971) 2020-05-27 20:28:47 +05:30