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

22647 Commits

Author SHA1 Message Date
Rucha Mahabal
bf26b10df4
Merge branch 'develop' into sla-enhancements 2020-06-15 13:15:03 +05:30
Deepesh Garg
11253a91f1
Merge pull request #22199 from marination/qi-on-return 
fix: Don't prompt for Quality Inspection on Return Documents.
 2020-06-14 17:09:51 +05:30
rohitwaghchaure
25f49d59c5
Merge pull request #22233 from deepeshgarg007/pi_billing_address 
fix: Billing address in for Purchase documents
 2020-06-14 15:10:43 +05:30
rohitwaghchaure
c5a2803a1c
Merge pull request #22239 from rohitwaghchaure/item-none-not-found-opening-creation-tool-develop 
fix: item none not found while making sales invoice using opening inv…
 2020-06-14 15:09:38 +05:30
Rohit Waghchaure
d6f9a51cbb fix: item none not found while making sales invoice using opening invoice creation tool 2020-06-14 14:46:49 +05:30
Anupam K
234b5f9a8c sm-post-permission-fix 2020-06-14 10:34:58 +05:30
Anupam K
c2d1ed7a34 Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-dashboard 2020-06-14 00:09:45 +05:30
Anupam K
65e7a2e7a6 opportunity-dashboard-fix 2020-06-14 00:05:38 +05:30
Deepesh Garg
6760077674 fix: Billing address in for Purchase documents 2020-06-13 22:40:23 +05:30
Deepesh Garg
dcdd1f3d9b
Merge pull request #22227 from frappe/opportunity-dashboard 
fix: Links in opportunity dashboard
 2020-06-13 22:16:10 +05:30
Deepesh Garg
5f4330621c
Merge pull request #22231 from deepeshgarg007/financila_satement_immutable 
fix: Handle cancelled entries in financial statements
 2020-06-13 21:19:20 +05:30
Deepesh Garg
cc4943d54d fix: Distributed cost center query updation 2020-06-13 21:13:52 +05:30
Deepesh Garg
d80d442aa1 fix: Do not select cancelled entries in financial statements 2020-06-13 21:12:19 +05:30
Deepesh Garg
f3261794d9
Merge pull request #22230 from deepeshgarg007/financial_statement_to_date_v13 
fix: Data not appearing properly for some fiscal_year in financial statements
 2020-06-13 19:27:38 +05:30
