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
241139001e
Merge branch 'hotfix'
2017-11-10 15:53:43 +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
cdf8016bcd
Merge branch 'hotfix'
2017-11-10 13:15:04 +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
Nabin Hait
29741fee08
Merge branch 'develop' into staging
2017-11-10 11:46:50 +05:30
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
Prateeksha Singh
3e998bccba
Merge pull request #11490 from pratu16x7/hotfix
...
[minor][hotfix] naming_series variable assignment
2017-11-08 17:22:49 +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
af22f84809
Merge branch 'hotfix'
2017-11-08 15:07:33 +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
148b62a206
Merge pull request #11486 from saurabh6790/patch_fixes_
...
[fix] catch link validation exception in POS profile and reload fees …
2017-11-08 14:48:33 +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
4c617d6496
Merge branch 'staging'
2017-11-08 12:20:46 +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
6ad1082433
Merge branch 'hotfix'
2017-11-08 12:12:37 +05:30
Saurabh
db781e607a
bumped to version 9.2.5
2017-11-08 12:42:37 +06:00
