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
rohitwaghchaure
2d48cc0aa9
Merge pull request #11786 from shreyashah115/fix-json
...
Fixed json affected by latest merge
2017-11-30 10:13:48 +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
rohitwaghchaure
facf503f11
Merge pull request #11783 from rohitwaghchaure/minor_sales_invoice
...
[minor] Removed hidden for field pos profile
2017-11-29 17:43:59 +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
29390d3cb7
Merge branch 'creamdory-add_delivery' into develop
2017-11-29 15:53:29 +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
rohitwaghchaure
4a15711b04
Merge pull request #11768 from tundebabzy/issue-11749
...
add missing field and value parameters
2017-11-29 11:22:20 +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
d7216b559f
Fix missing space and improve wording ( #11764 )
2017-11-29 10:49:35 +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
7e07c150ed
Merge branch 'KanchanChauhan-asset-maintenance' into develop
2017-11-28 16:57:56 +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
7b833802a9
Merge branch 'hotfix'
2017-11-28 11:00:17 +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