Deepesh Garg
15231aa60d fix: Data not appearing properly for some fiscal_year in financial statemets 2020-06-13 19:26:39 +05:30
Anupam K
8bc414620b opportunity-dashboard-fix 2020-06-13 13:11:43 +05:30
Anurag Mishra
5b8a47d072
fix: patch for expense claim (#22226) 2020-06-13 01:04:32 +05:30
Deepesh Garg
28fecb1b29
Merge pull request #22198 from scmmishra/membership-fixes 
fix: verification for razorpay hooks
 2020-06-12 21:28:07 +05:30
John Clarke
15e4ea0472
Merge branch 'develop' into clarkejj-patch-1 2020-06-12 07:55:49 -06:00
John Clarke
85f237257a
Thanks so much for your pointer Marica - that violation is clear and obvious to me in retrospect, but a good relearning experience in any case 2020-06-12 07:22:14 -06:00
Anurag Mishra
7558e64d6d
fix: set_query in leave application (#22197) 2020-06-12 17:37:59 +05:30
John Clarke
677978dd00
Update stock_ageing.py 
As reviewer Deepesh Garg advised thanks!  batch[0] can be int of float - see line 49 - so change proposed cint to flt
 2020-06-12 05:53:24 -06:00
rohitwaghchaure
ee6f80e25b
Merge pull request #22213 from vishdha/fix-credit-limit-notification_v13 
feat: notify credit controller role users with credit limit extension request
 2020-06-12 16:37:41 +05:30
Sahil Khan
182c1f860b fix(patch): escape special characters in company field 2020-06-12 15:16:20 +05:30
Abhishek Balam
86ea75e49e
fix(HR): Change Due Advance Amount to Pending Amount (#22123) 
* rename 'Due Advance Amount' field to 'Pending Amount'

* changed fieldname and references for easier debugging

* added patch for moving data

* added newline added

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-12 13:13:14 +05:30
Shivam Mishra
3bf18509ba
Merge branch 'develop' into membership-fixes 2020-06-12 07:27:20 +00:00
Rohan Bansal
ccd03bc120 feat: notify credit controller role users with credit limit extension requests 2020-06-12 12:48:54 +05:30
Vignesh S
90957b7f74
feat(Attendance): Add In and Out time to attendance (#21547) 
* 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>
 2020-06-12 12:32:55 +05:30
Marica
c62a6df016
Merge branch 'develop' into qi-on-return 2020-06-12 12:31:20 +05:30
Marica
fd3d976e06
Update erpnext/controllers/stock_controller.py 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-06-12 12:30:59 +05:30
Deepesh Garg
d09aa53571
Merge pull request #22208 from aliriocastro/fix-itemwise-rec-reord-level-report 
fix: key name to get float precision was misspelled
 2020-06-12 10:04:58 +05:30
Deepesh Garg
ca97e19b7e
Merge pull request #22203 from marination/account-tree 
fix: Check for Company before rendering tree in Account Tree
 2020-06-12 10:02:41 +05:30
Alirio Castro
faf33072c8 fix: key was mispelled 2020-06-11 23:32:53 -04:00
Shivam Mishra
241088c73e
Merge branch 'develop' into membership-fixes 2020-06-11 16:53:15 +00:00
John Clarke
6b55f66f02
Stock Ageing TypeError: ‘<’ not supported between instances of ‘int’ and ‘str’ 
Proposed fix re this error report https://discuss.erpnext.com/t/stock-ageing-report-typeerror-not-supported-between-instances-of-int-and-str/62605
 2020-06-11 10:24:48 -06:00
marination
c9a6e4f151 fix: Check for Company before rendering tree in Account Tree 2020-06-11 19:54:44 +05:30
Abhishek Balam
44b8cf4fef
enable 'user cannot create' for payment request (#22044) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-11 19:31:41 +05:30
Rucha Mahabal
d7481f59ba fix: patch 2020-06-11 17:41:05 +05:30
Rucha Mahabal
4dbb7c552c
Merge branch 'develop' into sla-enhancements 2020-06-11 17:04:20 +05:30
Rucha Mahabal
9c27d683ba
fix: priority column width 
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-06-11 17:03:53 +05:30
marination
596560c3c2 fix: Don't prompt for Quality Inspection on Return Documents. 2020-06-11 16:39:03 +05:30
Shivam Mishra
3f60801566
Merge branch 'develop' into membership-fixes 2020-06-11 10:16:39 +00:00
Shivam Mishra
8c24810f30 refactor: ignore mandatory for customer 2020-06-11 15:42:29 +05:30
Shivam Mishra
49d51b8ce7 feat: check duplicate contact explicitly 2020-06-11 14:24:07 +05:30
Shivam Mishra
84fcc55a36 refactor: do nothing if member is not found 2020-06-11 13:34:40 +05:30
Shivam Mishra
8d61a0abef fix: use string to verify webhook 2020-06-11 13:34:25 +05:30
Deepesh Garg
7d3c3b9a8b
Merge pull request #22188 from deepeshgarg007/payment_terms_outstanding 
fix: Update payment schedule based on payment terms
 2020-06-10 22:17:37 +05:30
Deepesh Garg
a0fd97f2ac fix: Update payment schedule based on payment terms 2020-06-10 22:15:27 +05:30
Deepesh Garg
f108574772
Merge pull request #22186 from deepeshgarg007/inter_warehouse_party_validation 
fix: Party validation for inter-warehouse transaction
 2020-06-10 20:02:43 +05:30
Deepesh Garg
7963e2b708 fix: Party validation for inter-warehouse transaction 2020-06-10 19:57:49 +05:30