Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,253 Commits 3 Branches 0 Tags 1 GiB
17e6d0918b
Commit Graph

32253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Afshan
ccf6b5f640 Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing 
Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing
 2020-07-13 11:45:33 +05:30
Afshan
e40605d711 Merge remote-tracking branch 'upstream/develop' into club-mr-column 
Merge remote-tracking branch 'upstream/develop' into club-mr-column
 2020-07-13 11:43:19 +05:30
Deepesh Garg
f5a457c397
Merge branch 'develop' into lead-owner-efficiency 2020-07-13 11:32:09 +05:30
Anupam K
cd445786fe making owner fieldtype to link 2020-07-12 20:03:15 +05:30
Afshan
d058840094
fix: removed fiscal year field from "Request for Quotation" doctype (#22446) 
* fix: removed fiscal year field from "Request for Quotation" doctype
 2020-07-12 19:19:59 +05:30
Raffael Meyer
193e12f02a
fix: download button (#22652) 2020-07-12 17:26:27 +05:30
Afshan
83cd1dcc44
fix: Add project filter in parent task field (#22655) 
* fix: Add project filter in parent task field
 2020-07-11 21:54:54 +05:30
Deepesh Garg
1ab228b52e
Merge pull request #22657 from deepeshgarg007/eway_bill_json_gen 
fix: ewaybill json had json dump of json dump, and other related fixes
 2020-07-11 21:42:01 +05:30
Sagar Vora
c9b4ba6de8 fix: ewaybill json had json dump of json dump, and other related fixes 2020-07-11 21:29:17 +05:30
Deepesh Garg
62d047bf9b
Merge branch 'develop' into payment_reco_cost_center_fix 2020-07-11 21:05:32 +05:30
Deepesh Garg
8cdf33f618
Merge pull request #22635 from deepeshgarg007/item_tax_test 
fix(travis): Item Tax template test
 2020-07-11 21:04:31 +05:30
Deepesh Garg
a9820cdcf6 fix: Remove every bit of randomness from this test 2020-07-11 19:38:51 +05:30
Deepesh Garg
46bcb46422 fix: Do not use random customers 2020-07-11 18:36:32 +05:30
Deepesh Garg
f15ff5fbfa fix: Test 2020-07-11 13:58:53 +05:30
gavin
afee8ce665
Merge pull request #22651 from alyf-de/bump_pandas 
bump: pandas to 1.0.5
 2020-07-11 12:40:27 +05:30
Deepesh Garg
87eb2827ef fix: Update tests 2020-07-10 22:45:45 +05:30
rohitwaghchaure
8d435ae0ba
Merge pull request #22650 from marination/pricing-rule 
fix: Pricing Rule breaks if no item_code
 2020-07-10 21:29:24 +05:30
barredterra
23a65d8d01 fix: duplicate tweepy 2020-07-10 17:46:44 +02:00
barredterra
090bf73768 bump pandas to 1.0.5 2020-07-10 17:43:23 +02:00
marination
a6c10b1bc0 fix: Pricing Rule breaks if no item_code 2020-07-10 20:09:58 +05:30
Karthikeyan S
183ebb237e
Merge branch 'develop' into fix_mandatory_error 2020-07-10 18:05:18 +05:30
gavin
35a443316c
Merge pull request #22613 from netchampfaris/erpnext-install-check 
fix: Check if homepage is not setup-wizard
 2020-07-10 18:01:30 +05:30
gavin
ecf2bae041
Merge branch 'develop' into erpnext-install-check 2020-07-10 17:42:39 +05:30
Afshan
e9affe3705 merge branch develop 2020-07-10 16:31:40 +05:30
Faris Ansari
70aa3c0b1f
fix: Remove explicit exception 
Co-authored-by: gavin <gavin18d@gmail.com>
 2020-07-10 16:13:21 +05:30
Afshan
0863beec92 created new report named "requested_items_to_order_and_receive" removed report "requested_items_to_order" also wrote a patch for deleting old report from table "tabReport" 2020-07-10 15:14:01 +05:30
Afshan
dca8a1d69d renamed "pending qty" to "qty to recieved" 2020-07-10 14:26:21 +05:30
rohitwaghchaure
bca8483dc8
Merge pull request #22634 from Anurag810/retention-bonus-fixes 
fix: default overwrite property and 'company' is not defined
 2020-07-10 13:41:40 +05:30
Deepesh Garg
e99091fd4f
Merge pull request #22644 from deepeshgarg007/dcc_query 
fix: Distributed cost center query
 2020-07-10 13:35:34 +05:30
Deepesh Garg
7cb195b304 fix: Distributed cost center query 2020-07-10 13:33:50 +05:30
Marica
eee12fbcb4
fix: Remove redundant variable declaration (#22641) 2020-07-10 12:34:59 +05:30
Afshan
fd28f1071e
style: arrangements of filters for reports (#22636) 2020-07-10 11:25:39 +05:30
rohitwaghchaure
3a3787f9e7
fix: Due to decimal issue make purchase receipt button not showing from PO (#22629) 2020-07-09 20:07:40 +05:30
rohitwaghchaure
d14666e419
fix: incorrect delivered qty in Supplier-Wise Sales Analytics (#22631) 2020-07-09 20:07:10 +05:30
Marica
1ec2d962db
fix: Remove rename related code from Serial No (#22627) 2020-07-09 20:02:18 +05:30
Deepesh Garg
b74077faf5 fix(travis): Item Tax tempate template test 2020-07-09 19:50:41 +05:30
Anurag Mishra
d7563f0327 fix: default overwroite property n 'company' is not defined 2020-07-09 19:40:18 +05:30
Rohan
cdf55cef80
fix: fetch project-related info in Timesheet (#22423) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-09 11:36:01 +05:30
Rucha Mahabal
3265274854
Merge pull request #22625 from ruchamahabal/fix-encounter-deletion 
fix: attribute error while cancelling patient encounter
 2020-07-09 11:25:45 +05:30
Rucha Mahabal
6c6c36e780 fix: attribute error while cancelling patient encounter 2020-07-09 11:23:41 +05:30
Afshan
a629c9e1bc style: remove import comment 2020-07-08 19:28:28 +05:30
Afshan
d16d0efde5 feat: added range for age in stock ageing 2020-07-08 19:23:13 +05:30
Rucha Mahabal
45b01d2c02
feat: add medical coding fields to Healthcare DocTypes (#22501) 
* feat: add medical coding fields to templates

* feat: fetch medical codes from templates in forms

* fix: codacy issues

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-08 15:39:45 +05:30
Afshan
e0ff0cfcb9
fix: fetch "Employee Leave Policy" from "Employee Grade" if available (#22570) 
* fix:fetch "Employee Leave Policy" from "Employee Grade" if available

* fix: checked "Fetch IF Empty" checkbox

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-08 14:40:22 +05:30
Marica
b78dc75456
Merge pull request #22573 from deepeshgarg007/employee_tree 
feat: Added all companies option in employee tree to view employee ac…
 2020-07-08 14:34:33 +05:30
rohitwaghchaure
0cd39e3a38
Merge pull request #22611 from frappe/hrms-dashboard-fix 
fix: HR dashboard number card filter
 2020-07-08 14:33:45 +05:30
Marica
9e73fdd866
Merge branch 'develop' into employee_tree 2020-07-08 14:33:10 +05:30
Michelle Alva
5d514fe4df
fix: grammatical fixes in module onboarding (#22580) 
* fix: grammatical fixes in module onboarding

* fix: more grammatical changes for consistency

* fix: Reorder Stock Onboarding

* fix: update success message

* fix: change order of stock onboarding steps

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-08 14:25:51 +05:30
Marica
3f05a2692e
Merge branch 'develop' into employee_tree 2020-07-08 14:04:49 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts 2020-07-08 13:11:37 +05:30