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

21693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenneth Sequeira
b48557fdc6 payment terms video tutorial in videos/learn (#13258) 
* payment terms video tutorial in videos/learn

* Update payment-terms.md
 2018-03-12 13:07:21 +05:30
Shreya Shah
ef4c3b8e2f add has variants in standard filter (#13251) 2018-03-12 11:20:49 +05:30
Prateeksha Singh
71166d46f9
Merge pull request #13270 from pratu16x7/charts-fix 
Update Charts to v1
 2018-03-12 10:56:49 +05:30
Prateeksha Singh
9362cf37e0 [charts] update charts API 2018-03-12 09:54:56 +05:30
Nabin Hait
fd75d554d2 Payment Terms Template added in test_ignore for Company 2018-03-09 18:52:14 +05:30
Nabin Hait
5e63c265db Fixed merge conflict 2018-03-09 17:34:39 +05:30
Nabin Hait
3dea6589d7 Merge branch 'hotfix' 2018-03-09 16:38:51 +05:30
Nabin Hait
096d136460 bumped to version 10.1.7 2018-03-09 17:08:50 +06:00
Nabin Hait
c3889d85a1
Update shopping_cart.js 2018-03-09 16:28:25 +05:30
Achilles Rasquinha
138a4850fe
Merge pull request #13252 from achillesrasquinha/py3 
sort by name accounts for trial balance.
 2018-03-09 15:23:28 +05:30
Achilles Rasquinha
dc61c6b975 sort by name accounts 2018-03-09 15:23:08 +05:30
Achilles Rasquinha
1d7665fca1 sort by name accounts 2018-03-09 15:22:20 +05:30
Nabin Hait
052333ea63 subctracting stock entry should also be considered as consumed qty 2018-03-09 14:30:32 +05:30
Nabin Hait
0357fbc9c1 commonfied regional function for checking delete permission 2018-03-09 13:19:52 +05:30
Nabin Hait
6d532a82ee Merge branch 'theopen-institute-nepal-localization' into develop 2018-03-09 13:11:19 +05:30
Nabin Hait
096c05ca6f Fixes for regional feature of Nepal 2018-03-09 13:11:00 +05:30
theopen-institute
38cbd71352 prevent deletion of sales invoices if country is nepal 2018-03-09 12:39:40 +05:30
Achilles Rasquinha
b4de7e3d07 removed has_key, used pythonic in (#13236) 
* removed has_key, used pythonic in

* Update bom.py
 2018-03-09 12:35:47 +05:30
Suraj Shetty
f2d28ebd6a Data import Tool bug fix (#13165) 
* fixes #13064

* commonified naming series checks

* test fixes
replaced test employee names according to naming series
 2018-03-09 12:33:13 +05:30
tundebabzy
e69747ca6d [Feature Request] Add Payment Mode field on Payment Terms Template #13117 (#13243) 
* add mode of payment field to Payment Term

* add mode of payment field to Payment Terms Template Detail

* add mode of payment field to Payment Schedule

* add mode of payment in `get_payment_term_details`
 2018-03-09 12:23:53 +05:30
Shreya Shah
aadd30d194 fetch delivery date on add-row only if item_code exists (#13250) 2018-03-09 12:19:35 +05:30
Zarrar
3fd634783d [Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198) 
* customer code can be assigned based on customer group

* improvise customer group selection

* requested changes made
 2018-03-09 12:10:45 +05:30
Harsh Patel
22e6f8d4c2 Fixes for #13071 (#13234) 2018-03-08 16:23:59 +05:30
rohitwaghchaure
acd3479269 Bank POS transactions in bank reconciliation (#13225) 2018-03-08 16:22:39 +05:30
rohitwaghchaure
a32e57ae82 [Fix] Discount in offline POS is enabled even is it's disabled in POS Profile (#13233) 2018-03-08 16:21:13 +05:30
Ranjith Kurungadam
a3a63177a1 fix- cannot cancel consultation, remove updating age (#13226) 2018-03-08 16:20:22 +05:30
Achilles Rasquinha
b2f7092f9e
Merge pull request #13235 from achillesrasquinha/py3 
removed has_key
 2018-03-08 14:22:36 +05:30
Achilles Rasquinha
87dab14576 removed has_key 2018-03-08 14:21:48 +05:30
Achilles Rasquinha
30f6f7dd55
Merge pull request #13232 from codingCoffee/indentation_fix 
indentation fix
 2018-03-08 13:27:52 +05:30
Ameya Shenoy
d2eec91b2c
indentation fix 2018-03-08 13:27:11 +05:30
Achilles Rasquinha
755d3782a5
Merge pull request #13230 from achillesrasquinha/develop 
fixed tabs
 2018-03-08 13:21:42 +05:30
Achilles Rasquinha
9efd6e80d2 fixed tabs 2018-03-08 13:20:48 +05:30
Achilles Rasquinha
ed710e2f2f Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-03-08 13:19:31 +05:30
Achilles Rasquinha
7df344409e
Merge pull request #13229 from achillesrasquinha/py3 
fixed tabs
 2018-03-08 13:17:19 +05:30
Achilles Rasquinha
e96a5770f2 fixed tabs 2018-03-08 13:16:29 +05:30
Achilles Rasquinha
987934d8ee fixed tabs 2018-03-08 13:16:08 +05:30
Achilles Rasquinha
abd365fd90
Merge pull request #13228 from achillesrasquinha/py3 
[FIX] filter to list
 2018-03-08 13:11:58 +05:30
Achilles Rasquinha
908289d40a [FIX] filter to list 2018-03-08 13:10:51 +05:30
Jamsheer
665b48773f Healthcare - Patient Appointment - Service unit based scheduling and booking (#13211) 
* New Document - Patient Service Unit

* Physician - schedule based on patient service unit

* Consultation - Remove validation on submit

* Consultation - Label changed from Drug Prescription to Medication

* Availability check and book appointment based on service unit, appointment invoice creation optimized

* patch fixes

* Patient Service Unit - field - overlap_appointments

* Patient Appointment - Service Unit based scheduling and booking

* Patient Appointment - issue fixed #13016 Healthcare Patient Appointment Save Button Issue - remove validation on save and enable save on book appointment

* Codacy fixes on PR #13211

* Codacy fixes on PR #13211

* Fee validity test -fixes

* Fee Validity - test - fixes
 2018-03-08 13:08:35 +05:30
Achilles Rasquinha
11241044b2
Merge pull request #13227 from achillesrasquinha/py3 
[FIX] use text_type instead of unicode, use cmp from past.builtins
 2018-03-08 12:58:21 +05:30
Achilles Rasquinha
9050998e06 [FIX] use text_type instead of unicode, use cmp from past.builtins 2018-03-08 12:55:41 +05:30
theopen-institute
1bfa243190 fix patch that causes error on bench update (#13222) 2018-03-08 11:20:40 +05:30
lasalesi
470977fa13 corrected setup wizard tax rates for Switzerland 2018 (#13220) (#13221) 2018-03-08 11:19:56 +05:30
tundebabzy
1643cce479 fetch journal entry details (#13218) 2018-03-08 11:17:17 +05:30
Manas Solanki
bb42e3b411
Merge pull request #13214 from manassolanki/assessment-report-fix 
minor fix for key error in assessment reports
 2018-03-07 16:30:35 +05:30
Manas Solanki
586e9400b1 minor fix for key error 2018-03-07 16:28:21 +05:30
Shreya Shah
c3bf1fa009 [Fixes] Chapter DocType (#13213) 
* fetch chapter head from member doctype instead of user

* add enabled in grid view and set default as 1
 2018-03-07 16:27:30 +05:30
rohitwaghchaure
bbd9b71547 Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item (#13043) 2018-03-07 15:39:40 +05:30
Vishal Dhayagude
668ec25d19 Allow Item variant Rename (#13161) 
* [WIP] Item varient rename

* [wip] Item Variant

* [fix] Item Varient Rename

* [fix] Item Attribution Rename

* removed unwanted code
 2018-03-07 15:31:08 +05:30
Nabin Hait
c50d7446b5 Merge branch 'master' into develop 2018-03-07 13:09:07 +05:30