Vishal
155ec4ba58
[new] Grant application doctype clean up after review
2017-12-05 16:41:09 +05:30
Vishal
74fb550a70
[new] sidebar added on chapter web page
2017-12-05 16:41:09 +05:30
Vishal
a72a3bd536
[new] Chapter Module clean up after review
2017-12-05 16:41:09 +05:30
Vishal
fe0c6c8e28
[fix] Non Profit Domain clean up after review
2017-12-05 16:41:09 +05:30
Vishal
a68234d345
[new] Fontawesome icon added
2017-12-05 16:41:09 +05:30
Vishal
fca5cfe986
[fixed] Codacy fixed
2017-12-05 16:41:09 +05:30
Vishal
397a8761f7
[new] Convert Non Profit Module into Non Profit Domain
2017-12-05 16:41:09 +05:30
Vishal
43977a1422
[fix] Minor Changes in grant_application.py
2017-12-05 16:41:09 +05:30
Vishal
fa8f762805
[fix] Grant Application Url added in message body on sendmail
2017-12-05 16:41:09 +05:30
Vishal
da05b3ce7f
[fix] Modified Grant Application Test
2017-12-05 16:41:09 +05:30
Vishal
b4a8e11edc
[new] Account table added in Grant Application
2017-12-05 16:41:09 +05:30
Vishal
1a88562ef9
[new] Assessment Manager for grant Review, web portal added
2017-12-05 16:41:09 +05:30
Vishal
7c7c3522cb
[new] Codacy fixed
2017-12-05 16:41:09 +05:30
Vishal
a6a302f8a6
[new] Grant Application Web Form Added
2017-12-05 16:41:09 +05:30
Vishal
6a4fd7d89e
[fix] UI Test
2017-12-05 16:41:09 +05:30
Vishal
788f41707e
Chapter Message Link field added
2017-12-05 16:41:09 +05:30
Vishal
5cd70bed25
[new] Test Cases Added for Non Profit
2017-12-05 16:41:09 +05:30
Vishal
86140c8659
[fix] Codacy Issue
2017-12-05 16:41:09 +05:30
Vishal
f86984c785
[fix]travis build issue
2017-12-05 16:41:09 +05:30
Vishal
d051921ff8
[fix] Codacy issue
2017-12-05 16:41:09 +05:30
Vishal
722c06e819
[fix] travis
2017-12-05 16:41:09 +05:30
Vishal
1ebdeacee3
UI Test Added for Membership Type
2017-12-05 16:41:09 +05:30
Vishal
1c5bf8e3ca
modified index.md
2017-12-05 16:41:09 +05:30
Vishal
d5d0813b2d
[new] Modified Doctypes for list view
2017-12-05 16:41:09 +05:30
Vishal
2c9ce190eb
[new] Grant Application Doctype Added
2017-12-05 16:41:09 +05:30
Vishal
18ac423c47
[new] Volunteer skills and Availability Added
2017-12-05 16:41:09 +05:30
Vishal
7525bc6f1d
[new] Doctype Donor and Volunteer Added
2017-12-05 16:41:09 +05:30
Vishal
b4d73cbda0
[fix] Imported getdate in erpnext
2017-12-05 16:41:09 +05:30
Vishal
546130c046
Documentation added for Non Profit
2017-12-05 16:41:09 +05:30
Vishal
b4cda1b4a1
[fix] Address field removed in Member
2017-12-05 16:41:09 +05:30
Vishal
10608e8c65
[fix] Removed address field in Member doctype
2017-12-05 16:41:09 +05:30
Vishal
e01846051d
Membership Type shows under memberhip section
2017-12-05 16:41:09 +05:30
Vishal
3a75a5e9b5
New Party Type Member Added
2017-12-05 16:41:09 +05:30
Vishal
5dae126f56
Membership Doctype Added
2017-12-05 16:41:09 +05:30
Vishal
cc06d291c6
link member in dynamic link table
2017-12-05 16:41:09 +05:30
Vishal
50f13e17a7
[new] Chapter Doctype Added
2017-12-05 16:41:09 +05:30
Vishal
ca61453fa3
[new] Non Profit module Added
2017-12-05 16:41:09 +05:30
rohitwaghchaure
3a5ca927e7
[Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category ( #11848 )
...
* [Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category
* Update asset_depreciations_and_balances.py
2017-12-04 19:29:03 +05:30
Zarrar
c47745ea83
only fetch distinct names of events ( #11846 )
2017-12-04 19:23:20 +05:30
Kenneth Sequeira
406cb920ae
Documentation Update ( #11844 )
...
* Delete payment-tool.md
* Update index.txt
Removed Payment Tools from Index
* Update index.txt
removed barcode setup from index
* Delete barcode-1.png
removed barcode-1.png
* Delete barcode-2.png
* Delete bar-code.md
removing barcode set up as functionality is deprecated. Barcode can be directly entered in Item Master.
* Delete bar-code.md
removing barcode set up as functionality is deprecated. Barcode can be directly entered in Item Master.
* Update index.txt
remove bar-code set up link from index de (german)
* Update index.txt
remove bar-code set up link from index de (german)
2017-12-04 19:22:50 +05:30
Manas Solanki
e6fd07fda9
Changes in the Fee structure ( #11842 )
...
* academic year non mandatory in the fee structure and minor changes
* update the docs
2017-12-04 19:21:50 +05:30
Shreya
e570e4a049
fixed a test
2017-12-04 16:49:44 +05:30
Shreya
f8e7bc7c5b
removed process payroll doctype
2017-12-04 16:49:44 +05:30
Shreya Shah
db332f2c08
employee_details table added
2017-12-04 16:49:44 +05:30
Shreya
9956f15c80
added py test
2017-12-04 16:49:44 +05:30
Shreya
b5dff03453
added changes from process payroll
2017-12-04 16:49:44 +05:30
Shreya
d1defa5fc7
set salary components
2017-12-04 16:49:44 +05:30
Shreya
d73dd056d6
test case
2017-12-04 16:49:44 +05:30
Shreya
7b2870431e
new doctype payroll_entry
2017-12-04 16:49:44 +05:30
Shreya
eba3f39bbe
test delivery trip fix
2017-12-04 16:04:56 +05:30
Shreya
3febe0215e
test asset fix
2017-12-04 16:04:42 +05:30
Shreya Shah
8ee1ea456d
travis fix ( #11841 )
2017-12-04 14:28:02 +05:30
Nabin Hait
a11dcb6e59
Pull items in Stock Entry from Purchase Invoice ( #11839 )
2017-12-04 13:36:50 +05:30
rohitwaghchaure
148fccd45a
[Fix] Wrong value showing in the email digest ( #11840 )
2017-12-04 13:36:01 +05:30
Manas Solanki
3bac586ee2
fix in the assessment result tool while entering the zero marks ( #11837 )
2017-12-04 12:55:10 +05:30
tundebabzy
3061fc92fd
Batch Stock Items, having serial number can't be moved without inserting Serial Number ( #11792 ) ( #11813 )
...
* if doctype is batch, add extra information to args
* automatically fetch serial numbers if possible
* take advantage of changes in make_stock_entry
* code clean up
* PEP 8 compliance
* fix bug that clears serial number
2017-12-04 11:23:21 +05:30
Zarrar
5e470f757f
[Fix] Filter on child table not working in Calendar ( #11824 )
...
* use the new get_events method
* using the common get_events method for calendar_view
* using add_fetch to fill customer_name
2017-12-04 11:22:25 +05:30
Charles-Henri Decultot
8a052cb153
Translation issue ( #11833 )
2017-12-04 11:17:05 +05:30
vwithv1602
78d5ccf5fc
Invalid return against purchase invoice Error - Issue#11834 ( #11835 )
2017-12-04 11:16:34 +05:30
tundebabzy
1fb285c165
hide html example in print ( #11830 )
2017-12-04 11:13:36 +05:30
Shreya Shah
11938a47ec
fixed typo ( #11825 )
2017-12-01 17:38:26 +05:30
pawan
990277a0de
patch
2017-12-01 16:45:47 +05:30
Saurabh
d505d83cb6
[fix] merge conflicts
2017-12-01 16:23:46 +05:30
Saurabh
a067ddbc20
bumped to version 9.2.19
2017-12-01 16:52:43 +06:00
Charles-Henri Decultot
e90a1caeb1
Portal print format correction ( #11812 )
...
* Portal print format correction
* Correction following Rushabh's comment
2017-12-01 16:19:45 +05:30
Kenneth Sequeira
9e27b347ca
Delete payment-tool.md ( #11820 )
...
* Delete payment-tool.md
* Update index.txt
Removed Payment Tools from Index
2017-12-01 16:17:53 +05:30
KanchanChauhan
8380253178
On changing assign_to assign maintenance task in Asset Maintenance ( #11804 )
2017-12-01 16:14:05 +05:30
Jamsheer
f4d9af1ab9
Fix Patch - remove company from patient ( #11819 )
2017-12-01 16:10:39 +05:30
rohitwaghchaure
b1ac979ac5
[fix] Do not allow zero valuation rate for serial no and fetch previous valuation rate for serial no ( #11817 )
2017-12-01 16:09:02 +05:30
pawan
14d570ed9e
fix
2017-11-30 18:41:09 +05:30
pawan
2ff844e740
default warehouse / remove validation / change sql
2017-11-30 18:14:55 +05:30
Nabin Hait
7a294e6ef5
Update asset_category.json
2017-11-30 18:02:22 +05:30
Nabin Hait
5e801955f1
Update asset_category.json
2017-11-30 18:01:56 +05:30
Saurabh
34a0e90115
[fix] merge conflicts
2017-11-30 16:45:01 +05:30
Saurabh
f9509a084a
bumped to version 9.2.18
2017-11-30 17:11:46 +06:00
Nabin Hait
1b89be0c66
Fixed rounding issue in subcontracting ( #11802 )
2017-11-30 15:59:56 +05:30
rohitwaghchaure
e34ef60e3e
[fix] Asset test cases and added make_sales_invoice ( #11800 )
...
* [fix] Asset test cases and added make_sales_invoice
* vehicle trip test cases
2017-11-30 15:59:40 +05:30
Faris Ansari
ec3be9eebf
[hotfix] Party Type name ( #11797 )
2017-11-30 15:53:39 +05:30
Nabin Hait
c5e0d22464
Update set_delivery_date_in_so_item.py
2017-11-30 15:52:47 +05:30
pawan
e4aaff6686
message changes
2017-11-30 15:49:54 +05:30
pawan
f5bb2af92c
test case
2017-11-30 15:20:00 +05:30
Nabin Hait
e761b9de40
Rearranged fields due to merge conflict messup
2017-11-30 14:29:10 +05:30
Vishal Dhayagude
8677cd1565
[patch] Patch added to rename net_weight field ( #11798 )
2017-11-30 13:52:30 +05:30
pawan
e43cd915e8
alignment
2017-11-30 12:31:32 +05:30
pawan
abc5523405
code improvements
2017-11-30 12:23:46 +05:30
Manas Solanki
f9cc56cd62
minor fixes in the assessment result tool ( #11795 )
2017-11-30 11:39:06 +05:30
tundebabzy
ce63ab7602
Show Batch Selector Dialog Only If There Are Multiple Batches ( #11794 )
...
* check if multiple batches available before showing dialog
* Update point_of_sale.js
2017-11-30 11:38:53 +05:30
tundebabzy
8ae53cacc5
When Warehouse Field Is Changed, Batch Number Field Should Be Updated ( #11789 ) ( #11790 )
...
* reset batch_no field if no batch number returned
* on warehouse change, query for batch number
2017-11-30 11:37:21 +05:30
pawan
11398fd572
Validation for reserved warhouse
2017-11-29 21:16:02 +05:30
Shreya
c0c470b56d
fixed json affected by latest merge
2017-11-29 19:31:15 +05:30
Zarrar
95ee7654a1
Employee tree ( #11667 )
...
* nested set implemented
* treeview for employee
* patch added to assign lft rgt, update nsm_model on trash
* call on_trash method of super class
2017-11-29 18:44:02 +05:30
Rohit Waghchaure
17e03cf3fc
[minor] Removed hidden for field pos profile
2017-11-29 17:40:42 +05:30
Rushabh Mehta
0154538c06
[fix] [minor] pos.js
2017-11-29 16:42:02 +05:30
Vishal Dhayagude
855e390265
[fix] Sales Invoice json conflict ( #11779 )
2017-11-29 16:25:24 +05:30
rohitwaghchaure
1b344ca81e
[Fix] POS not loading if pos profile not defined ( #11778 )
2017-11-29 16:21:51 +05:30
Vishal Dhayagude
d42242df22
[Feature] Shipping Rule Calculation based on Net Weight ( #11770 )
...
* [new] Calculate shipping tax based on weight
* [fix] Change field name weight to weight_per_unit in SI Item
* [new] Shipping Rule based tax for selling module
* [new] Shipping rule based on weight added to Buying module
* [fix] Conflict in jsons
* [fix] Removed Redudant add_fetch
* [fix] Codacy fixed
* [fix] Print hide added
2017-11-29 16:09:59 +05:30
KanchanChauhan
2d1cbd0b2e
Delete old asset doctypes from Accounts module and minor changes ( #11766 )
2017-11-29 16:03:00 +05:30
Nabin Hait
ad2a3e4f38
Cleanup and fixes on delivery trip
2017-11-29 15:53:01 +05:30
Nabin Hait
46e285efe9
Merge branch 'add_delivery' of https://github.com/creamdory/erpnext into creamdory-add_delivery
2017-11-29 14:15:16 +05:30
rohitwaghchaure
f591a220c9
Fetch items of item groups defined in the pos profile ( #11763 )
2017-11-29 13:55:13 +05:30
Zarrar
c43c5cae5a
Set query sales order ( #11772 )
...
* set_query for sales order based on production_item
* codacy fix
* check in packed item to fetch sales order
* Update production_order.py
2017-11-29 13:54:35 +05:30
rohitwaghchaure
2fb8cc5f2c
[fix] Options must be a valid DocType for field Asset Category in row 18 ( #11773 )
...
* [fix] Options must be a valid DocType for field Asset Category in row 18
* test cases
2017-11-29 13:50:04 +05:30
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
pawan
54465f5df1
review comments changes
2017-11-29 10:18:38 +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
pawan
f5279a0d67
[fix] #8427
2017-11-24 11:21:47 +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
Neil Trini Lasrado
0df93d61eb
Update update_sales_cost_in_project.py ( #11595 )
...
Will break if select sum(base_grand_total) from `tabSales Order` where project=p.name and docstatus=1 returns Null. Gives - "OperationalError: (1048, "Column 'total_sales_cost' cannot be null")" Error
2017-11-16 14:07:55 +05:30
rohitwaghchaure
21cbbae88f
[fix] Payment reconcillation showing linked journal entries ( #11611 )
2017-11-16 14:05:57 +05:30
ashish
f17ca7866a
removed names from comments
2017-11-16 11:08:14 +05:30
ashish
604eb9d689
added flag to function get_customer_outstanding and removed names in comments
2017-11-16 11:05:59 +05:30
ashish
a20c8dbd5c
instead of caller as 3rd arg added a flag
2017-11-16 11:03:39 +05:30
ashish
a1feb32891
added json for bypass credit limit checkbox
2017-11-16 11:01:43 +05:30
ashish
f67372cfb3
removed logic from delivery note for checking bypass credit limit flag
2017-11-16 10:58:25 +05:30
ashish
8146c7a3df
not required as default is set by default
2017-11-16 10:54:22 +05:30
ashish
bccdf74344
set default value of bypass_credit_limit flag removed as it is not required
2017-11-16 10:53:22 +05:30
ashish
62155fa0e5
Merge branch 'feature_10861' of https://github.com/ashish-greycube/erpnext into feature_10861
2017-11-16 10:47:44 +05:30
Rushabh Mehta
8e5dcd06fb
[fix] item.py
2017-11-15 17:53:44 +05:30
Rushabh Mehta
083dabaaf8
[fix] item.py
2017-11-15 17:08:53 +05:30
Frappe PR Bot
978cfdec2c
[Translation] Updated Translations ( #11591 )
2017-11-15 16:30:08 +05:30
Rushabh Mehta
d3f5d0961a
[feature] Opening Invoice Creation Tool ( #11589 )
...
* [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices
* [minor] added progress bar while creating invoice
* [minor] allow bulk upload for the invoices
* [minor] calculate item rate from net total
* [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0
* [minor] check mandatory values before making opening invoices
* [minor] enable primary button if there is any error while creating invoices
* [minor] minor fixes, set company currency as invoice currency added tests
* [dashboard] added Opening Invoice Summery section in Dashboard
* [minor] added total invoices count on dashboard
* [minor] don't show dashboard if there are no opening invoices available
* [minor] added Opening Invoice Tools to Account's Tools section
* [minor] codecy fixes
* [fix] refactored general ledger and buttons on charts
* [fix] tests
2017-11-15 16:29:53 +05:30
Nabin Hait
78ab8235f6
Minor code cleanups in stock balance report
2017-11-15 14:43:54 +05:30
Brown-Harry Boma
b9e44217a2
[Fix]Codacy Issues
2017-11-15 14:43:54 +05:30
Brown-Harry Boma
2da8f6e89d
Add Items Variants Attributes columns to Stock Balance Report
2017-11-15 14:43:54 +05:30
Zarrar
24b8aa2e80
set field dependent on link field fix ( #11580 )
2017-11-15 14:27:00 +05:30
Nabin Hait
6fd163bc55
Merge branch 'master' into develop
2017-11-15 14:08:17 +05:30
Nabin Hait
429e5d57d5
bumped to version 9.2.13
2017-11-15 14:38:17 +06:00
Jamsheer
0abec034df
Healthcare hotfix ( #11586 )
...
* 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
2017-11-15 13:53:50 +05:30
Umair Sayed
3a9ca883b9
Update party.py ( #11584 )
2017-11-15 13:44:04 +05:30
Manas Solanki
bf59b5927f
make route from item code if item name is None ( #11579 )
2017-11-15 10:55:22 +05:30
ppd1990
9bd84277db
Propagate projected_qty all the way to the root warehouse to make 'check in group' actually work for more complex warehouse topologies ( #10842 )
2017-11-15 10:13:09 +05:30
schilgod
e418a5bdc1
Option to disable fetching last purchase details in Purchase Order ( #11573 )
...
* add check for enable/disable last purchase details in Purchase Order
* fix tabs
2017-11-15 09:49:49 +05:30
Jamsheer
bab226698f
Healthcare hotfix ( #11574 )
...
* Patient dashboard - Vital Signs
* Remove submit validation in Consultation
* Physician Schedule - Add Time Slots - Fix
* Patient Appointment - Client side - fixes
2017-11-15 09:47:00 +05:30
rohitwaghchaure
43edd5d03c
Employee loan fixes ( #11495 )
...
* Employee loan fixes
* Update update_employee_loan_details.py
2017-11-14 17:59:20 +05:30
Nabin Hait
50616da905
Merge branch 'master' into develop
2017-11-14 17:48:43 +05:30
Nabin Hait
ea3e6b93a7
bumped to version 9.2.12
2017-11-14 18:18:42 +06:00
Nabin Hait
10823e5a25
Merge branch 'neilLasrado-develop1' into develop
2017-11-14 17:40:45 +05:30
Nabin Hait
b55e98570f
Minor fixes
2017-11-14 17:40:30 +05:30
Shreya Shah
be690ef817
Rate with margin in customer and company currency ( #11437 )
...
* field for company margin
* added base_rate_with_margin
* calculate company margin
* test for item price
* test for delivery note
* test for sales order
* test for quotation
* test for sales invoice
2017-11-14 17:22:41 +05:30
Nabin Hait
42274a4591
Delete healthcare domain items ( #11567 )
2017-11-14 17:15:11 +05:30
Nabin Hait
cd13a28417
Get items from quotation in sales invoice
2017-11-14 17:13:53 +05:30
AravindPranera
04e3518fad
Update request_for_quotation.py
2017-11-14 17:13:53 +05:30
AravindPranera
5bae488f25
Update request_for_quotation.py
2017-11-14 17:13:53 +05:30
AravindPranera
86e726158b
Getting Quotation Document in Sales Invoice
2017-11-14 17:13:53 +05:30
AravindPranera
0ebd3c373c
Getting Quotation Document in Sales Invoice
2017-11-14 17:13:53 +05:30
Rushabh Mehta
b8b8dc119f
[fix] item.py fix for _doc_before_save
2017-11-14 16:52:05 +05:30
Rushabh Mehta
cc1262c36d
Add option to clean description html in item description. ( #11565 )
...
* [fix] add item settings
* [docs] Item Settings
* [fix] enqueue in item_settings.py
* [refactor] move to stock settings
* [refactor] move to stock settings
2017-11-14 16:36:25 +05:30
Rushabh Mehta
d5c6416d91
[new feature] Product Configurator (via Item Quick Entry) ( #11535 )
...
* [Feature] Item Variant Creation from Quick Entry
* [minor] formatted js
* [minor] set 3 attribute per page instead of 5 in template
* [fix] fixed codecy issue
* [fix] label translation
* [minor] changed trigger event of item template
* [fix] moved item ui tests under stock
* [UI test] added test for item attribute
* [UI test] added test for creation of item variant from quick entry
* [fix] item variant ui test fixes
* [wip]
* [cleanup] item quick entry
* [remove] tests, fixtures were missing
* [refactor] use set_only_once in item
2017-11-14 15:27:28 +05:30
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
Nabin Hait
4d99ebaeb5
Merge branch 'master' into develop
2017-11-14 13:58:37 +05:30
Nabin Hait
0590d1da05
bumped to version 9.2.11
2017-11-14 14:28:37 +06:00
Rushabh Mehta
d8bc8de6ca
[minor] remove unnecessary description in upload attendance, fixes #10603
2017-11-14 12:52:53 +05:30
Rushabh Mehta
98aa581864
[fix] default tax only on insert ( #11544 )
...
* [fix] default tax only on insert
* [fix] default tax only on insert
* [fix] default tax only on insert
2017-11-14 09:32:32 +05:30
Faris Ansari
3a5dceae18
Add Github Connector ( #11259 )
...
- Add new module ERPNext Integrations
2017-11-13 19:19:13 +05:30
Manas Solanki
e5aa9c5f2f
new report - assessment plan status ( #11504 )
...
* new report - assessment plan status
* add the report in the school dashboard
* fix for the print format
2017-11-13 18:56:53 +05:30
Manas Solanki
69be5362a5
minor fixes in the assessment result ( #11543 )
2017-11-13 18:32:06 +05:30
Nabin Hait
ec8a0a22d7
Merge branch 'master' into develop
2017-11-13 15:10:17 +05:30
Nabin Hait
58ab203fc0
bumped to version 9.2.10
2017-11-13 15:40:16 +06:00
Nabin Hait
6605919ecd
GL Entries on sale of an asset ( #11538 )
2017-11-13 15:06:35 +05:30
Saurabh
feeb47dbbe
[fix] if not students in student groups then raise exception ( #11537 )
2017-11-13 13:52:58 +05:30
Nabin Hait
deeb1380b1
Ignore paid credit note in outstanding invoices in Payment Entry ( #11534 )
2017-11-13 13:52:05 +05:30
Saurabh
0f86d86e27
[fix] validate party account ( #11517 )
2017-11-10 19:21:09 +05:30
Faris Ansari
4ec4e3fb29
[patch] Revert Manufacturing User role ( #11514 )
2017-11-10 19:15:17 +05:30
Prateeksha Singh
17b7209032
remove erroneous column breaks ( #11522 )
2017-11-10 18:54:03 +05:30
Prateeksha Singh
731b66b788
remove erroneous column breaks ( #11523 )
2017-11-10 18:53:52 +05:30
Rushabh Mehta
4313326ba0
[fix] treeview for tasks ( #11515 )
...
[fix] treeview for tasks
2017-11-10 18:52:21 +05:30
Saurabh
a5275a1ba9
Merge branch 'master' into develop
2017-11-10 15:53:44 +05:30
Saurabh
a10cd10640
bumped to version 9.2.9
2017-11-10 16:23:43 +06:00
Saurabh
44ef8654f9
Merge pull request #11510 from rohitwaghchaure/issue_11502
...
Add item directly in the cart only if serial no, batch, barcode has enter in the search field
2017-11-10 15:51:14 +05:30
Saurabh
71862f9024
Merge pull request #11509 from saurabh6790/bom_search_query_fix
...
[fix] query param fixes
2017-11-10 15:50:55 +05:30
Rohit Waghchaure
a5e3c3a79f
Add item directly in the cart only if serial no, batch, barcode has enter in the search field
2017-11-10 15:29:26 +05:30
rohitwaghchaure
cc97ec9202
[hotfix] Salary slip, leave considered in amount calculation even if depends on lwp is disabled in salary slip ( #11507 )
2017-11-10 15:06:58 +05:30
Saurabh
022ab63a0f
[fix] query param fixes
2017-11-10 15:06:02 +05:30
Pawan Mehta
1368ba00bc
[fix] #11337 ( #11339 )
2017-11-10 14:59:26 +05:30
Saurabh
7b78a83592
Merge branch 'master' into develop
2017-11-10 13:15:04 +05:30
Saurabh
18c8cf965f
bumped to version 9.2.8
2017-11-10 13:45:04 +06:00
Saurabh
7ab28ec562
[fix] give preference to gateway selected on shopping cart settings ( #11393 )
2017-11-10 11:17:01 +05:30
KanchanChauhan
e59c9ce9f4
Checkbox has_expiry_date in Item to make suer Expiry Date is entered in Batch ( #11413 )
2017-11-10 11:16:29 +05:30
Alchez
1077c782a3
[Fix] Packing Slip creation if custom field does not have a value ( #11423 )
...
* [Fix] Packing Slip creation if custom field is Column/Section Break
* Used no_value_fields and sorted imports
* Update packing_slip.py
2017-11-10 11:14:57 +05:30
Nabin Hait
15753074bf
Nestedset model fixes for changing parent and renaming ( #11467 )
2017-11-10 11:12:43 +05:30
Nabin Hait
8e3da7f70e
Update test_assessment_plan.js
2017-11-10 10:59:17 +05:30
Nabin Hait
887285ed1a
Update test_assessment_plan.js
2017-11-10 10:59:07 +05:30
Manas Solanki
aeb0026354
commits from develop merged PR's ( #11491 )
...
* better student search queries and minor fixes in the student group
* remove the print option for the tools
* fixes for the chart
* minor fixes in the fee module for print and permission, delete redundant doctype
* set the naming series and independent dob validation
2017-11-10 10:58:43 +05:30
rohitwaghchaure
1ce48e7032
[fix] POS profile patch ( #11501 )
2017-11-10 10:53:12 +05:30
Faris Ansari
99e31f97b8
set default params for paging ( #11500 )
2017-11-10 10:50:49 +05:30
Faris Ansari
4a864c1eea
[fix] Update bom item description ( #11498 )
...
* [fix] Update bom item description
* Update item.py
2017-11-09 19:01:21 +05:30
Nabin Hait
c4de619eac
Update assessment_plan.py
2017-11-09 14:36:11 +05:30
Nabin Hait
fe72ed003e
Update test_assessment_plan.js
2017-11-09 11:47:13 +05:30
pratu16x7
40016372c6
[minor][hotfix] naming_series variable assignment
2017-11-08 16:30:15 +05:30
Saurabh
b97f08e0ac
[fixed] merge-conflicts
2017-11-08 15:08:38 +05:30
Saurabh
3894a5ed94
bumped to version 9.2.7
2017-11-08 15:37:33 +06:00
Saurabh
045b2877b7
[fix] remove warehouse from Stock Settings if warehouse wont exists ( #11487 )
2017-11-08 14:57:03 +05:30
Manas Solanki
a658630751
remove the print option from the tools ( #11484 )
...
* remove the print option for the tools
* better student search queries and minor fixes in the student group
2017-11-08 14:55:54 +05:30
Saurabh
d2cef208fe
[fix] catch link validation exception in POS profile and reload fees doctype
2017-11-08 14:44:43 +05:30
Nabin Hait
ff73646212
Made POS Profile mandatory and changed test order
2017-11-08 14:34:38 +05:30
Saurabh
eb760d6d09
Merge branch 'master' into develop
2017-11-08 12:20:46 +05:30
Saurabh
f985ae1379
bumped to version 9.2.6
2017-11-08 12:50:46 +06:00
Saurabh
98aa544f25
Merge branch 'master' into staging
2017-11-08 12:18:50 +05:30
Saurabh
f41b13b736
[fix] merge-conflicts
2017-11-08 12:18:41 +05:30
Saurabh
db781e607a
bumped to version 9.2.5
2017-11-08 12:42:37 +06:00
rohitwaghchaure
521606e433
Merge pull request #11398 from rohitwaghchaure/item_variants_donot_copy_option
...
[enhance] In item variants settings added provision, do not update the variants of variants from the template but will copy the value while making new variant aginst the template
2017-11-08 11:49:24 +05:30
Rohit Waghchaure
acc8995c48
[enhance] In item variants settings added provision, do not update the fields of variants from the template but will copy the value while making new variant aginst the template
2017-11-08 11:39:08 +05:30
Sushant Nadkar
72c40f0383
Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note ( #11440 )
2017-11-08 11:35:46 +05:30
Shreya Shah
d9e2b24535
task name in gantt view - clickable ( #11459 )
2017-11-08 11:35:19 +05:30
rohitwaghchaure
f688af3809
[fix] Offline pos name is not defined issue in the POS ( #11469 )
2017-11-08 11:33:39 +05:30
Achilles Rasquinha
7fd20f303f
moved from MySQLdb to pymysql ( #11462 )
2017-11-08 11:33:24 +05:30
rohitwaghchaure
9f2a27c99c
Merge pull request #11477 from rohitwaghchaure/pos_profile_test_cases
...
[fix] POS Profile test cases
2017-11-07 16:35:52 +05:30
Rohit Waghchaure
35fc45eff9
[fix] POS Profile test cases
2017-11-07 10:43:16 +05:30
Rohit Waghchaure
57cc924d29
[Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart
2017-11-06 18:42:37 +05:30
Manas Solanki
36e2fb8d58
minor fixes in the fee module for print and permission, delete redundant doctype ( #11430 )
2017-11-06 17:44:59 +05:30
Nabin Hait
e552a51266
Minor cleanups
2017-11-06 17:39:31 +05:30
pawan
436f7b980c
codacy issues
2017-11-06 17:39:31 +05:30
pawan
438dfc081b
fix codacy issues
2017-11-06 17:39:30 +05:30
pawan
d59225635d
remove old report
2017-11-06 17:39:30 +05:30
pawan
b699b86b76
Add Total Row
2017-11-06 17:39:30 +05:30
pawan
8d1d64aa29
[fix] #11449
2017-11-06 17:39:30 +05:30
pawan
e61a275651
[fix] #11427
2017-11-06 17:39:30 +05:30
Manas Solanki
6ba2eda04a
fixes for the chart ( #11460 )
2017-11-06 17:22:14 +05:30
rohitwaghchaure
bcb7854340
Merge pull request #10982 from netchampfaris/multiple-users-pos-profile
...
[Enhancement] Allow Multiple users in POS Profile
2017-11-06 16:45:01 +05:30
Manas Solanki
40ef7e7039
patch for renaming the pos profile and setting the pos profile name
2017-11-06 13:53:52 +05:30
Manas Solanki
b1616a0cb3
changes in thepos profile
2017-11-06 13:53:52 +05:30
Manas Solanki
3f0dfd720f
set the pos profile in the sales invoice
2017-11-06 13:53:52 +05:30
Nabin Hait
f15a8409eb
[tests] Test case fixes for task and project ( #11445 )
...
* [tests] Test case fixes for task and project
* Removed hard-coded dates from test cases
* Codacy fix
2017-11-06 11:11:34 +05:30
Saurabh
e850655c1d
Merge branch 'master' into staging
2017-11-03 16:56:24 +05:30
Saurabh
0faa61009f
Merge branch 'master' into develop
2017-11-03 16:56:23 +05:30
Saurabh
56cb0aa9c1
bumped to version 9.2.4
2017-11-03 17:26:23 +06:00
Faris Ansari
cbaa0e629c
fix codacy
2017-11-03 11:35:49 +05:30
Manas Solanki
76ce074c63
return the account details if and only if there is single account of that type ( #11407 )
2017-11-02 18:12:47 +05:30
rohitwaghchaure
7677ff00a2
[hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings ( #11409 )
2017-11-02 18:12:14 +05:30
Saurabh
62fd4007b0
Merge branch 'master' into staging
2017-11-02 12:14:42 +05:30
Saurabh
3be72ef187
Merge branch 'master' into develop
2017-11-02 12:14:41 +05:30
Saurabh
870ce3cfea
bumped to version 9.2.3
2017-11-02 12:44:40 +06:00
rohitwaghchaure
1473a37d8c
Merge pull request #11395 from jay-parikh/develop
...
POS - Add % to the Discount Field #9749
2017-11-02 12:11:12 +05:30
Saurabh
0ad2cc3def
Merge pull request #11403 from tundebabzy/issue-11402
...
Error In Employee Loan Form (#11402 )
2017-11-02 12:09:54 +05:30
Saurabh
00f6c2d61d
Merge pull request #11417 from rohitwaghchaure/issue_not_save_v9
...
[Fix] Customer is manadatory even if customer has selected in the Issue
2017-11-02 12:07:32 +05:30
Saurabh
38008f8daa
Merge pull request #11406 from rohitwaghchaure/payment_entry_differnece_amount_issue
...
[Fix] Wrong difference amount in the payment entry for the internal transfer type
2017-11-02 12:07:14 +05:30
Saurabh
afb63af3b6
Merge pull request #11397 from rohitwaghchaure/delivery_note_issue_from_so
...
[Fix] Getting an error while making delivery note from sales order and sales order has no item code
2017-11-02 12:06:08 +05:30
Rohit Waghchaure
816ce33daf
[Fix] Customer is manadatory even if customer has selected in the Issue
2017-11-01 19:02:09 +05:30
Rohit Waghchaure
99748dbacf
[Fix] Wrong difference amount in the payment entry for the internal transfer type
2017-11-01 11:45:02 +05:30
tunde
31287b00a6
call get_employee_loan_application only when appropriate
2017-10-31 18:10:17 +01:00
Faris Ansari
3d59179205
Load default pos profile if not found
2017-10-31 21:56:16 +05:30
Manas Solanki
a941a394ba
set the naming series and independent dob validation
2017-10-31 17:34:50 +05:30
Rohit Waghchaure
5ec9f6930b
[Fix] Getting an error while making delivery note from sales order and sales order has no item code
2017-10-31 15:26:56 +05:30
Jay Parikh
96f167573b
POS - Add % to the Discount Field #9749
2017-10-31 01:07:09 -07:00
Zarrar
6d41a9a647
Converting Task to a Tree structure ( #11117 )
...
* added support for tree view
* nestedset added to handle tree based structure
* treeview ui added
* removed is_group dependency
* added validation while editing a group-task
* codacy fix
* BOM like filter added
* Added ui-test for treeview-task
2017-10-31 13:10:55 +05:30
Manas Solanki
160e710ebf
set bank account only if there is single bank type account ( #11363 )
...
* set bank account only if there is single bank type account
* Update journal_entry.py
2017-10-31 13:04:02 +05:30
Faris Ansari
40611e4f69
[fix] hub get_item_details ( #11383 )
2017-10-31 13:00:09 +05:30
KanchanChauhan
21f946f365
[Minor] Source Warehouse should be filtered by Company in Production Order ( #11376 )
2017-10-31 12:59:45 +05:30
Prateeksha Singh
6b26e391b8
use the new frappe charts :D ( #11391 )
2017-10-31 12:58:48 +05:30
Faris Ansari
895aa7b7ac
fix codacy
2017-10-30 17:12:50 +05:30
Faris Ansari
7095de03ef
Merge branch 'develop' into multiple-users-pos-profile
2017-10-30 15:00:55 +05:30
Faris Ansari
79be8f969f
Add to patches.txt
2017-10-30 14:46:09 +05:30
ci2014
e741b91f1d
Update issue.js ( #11381 )
...
Make the close / reopen button more flexible for customized user status.
For example, if the user has several status, it will now show the Close button every time the ticket is not closed! It will show Reopen only, if the ticket is closed, and not if it's on hold for example.
This will make it more flexible.
2017-10-30 10:13:05 +05:30
tunde
5ea10a77a3
Merge branch 'develop' into payment-terms
2017-10-27 17:37:15 +01:00
Faris Ansari
638e3f9fa6
Merge pull request #11154 from netchampfaris/hub-item-image
...
[hub] fix company page routing
2017-10-27 17:07:10 +05:30
Saurabh
1bc8e32f94
Merge pull request #11360 from manassolanki/fix-fee-patch
...
fix the fee patch
2017-10-27 17:00:11 +05:30
Faris Ansari
8c1099d236
Add POS Profile User DocType
2017-10-27 16:48:07 +05:30
Manas Solanki
8637e52d4c
fix the fee patch
2017-10-27 11:55:15 +05:30
ashish
b883e4ee0d
customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set. cint function is added.
2017-10-26 20:32:08 +05:30
ashish
ca2250c440
sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice.cint function is added.
2017-10-26 20:22:34 +05:30
ashish
751b05f1e8
sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice. cint function is added.
2017-10-26 20:15:24 +05:30
ashish
9dfc0f32ab
customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. It is default to 0. Also patch is added to update value of new field to 0 after migrate.
...
test_customer.js -- It is auto generated file as customer.json is modified. And it is removed.
2017-10-26 20:07:32 +05:30
tunde
bbce7b7e5d
get attribute with get method
2017-10-26 14:31:13 +01:00
tunde
6575a615b1
get attribute with get method
2017-10-26 14:30:18 +01:00
tunde
14e97ce0c8
Merge branch 'develop' into payment-terms
2017-10-26 13:35:42 +01:00
Faris Ansari
c83413134d
Merge pull request #11294 from revant/map_field_docs
...
[Docs] added field for storing map
2017-10-26 17:19:46 +05:30
Nabin Hait
c799a22d55
Merge branch 'master' into staging
2017-10-26 14:35:34 +05:30
Nabin Hait
edef9811f9
Merge branch 'master' into develop
2017-10-26 14:35:34 +05:30
Nabin Hait
819c50c042
bumped to version 9.2.2
2017-10-26 15:05:33 +06:00
Faris Ansari
6887cedaea
[fix] item qty trigger ( #11349 )
2017-10-26 14:34:15 +05:30
Nabin Hait
aa7896f1e1
[test] Fixed physician test cases ( #11347 )
2017-10-26 14:33:28 +05:30
Nabin Hait
52909b73bb
[test] Fixed advance jv cancellation ( #11333 )
2017-10-26 11:06:07 +05:30
Saurabh
b445633e56
Merge branch 'master' into staging
2017-10-26 09:59:22 +05:30
Saurabh
0d597cef8d
Merge branch 'master' into develop
2017-10-26 09:59:22 +05:30
Saurabh
d0131762cc
bumped to version 9.2.1
2017-10-26 10:29:22 +06:00
Saurabh
92a6155bb0
[fix] translate domain
2017-10-26 09:44:51 +05:30
Faris Ansari
33d74ce6e5
Merge branch 'develop' into hub-item-image
2017-10-25 18:06:42 +05:30
Saurabh
d6e67ce123
[fix] check for null date fields ( #11334 )
2017-10-25 17:44:22 +05:30
Nabin Hait
6a4e230cde
[fix] Status of Item ( #11326 )
2017-10-25 17:06:30 +05:30
rohitwaghchaure
c65f1d7745
Search item using name instead of item code ( #11327 )
2017-10-25 17:04:56 +05:30
rohitwaghchaure
e02ee898e9
[Fix] Production order not displaying in the calendar view, if po has no operations ( #11328 )
2017-10-25 17:04:31 +05:30
rohitwaghchaure
2e6f6d6749
[minor] cleanup code ( #11331 )
2017-10-25 17:03:49 +05:30
ashish
8fbf10f5db
New test case files added.(a)test_sales_order_with_bypass_credit_limit_check.js -- New feature: i.e. bypass credit limit check at sales order.(b)test_sales_order_without_bypass_credit_limit_check.js --Regression test case : the existing default flow is checked i.e. credit limit check happens at sales order level
2017-10-25 16:20:50 +05:30
ashish
fb364df091
customer_credit_balance.py -- Credit limit should now reflect outstanding amount for each customer based on value of flage bypass credit limit check at sales order level. A new column is added to show the value of this flag. customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set
2017-10-25 16:17:55 +05:30
ashish
ff20182d03
sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice
2017-10-25 16:11:58 +05:30
ashish
8ad4efee25
sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice
2017-10-25 16:07:21 +05:30
ashish
06e6a82d56
customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. test_customer.js : auto generated file as customer.json is modified
2017-10-25 15:56:39 +05:30
Nabin Hait
fb734976eb
Removed appintment field from Invoice, it should be a custom field and will be added from domain settings
2017-10-25 15:53:07 +05:30
Nabin Hait
8f2500083c
Merge branch 'master' into develop
2017-10-25 14:10:39 +05:30
Nabin Hait
e146143bd1
bumped to version 9.2.0
2017-10-25 14:40:38 +06:00
Nabin Hait
4d22b6db30
Fixed Merge Conflict
2017-10-25 14:09:46 +05:30
Nabin Hait
cd3dbcb2ef
Fixed Merge Conflict
2017-10-25 14:07:25 +05:30
Nabin Hait
c7bd77111e
bumped to version 9.1.8
2017-10-25 14:32:32 +06:00
rohitwaghchaure
4a60554b91
Green indicator in the cart for non stock item ( #11325 )
2017-10-25 13:59:29 +05:30
rohitwaghchaure
3dc21b099d
[Fix] Translation issue ( #11323 )
2017-10-25 12:38:17 +05:30
tundebabzy
40a02769c5
Error in the Address fetched in Sales Order.( #11129 ) ( #11145 )
...
* add new function - `get_party_shipping_address`
* `swap `get_default_address` with `get_party_shipping_address`
* test cases
* properly sets order by direction
* move `get_party_shipping_address` to party.py
* fix test module import
2017-10-25 12:24:34 +05:30
tundebabzy
bafcd7418a
Add Bundle Description Field To Product Bundle ( #11122 )
...
* add description field that shows in list view
* description field should be simply `description`
2017-10-25 12:22:08 +05:30
Makarand Bauskar
085b4842a1
[minor] minor fixes in get_company_details for Hub page ( #11168 )
2017-10-25 12:19:10 +05:30
Makarand Bauskar
e6712c129c
[hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings ( #11182 )
...
* [hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings
* [minor] renamed the allow_stale_rate method to stale_rate_allowed
2017-10-25 12:17:40 +05:30
Doridel Cahanap
49a7bde6e2
[minor] Label for Training Event in Training Program Dashboard ( #11280 )
2017-10-25 12:15:17 +05:30
Manas Solanki
464289b726
copy the older total amount field and corrsp. changes in report ( #11322 )
2017-10-25 12:13:42 +05:30
Nabin Hait
1c1237537b
Subscription fixes ( #11292 )
...
* Subscription fixes
* Removed recurring fields, cleanup code
2017-10-25 12:10:44 +05:30
Nabin Hait
b7483f6dfd
Update item.json
2017-10-25 11:58:02 +05:30
