Saurabh
ab5e77ecf1
[fix] do not pull disabled pos profiles ( #11733 )
2017-11-27 11:26:13 +05:30
rohitwaghchaure
15f8fe0179
[fix] Batch selected in the sales transaction for non batch item ( #11713 )
2017-11-24 10:46:27 +05:30
Saurabh
41f60546a1
[fix] do not allow user to create party type ( #11706 )
2017-11-23 18:02:51 +05:30
Nabin Hait
82ef26b327
Minor fix in patch
2017-11-23 17:57:33 +05:30
Nabin Hait
aa5b566ea9
Merge branch 'ashish-greycube-feature_10861-1' into develop
2017-11-23 17:49:25 +05:30
Nabin Hait
68768252ce
Cleanup and fixes on bypass credit limit check on sales order
2017-11-23 17:48:59 +05:30
rohitwaghchaure
1e381584de
Merge pull request #11703 from rohitwaghchaure/pos_bind_event_issue
...
Code cleanup
2017-11-23 16:31:54 +05:30
Rohit Waghchaure
09b39f06ea
Code cleanup
2017-11-23 16:30:10 +05:30
Nabin Hait
57952f6946
Merge branch 'develop' into feature_10861
2017-11-23 16:12:55 +05:30
Manas Solanki
966f141f62
Rename schools to Education ( #11524 )
...
* renaming for the docs, demo data and patch
* changes in the doctypes and reports
* rename the config file
* Few name changes in messages and license
* rename the school settings to education settings
* changes in the documentation
* added the setup file for the fixtures
* corrected the ui tests file path
* fix the codacy
* add the patch for renaming few doctypes and fields
* changes in the patch
2017-11-23 15:22:10 +05:30
Nabin Hait
cda4d50063
Fixed reserved qty for production logic and patch for reposting ( #11691 )
2017-11-23 13:05:43 +05:30
tundebabzy
acccdb3890
Default batch number selection ( #11454 )
...
* fetch batch_no in `get_basic_details`
* PEP8 changes and docstring
* only auto-fetch batch number for Sales documents:
otherwise, automatic batch creation will not work properly because all new
stock will be added to old batch
* new function to fetch batch number using FEFO:
FEFO - First Expiring First Out
* fetch batch number in `get_basic_details` using FEFO
* add new function - `set_batch_number`
* `set_batch_number` when `qty` is triggered
* `set_batch_number` when `uom` is triggered
* whitelist `get_batch_no_fefo`
* code clean up
* move `set_batch_number` to conversion_factor instead of uom
* rename `get_batch_no_fefo` to `get_batch_no`
* fix test case
* final cleanup
* Revert "fetch batch_no in `get_basic_details`"
This reverts commit dd024b1eb369eaeafab28165d523fb7a9f8ab8d3.
* fix test case
* update Sales Invoice manual
* move changes away from `transaction.js`
* query should not fetch expired batches
* refactor `get_batch_no`:
add new function `get_batches`
* Update batch.py
2017-11-23 13:05:15 +05:30
Nabin Hait
82027ea3bf
Set print hide property for payment terms
2017-11-23 12:49:42 +05:30
Manas Solanki
30babee2ef
add courses in the program enrollment ( #11694 )
2017-11-23 12:19:57 +05:30
Zarrar
a90274fed9
linking issue in dashboard ( #11701 )
2017-11-23 12:19:40 +05:30
Jamsheer
1ce56316ea
Populate patient_name in Healthcare Doctypes ( #11690 )
...
* On Cancel Consultation - Open Appointment - Delete Medical Record
* Add Filter on Account Selection - is_group: 0
* Patient Medical Record - List view Fixes
* Update consultation.py
* Set Appointment Refrence in Vital Signs
* Add Other in Gender Selection
* Populate patient_name in Healthcare Doctypes
2017-11-23 12:18:43 +05:30
Saurabh
ed4191ec5b
[fix] merge-conflicts
2017-11-22 18:01:56 +05:30
Saurabh
7cf945c975
Merge branch 'hotfix'
2017-11-22 17:54:18 +05:30
Saurabh
4bc12b68e4
bumped to version 9.2.16
2017-11-22 18:24:18 +06:00
Nabin Hait
02ac901345
[fix] Rounding adjustment in company currency
2017-11-22 16:12:20 +05:30
rohitwaghchaure
4dc5f0efaf
[Fix] Item details not fetching if item has no default bom ( #11688 )
2017-11-22 15:21:47 +05:30
Nabin Hait
96abfd2ab9
[fix] In payment entry, run some events serially to avoid async issue
2017-11-22 15:13:16 +05:30
Nabin Hait
036bf6de6e
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2017-11-21 20:19:13 +05:30
Nabin Hait
32a62a02df
Fixed merge conflict
2017-11-21 20:18:03 +05:30
Nabin Hait
0551f7bb00
Cleanup and fixes of payment terms feature
2017-11-21 19:58:16 +05:30
Zarrar
657ceef105
skipped tax_account ( #11678 )
2017-11-21 17:40:22 +05:30
Faris Ansari
6ca6a69070
Course Scheduling Tool ( #11676 )
...
* [education] Fix Course Scheduling Tool
* minor
2017-11-21 17:28:51 +05:30
Rushabh Mehta
476c66d699
[fix] tests.txt
2017-11-21 17:02:39 +05:30
Rushabh Mehta
26ca6afd11
[fix] test.txt for accounts
2017-11-21 16:17:58 +05:30
rohitwaghchaure
e8ccc0e942
[enhance] Added multi UOM feature in Material Request ( #11352 )
...
* [enhance] Added multi UOM in Material Request
* test cases
* patch to update multi uom fields in material request item
2017-11-21 16:17:22 +05:30
Makarand Bauskar
75443a94ee
[minor] set the pos profile name while creating demo ( #11664 )
2017-11-21 16:12:40 +05:30
Zarrar
f71f3af938
adding task to root node ( #11666 )
2017-11-21 16:12:01 +05:30
Saurabh
5add4897a5
Merge pull request #11506 from saurabh6790/test_patches
...
[travis] run patches by restoring v7 database
2017-11-21 15:56:54 +05:30
Saurabh
6edf12540a
Merge pull request #11675 from saurabh6790/test-case-path-fixes
...
[fix] ui test-case path
2017-11-21 15:56:23 +05:30
Saurabh
d503f12713
[fix] ui test-case path
2017-11-21 15:22:41 +05:30
Rushabh Mehta
5171da81a1
[minor] fix-patch
2017-11-21 15:18:47 +05:30
Nabin Hait
cc884578b5
Update sales_order.py
2017-11-21 12:24:03 +05:30
rohitwaghchaure
834541a7e8
[fix] Added primary action in the modal which will show on the submission in the pos ( #11575 )
2017-11-20 11:31:53 +05:30
Britlog
1484793055
Shopping cart addresses management ( #11657 )
2017-11-20 11:22:18 +05:30
rohitwaghchaure
179e0c1d8d
Added party name in accounts receivable/payable report ( #11656 )
2017-11-20 11:18:55 +05:30
creamdory
fd1503c6a5
[New Feature] Delivery
2017-11-20 10:28:49 +08:00
rohitwaghchaure
34d6340be6
Merge pull request #11647 from rohitwaghchaure/pos_selling_price_issue
...
[fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment
2017-11-18 21:33:32 +05:30
Rohit Waghchaure
77940493a8
[fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment
2017-11-18 19:06:31 +05:30
Prateeksha Singh
e1b8629313
Fix setup wiz test ( #11640 )
...
* increase timeout in setup wiz test
* enable profile slide
2017-11-17 20:08:45 +05:30
KanchanChauhan
0fe455a991
[Minor][Bug] Fix syntax error ( #11633 )
2017-11-17 20:08:15 +05:30
Saurabh
00e82cdab3
[fix] patch fixes to setup patch tester on travis
2017-11-17 19:08:01 +05:30
Saurabh
a8823eadb6
[travis] run patches by restoring v7 database
2017-11-17 19:08:01 +05:30
Prateeksha Singh
241d64d8c1
Merge pull request #11634 from pratu16x7/variant-modal-fix
...
[minor] fix plurals spacing
2017-11-17 15:34:34 +05:30
pratu16x7
83587c72f6
[minor] fix plurals spacing
2017-11-17 15:33:12 +05:30
Saurabh
a4f78211ab
Merge branch 'master' into develop
2017-11-17 14:55:24 +05:30
