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
rohitwaghchaure
58ae5ee563
Merge pull request #11843 from shreyashah115/bugf
...
Travis fix for asset and delivery trip tests
2017-12-04 16:35:30 +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
Saurabh
d505d83cb6
[fix] merge conflicts
2017-12-01 16:23:46 +05:30
Saurabh
b36dc5e906
Merge branch 'hotfix'
2017-12-01 16:22:43 +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
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
aa25e95510
Merge branch 'hotfix'
2017-11-30 16:41:46 +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
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
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
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
