Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,983 Commits 3 Branches 0 Tags 1 GiB
6ecb2556b7
Commit Graph

23983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benji
6c9a92671b Minor bugfix (#15210) 
* Minor bugfix

Bugfix for https://github.com/frappe/erpnext/pull/15170

* Update project.py
 2018-09-05 13:24:53 +05:30
Nabin Hait
5122a8e0d7 Merge branch 'staging' into develop 2018-09-05 11:47:30 +05:30
johnhkelley1
431b4fba72 Allow for 0 valuation rate in Stock Reconciliation (#15313) 
Currently, a valuation rate of 0 gets treated the same as an omitted
valuation rate, and gets overwritten during validation. This hotfix
allows a Stock Reconciliation Item's valuation rate to be set to 0.
 2018-09-05 11:43:28 +05:30
Zarrar
3cea3c46b6 change modified date of account to reload fields (#15317) 2018-09-05 11:41:54 +05:30
Saif
8f00db58bd -Moved JE's User Remark on the top of the generated remarks (#15314) 
-Added a field in JE's Account entries to add remarks in specific JE Account entry
 2018-09-05 11:13:06 +05:30
rohitwaghchaure
bcaca85873 [Fix] Meta object has no attribute permissions (#15316) 2018-09-05 11:10:17 +05:30
KanchanChauhan
73bd3cb278 Moved daily event (update_latest_price_in_all_boms) to daily_long since it was timing out (#15253) 2018-09-05 11:01:35 +05:30
Charles-Henri Decultot
b07f482c0c Test case for contact references (#15077) 
* test case for contact references

* Add teardown
 2018-09-05 11:00:14 +05:30
Prateeksha Singh
f9c5da5df0
Merge pull request #15310 from pratu16x7/marketplace-fixes 
[fix] filter() result in list
 2018-09-04 11:01:25 +05:30
Prateeksha Singh
8a160684b7 [fix] filter() result in list 2018-09-04 10:59:20 +05:30
Faris Ansari
f8af7e0b3d
Merge pull request #15309 from frappe/hub-multiuser 
fix: Revert skeleton in Sidebar
 2018-09-04 10:43:52 +05:30
Faris Ansari
7be9c381d8 fix: Revert skeleton in Sidebar 
- sidebar items repeating for some reason
 2018-09-04 00:12:47 +05:30
Faris Ansari
74a32e6ffe
Merge pull request #15305 from frappe/hub-multiuser 
feat: Add skeleton to Home and Sidebar
 2018-09-03 19:40:22 +05:30
Faris Ansari
66321e6af7 feat: Add skeleton to Home and Sidebar 2018-09-03 19:39:19 +05:30
Prateeksha Singh
76f2430152
Merge pull request #15303 from frappe/hub-multiuser 
Hub Multiuser
 2018-09-03 18:57:41 +05:30
Prateeksha Singh
1265a26c0c Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 18:50:25 +05:30
Prateeksha Singh
456c39336d [hub] update settings after publish, fix route_map 2018-09-03 18:49:33 +05:30
Faris Ansari
2b80bbbe16 Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 17:50:06 +05:30
Prateeksha Singh
6ba9b3f4de [hub] hide Contact Seller and Save Item in read-only 2018-09-03 17:49:11 +05:30
Faris Ansari
b592a76016 fix: Selling Messages 2018-09-03 17:49:11 +05:30
Prateeksha Singh
ad6948844e Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 17:32:17 +05:30
Prateeksha Singh
b2eadfe31d [hub] show become a seller button to all, but not dialog 2018-09-03 17:31:43 +05:30
Faris Ansari
49ccdd6f07 fix: Move image saving code to hub server 2018-09-03 17:24:17 +05:30
Faris Ansari
d4bba297c2 fix: Container title 2018-09-03 17:12:22 +05:30
Saurabh
1fe1884b73 Merge branch 'master' into develop 2018-09-03 17:00:17 +05:30
Saurabh
fba985d49d Merge branch 'hotfix' 2018-09-03 17:00:15 +05:30
Saurabh
4bd562d669 bumped to version 10.1.51 2018-09-03 17:30:15 +06:00
Faris Ansari
28652baacc Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 16:54:04 +05:30
Faris Ansari
b296be041e fix: email in profile dialog 2018-09-03 16:53:56 +05:30
Prateeksha Singh
bffb707c17 [fix] add message for admin users before register dialog 
- use is_registered api for page routes
 2018-09-03 16:39:59 +05:30
Prateeksha Singh
8fe5e8adf8 Merge branch 'develop' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 16:15:42 +05:30
Prateeksha Singh
adef70f8df [hub] update_hub_url patch to use marketplace_url 2018-09-03 16:12:50 +05:30
Saurabh
64aed6a16a
Merge pull request #15301 from saurabh6790/staging 
[fix] setup lang in patch
 2018-09-03 16:08:25 +05:30
Saurabh
7b38d93e03 [fix] setup lang in patch 2018-09-03 16:07:40 +05:30
Frappe PR Bot
5c0a831ff2 [Translation] Updated Translations (#15299) 2018-09-03 15:58:04 +05:30
Faris Ansari
ad0be6aaa2 fix: Messages 
- update messages according to new doctype
- sync logo in seller registration
- hub.is_seller_registered() and hub.is_user_registered() api
- Add Users dialog
 2018-09-03 15:43:09 +05:30
Prateeksha Singh
18e3c61109 [marketplace] Disallow unregistered routes if not registered 2018-09-03 15:22:13 +05:30
Prateeksha Singh
47cc30da85 [hub] ask company description in dialog 2018-09-03 13:11:23 +05:30
Shreya Shah
bb88e964a4 Remove unnecessary code (#15296) 2018-09-03 13:01:12 +05:30
Nabin Hait
13109aef9d fix: validate only if service stop date 2018-09-03 12:18:17 +05:30
Jamsheer
8f808cbaf6 Patch - redesign healthcare billing work flow - fix 2018-09-03 11:26:19 +05:30
Jamsheer
34e561876a Test prescription in Sales Invoice - Patient Encounter in draft status 2018-09-03 11:26:19 +05:30
Jamsheer
0640b4794e Healthcare Practitioner - dashboard - updated 2018-09-03 11:26:19 +05:30
Jamsheer
a3b76fa40e Healthcare - Masters - allow import set to 1 2018-09-03 11:26:19 +05:30
Jamsheer
b0ea297cf8 Patient Appointment - department - reqd = 0 2018-09-03 11:26:19 +05:30
Ranjith
2e48337cd4 Patient Encounter - update fields patient_name, patient_age 2018-09-03 11:26:19 +05:30
Jamsheer
a0b3e0268b Healthcare - Doctype - field index = 1 2018-09-03 11:26:19 +05:30
Jamsheer
359bb512b4 Payment mode and Paid amount in Patient Appointment 2018-09-03 11:26:18 +05:30
Jamsheer
7cc205946c Restrict to Healthcare 2018-09-03 11:26:18 +05:30
Jamsheer
363deb67c3 Automate - Patient Apointment Invoicing 2018-09-03 11:26:18 +05:30