tundebabzy
2a4fefc6ff
Auto fetch batches based on quantity on POS ( #11004 ) ( #11767 )
...
* prevent premature escape when item has serial no and batch no
* fetch actual_batch_qty for item
* add available_qty to dialog
* remove expired batches from drop-down
* Update queries.py
2017-11-29 10:53:09 +05:30
Julian Robbins
d785e22211
Fix spelling of accessibility ( #11765 )
2017-11-29 10:49:12 +05:30
tunde
0d82b6979e
add missing field and value parameters
2017-11-28 23:30:03 +01:00
tundebabzy
bc7c387a0d
set read only property properly ( #11761 )
2017-11-28 22:40:05 +05:30
Prateeksha Singh
bf31d853e7
Merge pull request #11762 from manassolanki/fix
...
fix for module in the new report
2017-11-28 19:08:52 +05:30
Manas Solanki
34a8be83ea
delete the old files
2017-11-28 18:47:56 +05:30
Manas Solanki
49ff065684
fix for the new report module
2017-11-28 18:44:06 +05:30
Manas Solanki
84e9d45055
Minor fixes for the Education domain ( #11758 )
...
* add the new role Education Manager for education settings
* minor changes in the hooks for bootinfo
* Fix for amending the assessment plan
2017-11-28 18:04:08 +05:30
Nabin Hait
cf9573ab2f
Removed asset doctypes files from accounts module and patches
2017-11-28 16:56:53 +05:30
rohitwaghchaure
c037dc775e
Refactor multi pos profile selection in the pos invoice ( #11721 )
2017-11-28 16:11:15 +05:30
Shreya Shah
8d9edbf133
Letterhead in user progress ( #11679 )
...
* added letter-head to user progress slides
* added letterhead action to patch
* improvised
* added date in patches.txt
2017-11-28 16:09:58 +05:30
Kanchan Chauhan
e58a41a8a2
Added maintenance to Asset and enhanced maintenance for Asset Maintenance
2017-11-28 15:14:56 +05:30
Nabin Hait
35cd1d325f
[fix] Set GST State code based on state, even if GSTIN not mentioned ( #11755 )
2017-11-28 13:01:01 +05:30
Doridel Cahanap
de82fe9e8f
[minor] Set Rename for Training Program ( #11740 )
2017-11-28 11:26:23 +05:30
Saurabh
b750b304dd
fixed merge-conflicts
2017-11-28 11:02:28 +05:30
Saurabh
d86ace41a1
bumped to version 9.2.17
2017-11-28 11:30:17 +06:00
Jamsheer
b488475d92
Remove Company from Patient - Patches Added ( #11716 )
...
* Remove Company from Patient - Patches Added
* Update patient DOB field label to Date of birth
* Patient marital status default null
* Update patient.py
2017-11-28 10:47:06 +05:30
Saurabh
8eda0cc8ba
[fix] validate bom if order type is subcontracting ( #11705 )
...
* [fix] validate bom if order type is subcontracting
* [fix] moved validation to server side
2017-11-28 10:41:35 +05:30
rohitwaghchaure
a14baf4188
Merge pull request #11739 from rohitwaghchaure/payment_terms_test_case
...
[fix] payment terms test case
2017-11-27 12:05:57 +05:30
Saurabh
9d0092f89a
[fix] pull source warehouse from production order child table ( #11718 )
2017-11-27 12:04:41 +05:30
Shreya Shah
e3d6d21ec5
[Fix] Item name and description in production order ( #11723 )
...
* fetch item name and description from bom
* Update production_order.py
* patch added
* Update set_item_name_in_production_order.py
2017-11-27 12:02:13 +05:30
Charles-Henri Decultot
22641e44ad
Allowing the creation of an Oganization as Lead ( #11724 )
...
* Allow the creation of an organization lead
* Changes following test fails
* Test case correction
2017-11-27 11:58:22 +05:30
Shreya Shah
dcbc4284d3
expenses included in valuation account type in purchase taxes and charges ( #11725 )
2017-11-27 11:48:09 +05:30
Rohit Waghchaure
52bf56d415
[fix] payment terms test case
2017-11-27 11:43:52 +05:30
rohitwaghchaure
373b5702a9
[fix] Server test cases ( #11727 )
2017-11-27 11:27:28 +05:30
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
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
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
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
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
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
Saurabh
f773af6053
bumped to version 9.2.15
2017-11-17 15:25:23 +06:00
Saurabh
11ec2c50e0
[fix] set default language in local
2017-11-17 14:51:08 +05:30
Zarrar
1b4894c33a
make root_type null if not root ( #11626 )
2017-11-17 14:32:12 +05:30
Rushabh Mehta
30dc9a14c6
[feature] [refactor] Shipping Rule for Buying + Refactor ( #11628 )
...
* Shipping rule for Buying
* [refactor] shipping rule
2017-11-17 14:31:09 +05:30
Saurabh
66e65dc104
[fix] merge-conflicts
2017-11-17 14:03:13 +05:30
Saurabh
05ed86a00e
bumped to version 9.2.14
2017-11-17 14:31:29 +06:00
Rohit Waghchaure
44f7b157ff
[fix] POS redirect issue
2017-11-17 13:52:11 +05:30
Nabin Hait
7fa111de45
Update sales_invoice.py
2017-11-17 12:55:08 +05:30
Nabin Hait
6b70906deb
Update purchase_invoice.py
2017-11-17 12:54:32 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms
2017-11-17 12:41:56 +05:30
Saurabh
3499ba08df
[fix] do not translate domains while creating db record ( #11616 )
2017-11-17 12:29:26 +05:30
Nabin Hait
877e1bb377
Post GL Entry based on rounded total in Sales/Purchase Invoice ( #11542 )
2017-11-17 12:27:43 +05:30
Nabin Hait
1783549e75
Minor fixes in patch
2017-11-17 12:20:07 +05:30
Rushabh Mehta
58dccf38c5
[fix] for tests
2017-11-17 12:12:53 +05:30
Prateeksha Singh
744ff0010b
Variant report ( #11618 )
...
* Item Variant Details Report
* remove queries from inside for loop
* make attribute value map
* Update item_variant_details.py
2017-11-17 12:00:29 +05:30
hiousi
d81e9f30dd
[fix] issue #11456 ( #11612 )
...
using bench export-fixtures create a erpnext/fixtures/web_form.json file
see :
https://github.com/frappe/erpnext/issues/11456#issuecomment-344846063
2017-11-17 11:42:24 +05:30
Britlog
b6096057c6
Hide cart icon and badge count after logging out ( #11530 )
2017-11-17 11:41:35 +05:30
Britlog
2a89a502f0
[Website] Items list and stock ( #11480 )
...
* Add stock availability in items list and a parameter to set the number of products per page
* Substract reserved_qty from actual_qty for website stock
2017-11-17 11:41:07 +05:30
Vishal Dhayagude
82b200e497
[fix] Patch fail ( #11623 )
2017-11-17 11:01:42 +05:30
Britlog
d9978d9c4f
Check stock in shopping cart ( #11529 )
2017-11-16 18:38:13 +05:30
rohitwaghchaure
51a397c97f
[fix] Valuation rate in stock entry and code cleanup ( #11614 )
2017-11-16 18:23:16 +05:30
Manas Solanki
bb34c57603
link the address and contact with the sales partner ( #11592 )
2017-11-16 18:10:04 +05:30
Prateeksha Singh
8f43d2514c
Multiple variant creation dialog ( #11608 )
...
* Multiple variant creation dialog
* variant dialog codacy fixes
* [multiple variants] show_alert, and other minors
2017-11-16 18:06:26 +05:30
Nabin Hait
1749b7c16b
Minor fixes related to account renaming and deletion
2017-11-16 17:49:54 +05:30
Rushabh Mehta
a5ebebd09c
[enhance] Add Issue Type and Opportunity Type masters ( #11598 )
...
* [enhance] added & linked Issue Type & Opportunity Type with opportunity
* [patch] create issue and opportunity type from the custom field if available
* [minor] issue_type and opportunity type should be mandatory
* [patches] removed try catch from the patch
* [fix] patch
* [refactor] cleanup issue/opportunity type
2017-11-16 17:03:52 +05:30
Nabin Hait
46be9896a9
Account number in chart of accounts ( #10551 )
...
* Account number in chart of accounts
* Include account number while renaming account
* Test case fixed
* Standard coa with and without numbers
* Standard coa with and without numbers
2017-11-16 16:51:55 +05:30
augustinfotech
135a54ca93
Allow print before pay in POS ( #11590 )
2017-11-16 15:28:42 +05:30
tundebabzy
f7e6934d7c
handle None case in update_reserved_qty_for_production ( #11593 )
2017-11-16 14:13:49 +05:30
Manas Solanki
eb3982044b
convert html into text in the taxes description as it can break the reports ( #11603 )
2017-11-16 14:11:39 +05:30
Pawan Mehta
bda07c6db4
Added Warehouse, Cost Center, Owner filters to Sales Register ( #11600 )
...
* [fix] #3668
* fix codacy space issue
2017-11-16 14:09:17 +05:30
