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

31853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
fecac677ec
Merge pull request #22075 from abhishekbalam/fix-customer-count 
fix(Accounts): Customer Count in Customer Acq. Report wrong
 2020-06-02 00:09:01 +05:30
Abhishek Balam
192d4c8810 indent to tabs instead of spaces 2020-06-01 23:58:05 +05:30
Abhishek Balam
732f5c1867 fixed customer count logic 2020-06-01 23:51:39 +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
marination
0df7f0fe9d fix: Misleading Error message for Item Attribute. 2020-06-01 11:56:33 +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
ef436fa3c2
Merge pull request #22065 from deepeshgarg007/deferred_accounting_hooks 
fix: Method in hooks for processing deferred revenue
 2020-06-01 11:48:44 +05:30
Deepesh Garg
1dd5efcfc4 fix: Method in hooks for proccesing deferred revenue 2020-06-01 11:46:29 +05:30
Deepesh Garg
de03d2cba4 fix: Method in hooks for proccesing deferred revenue 2020-06-01 11:30:34 +05:30
marination
c0c455c471 fix: Procurement Tracker Data Consistency 2020-05-31 20:20:59 +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
Deepesh Garg
253660fbd1
Merge pull request #22057 from karthikeyan5/develop-fix-ewb-transin-checksum 
fix(ewb): remove checksum validation for TRANSIN
 2020-05-30 19:48:12 +05:30
karthikeyan5
ca46bedfcb fix(ewb): remove checksum validation for TRANSIN 2020-05-30 15:00:56 +05:30
Saqib
c16e278979
Merge branch 'develop' into update-items-permission-fix 2020-05-30 13:16:55 +05:30
Abhishek Balam
40694c98aa
fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050) 
* table was showing empty with just headers when no leaves allocated, fixed template code

* added filters on Leave Type based on leave allocation for a particular employee and to/from dates
 2020-05-30 01:02:06 +05:30
Saqib Ansari
a655db6a79 fix: unexpected removal of print hide field 2020-05-29 22:44:59 +05:30
Saqib Ansari
d531a8ab8d Merge branch 'develop' of https://github.com/frappe/erpnext into update-items-permission-fix 2020-05-29 22:37:13 +05:30
Saqib Ansari
c579b0879e fix: cannot update delivery date 2020-05-29 22:34:22 +05:30
Saqib Ansari
5da8b98a04 fix: label 2020-05-29 21:59:01 +05:30
Saqib Ansari
2c3c8aaa2d fix: submitted sales order can be updated with no permission 2020-05-29 21:55:38 +05:30
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
rohitwaghchaure
7544160374
fix: routing operations table is blank on pull of operations in BOM (#22039) 2020-05-29 21:27:24 +05:30
Nabin Hait
2186c223b9
fix: Migrate standard_tax_exemption_amount if field exists (#22036) 2020-05-29 21:26:49 +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
Deepesh Garg
91e771a1cf
Merge pull request #22037 from Thunderbottom/swift-check 
fix: check if swift_number exists in bank account
 2020-05-29 12:56:48 +05:30
Chinmay D. Pai
d6587fa1d5
fix: check if swift_number exists in bank account 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-05-29 12:44:09 +05:30
Rucha Mahabal
43d4397003
Merge branch 'develop' into sla-enhancements 2020-05-29 11:43:49 +05:30
Rucha Mahabal
bc38289a59 fix: added patch for sla enhancements 2020-05-29 11:43:05 +05:30
Saqib
cd8b5d1e4c
fix: cannot assign same task to other asset maintenance (#22024) 2020-05-29 10:21:20 +05:30
Mangesh-Khairnar
c302d066a3
fix: only save end date when transactions are returned (#22023) 2020-05-29 10:19:58 +05:30
Anurag Mishra
cf0168668f
fix: Correct filters (#22022) 2020-05-29 10:19:33 +05:30
Saqib
3c460364b5
fix: disposed asset creates inconsistencies in asset depr report (#22021) 2020-05-29 10:18:06 +05:30
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
Anupam Kumar
8385fed042
crm onboarding typos (#22008) 2020-05-28 22:14:59 +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
Rucha Mahabal
b18606c0d7
Merge pull request #22019 from ruchamahabal/fix-chart 
fix: empty filters in Healthcare Charts
 2020-05-28 19:19:23 +05:30
Rucha Mahabal
a3dd75e77f fix: empty filters in Healthcare Charts 2020-05-28 19:03:37 +05:30
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
9209b9a7de
fix(set_purchase_receipt_delivery_note_detail): commit after every 100 sql updates (#22016) 2020-05-28 18:49:47 +05:30
Deepesh Garg
1f3fe59e36
fix: Default period start date and period end date for financial statements (#22011) 2020-05-28 18:36:21 +05:30
sahil28297
a0f061abd9
fix(rename_bank_reconcilliation): do not delete doc after renaming (#22014) 2020-05-28 18:32:34 +05:30
sahil28297
517ab955ac
fix(rename_bank_reconcilliation): do not delete doc after renaming (#22013) 2020-05-28 18:32:16 +05:30