Alchez
31ab64822c
Make the item UOM more visible ( #14315 )
2018-06-05 10:35:55 +05:30
Shreya Shah
f1e54836cb
Remove hardcoded workflow patches ( #14340 )
2018-06-05 10:35:07 +05:30
Shreya Shah
b75e77a2cc
Fix syntax ( #14342 )
2018-06-05 10:33:29 +05:30
Sushant Nadkar
64907e5083
Validate response message for frappe call ( #14343 )
2018-06-05 10:33:04 +05:30
asbasawaraj
1b16b772ab
Report to Track Expiring Memberships - Monthwise ( #14207 )
2018-06-05 10:30:03 +05:30
Nabin Hait
c4eec99bc4
minor fix
2018-06-05 09:06:30 +05:30
Prateeksha Singh
03644f2a9d
Merge pull request #14345 from pratu16x7/members-patch
...
[patch][update] naming_series field in member patch
2018-06-04 16:37:57 +05:30
Prateeksha Singh
2141bfab89
[patch][update] naming_series field in member patch
2018-06-04 16:36:12 +05:30
Prateeksha Singh
37678d4838
[patch][new] rename old members as per naming series ( #14339 )
2018-06-04 14:25:51 +05:30
Sushant Nadkar
ebf76163ad
show uom in list view of material request ( #14338 )
2018-06-04 14:23:25 +05:30
Ranjith Kurungadam
f576c570c9
Salary Slip - fix when no pyroll period found for tax calc ( #14335 )
2018-06-04 12:53:23 +05:30
Nabin Hait
8c33587003
Merge branch 'ESS-LLP-dev_hra' into develop
2018-06-04 11:23:48 +05:30
Nabin Hait
8c7af497a0
Fixed merge conflict
2018-06-04 11:23:36 +05:30
Ranjith Kurungadam
ed4e49c6b2
Salary Slip - Deduct Tax ( #14255 )
...
* Salary Slip - Deduct Tax For Unclaimed Employee Benefits, Unsubmitted Tax Exemption Proof
* fix - missing return statement
2018-06-04 11:17:55 +05:30
Nabin Hait
df7e0ed1e3
Merge branch 'ESS-LLP-jam_ent_emp_benefits' into develop
2018-06-04 11:15:13 +05:30
Nabin Hait
a55090dc88
Fixed merge conflict
2018-06-04 11:14:50 +05:30
Jamsheer
398f15754d
Rename - Additional Salary Component to Additional Salary ( #14302 )
...
* Rename Doctype Additional Salary Component to Additional Salary
* Remove unused import
2018-06-04 11:02:53 +05:30
Prateeksha Singh
8ac7dfee36
Merge pull request #14329 from pratu16x7/hub-fixes
...
[hub][minor] remove links #14309
2018-06-04 10:28:47 +05:30
Prateeksha Singh
e73df88863
[hub][minor] remove links #14309
2018-06-04 10:26:49 +05:30
Nabin Hait
953ea93f7b
Update leave_type.json
2018-06-03 15:31:35 +05:30
Shreya Shah
d3255b1d3d
Add docs for Inter Company Invoice creation ( #14314 )
2018-06-03 10:28:51 +05:30
Tropicalrambler
8b38e57af2
Correcting typo in the User Documentation ( #14326 )
...
This corrects a simple typo in the Pricing rule topic for documentation
2018-06-03 10:27:38 +05:30
Ranjith Kurungadam
375db6181d
Earned Leave ( #14143 )
...
* Earned Leave Allocations will be initially zero, escaped validation in leave allocation to allow this
* Earned Leave monthly scheduler method, test
* remove whitelist of method
2018-06-01 16:09:28 +05:30
Saurabh
f9f35d0b76
Merge pull request #14305 from saurabh6790/release_fix
...
typo fix
2018-05-31 18:11:53 +05:30
Saurabh
824e068d0a
typo fix
2018-05-31 18:11:05 +05:30
Saurabh
0eb622f7da
[fix] resolve conflicts
2018-05-31 17:32:17 +05:30
Saurabh
defecd3785
Merge branch 'hotfix'
2018-05-31 17:24:53 +05:30
Saurabh
fccf7f2a68
bumped to version 10.1.36
2018-05-31 17:54:53 +06:00
Ranjith
590bf4ce3a
codacy fixes
2018-05-31 12:08:14 +05:30
Shreya Shah
c55f774fbf
Address filter in gstr1 report ( #14290 )
2018-05-31 09:33:36 +05:30
AMS Fauzi
f3a6d95634
Develop: Batch Number Series ( #14251 )
2018-05-31 09:31:57 +05:30
rohitwaghchaure
780952ea03
Show actual qty in warehouse link search ( #14258 )
2018-05-31 09:29:18 +05:30
Ahmad M Abdelrahman
f12b446dc8
Bank Account #13714 PR ( #14295 )
2018-05-31 08:58:23 +05:30
Saurabh
e5d076d495
[minor][fix] fix query syntax ( #14294 )
...
* [minor][fix] fix query syntax
* Update pos.py
2018-05-31 08:54:31 +05:30
Umair Sayed
5225c0e541
May docs ( #14298 )
...
* manual update
* Added new videos in learn section. Updated other help pages.
* project module rewrite
* employee and supplier master
* employee and supplier master fixes
2018-05-31 08:43:22 +05:30
Ameya Shenoy
cce7189b4f
Added issue and PR Templates ( #14300 )
2018-05-31 08:42:52 +05:30
rohitwaghchaure
26833cf506
Merge pull request #14299 from rohitwaghchaure/field_rearrange_for_budget
...
Rearrange fields
2018-05-31 00:27:45 +05:30
Rohit Waghchaure
7c0dd7a142
Rearrange fields
2018-05-31 00:27:05 +05:30
Ranjith
0cb2684130
Tax Exemption Proof Submission - validations, eligible hra calc
2018-05-30 20:51:37 +05:30
Ranjith
793f8e8caa
Tax Exemption Declaration - update fields, move generic methods to utils
2018-05-30 20:50:48 +05:30
rohitwaghchaure
31a96d2a3f
[Fix] System not fetching default warehoue defined in pos profile for packing materials of product bundle item ( #14287 )
2018-05-30 18:13:47 +05:30
Prateeksha Singh
c62de0831e
Merge pull request #14291 from pratu16x7/help-page
...
[fix] help page issue listing
2018-05-30 17:27:49 +05:30
Prateeksha Singh
66425c6e7f
[fix] help page issue listing
2018-05-30 17:26:03 +05:30
Shreya Shah
47335e5e60
Stocking out items with expired batches ( #14249 )
...
* Add dropdown in Stock Entry to get expired batch items
* Fetch all the items with expired batches
* Add the fetched item details to stock entry details
* Modify as per the review comments
2018-05-30 15:44:41 +05:30
rohitwaghchaure
05152dad0b
[Enhance] Provision to set overproduction percentage for work order ( #14248 )
2018-05-30 15:28:09 +05:30
Prateeksha Singh
09e46a4e5f
Hub fixes ( #14281 )
...
* [hub] remove list freeze
* [hub] fix svg in icon
* [hub] implement route options in hub list view
2018-05-30 15:12:20 +05:30
Jignesh Greycube
9aca025be2
Documentation to Fetch value in Child Table for a field ( #14282 )
...
* Fetch value in Child Table for a field
Sample Script to fetch value in child table
* Update fetch value in child table field
2018-05-30 15:08:55 +05:30
Ranjith
806cd93791
Merge remote-tracking branch 'frappe/develop' into dev_hra
2018-05-30 13:37:47 +05:30
Ranjith
155ecc1b4a
Tax Exemption Declaration - HRA Calculation
2018-05-30 13:37:15 +05:30
Faris Ansari
6ac9c0f71e
Merge pull request #14267 from surajshetty3416/workflow-doc-changes
...
Add doc related to workflow action
2018-05-30 12:34:21 +05:30
