Saurabh
40349f4b00
[fix] add stock entry link on Material Request Dashboard ( #13950 )
2018-05-08 15:23:51 +05:30
Saurabh
b36517158b
[fix] cheque print template coordinates ( #13959 )
2018-05-08 15:23:29 +05:30
Manas Solanki
3b9720f0be
Merge pull request #13952 from manassolanki/minor-report-fix
...
[minor] fix for the student report card
2018-05-08 12:43:43 +05:30
Manas Solanki
cf26b2ca1c
[minor] fix for the student report card
2018-05-08 12:39:02 +05:30
Nabin Hait
02a40e9d7b
Merge branch 'hotfix'
2018-05-05 14:33:33 +05:30
Nabin Hait
ea199f9cd9
bumped to version 10.1.30
2018-05-05 15:03:33 +06:00
Nabin Hait
161f35a687
Update sales_invoice.py
2018-05-05 14:32:31 +05:30
Nabin Hait
fcb984b294
Merge branch 'hotfix'
2018-05-05 12:13:29 +05:30
Nabin Hait
723fe8fb1b
bumped to version 10.1.29
2018-05-05 12:43:29 +06:00
Ameya Shenoy
47c0c8ba49
removed bad code and made compatible with pip 10 ( #13805 )
2018-05-04 19:20:20 +05:30
Rohit Waghchaure
3e0a937cb8
[Fix] Tax not changes when user change the POS profile in the sales invoice
2018-05-04 19:20:20 +05:30
Jamsheer
bd63f0056a
Patient medical record updation and deletion fixes ( #13891 )
2018-05-04 18:13:28 +05:30
Shreya Shah
55daa9cd24
fix taxable amount for same items ( #13927 )
2018-05-04 18:01:23 +05:30
Shreya Shah
764b9bfeba
cint for Item field has_variants ( #13916 )
...
* convert none type value to int
* Fix typo
2018-05-04 17:58:36 +05:30
Nabin Hait
62b985d405
[fix] Update show_in_website in template
2018-05-04 12:21:15 +05:30
Saurabh
ed393d1025
[fix] consider user permissions in leave application calendar view ( #13902 )
...
* [fix] consider user permissions in leave application calendar view
* add hr settings to control leave calendar view
* add patch
2018-05-03 18:52:25 +05:30
Nabin Hait
ed376cacc8
Set Qty in transactions based on serial no via Stock Settings ( #13897 )
2018-05-03 16:24:52 +05:30
Saurabh
7461806b1c
Merge pull request #13892 from codingCoffee/travis
...
dark magic to revive travis
2018-05-02 23:23:07 +05:30
Ameya Shenoy
bb7c5ac0f8
dark magic to revive travis
...
It seems that some process inside travis is using port no 9000. Hence
adding this line in the travis.yml to change common_site_config.json and
use port no 9001 for socket_io
2018-05-02 17:32:39 +05:30
Saurabh
0272fc05bf
Merge branch 'hotfix'
2018-05-02 14:48:09 +05:30
Saurabh
4f6b68fef2
bumped to version 10.1.28
2018-05-02 15:18:09 +06:00
Faris Ansari
eae2ddac69
validate_conversion_rate in taxes_and_totals ( #13880 )
2018-05-02 12:19:30 +05:30
Prateeksha Singh
99be9d17d5
Merge pull request #13850 from netchampfaris/msgprint-to-alert
...
Change msgprint to alert
2018-05-01 18:52:49 +05:30
Faris Ansari
5df63e36d4
Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix
2018-05-01 10:52:15 +05:30
Faris Ansari
bd99606a14
Change msgprint to unobtrusive alert
2018-05-01 10:52:02 +05:30
Zarrar
b0a46f397a
display customer's name while printing receivable report ( #13830 )
2018-04-30 19:40:18 +05:30
Prateeksha Singh
53c9b63c0b
Merge pull request #13842 from pratu16x7/hotfix
...
[fix] setup_website, fixes #11143
2018-04-30 18:21:53 +05:30
Prateeksha Singh
9b2078feab
[fix] setup_website, fixes #11143
2018-04-30 18:11:20 +05:30
Faris Ansari
30304e68ff
[fix] Current stock qty calculation in case of different UOM
2018-04-30 15:44:49 +05:30
Zarrar
6bc500bffa
[Minor] Validate dates in Salary Structure ( #13807 )
...
* validate date
* fix date trigger issue
2018-04-30 11:14:09 +05:30
Faris Ansari
8be895091e
Set is_pos to 0 in Opening Invoice Tool ( #13810 )
2018-04-30 11:13:06 +05:30
Ameya Shenoy
f5f8a1f288
i still don't know why we're still using travis ( #13817 )
2018-04-30 11:10:39 +05:30
Gaurav Naik
c925a38f79
Ignore mandatory for default warehouses ( #13812 )
2018-04-27 15:31:11 +05:30
Prateeksha Singh
c23230faea
Merge pull request #13786 from pratu16x7/hotfix
...
[fix] featured product thumbnail
2018-04-25 13:04:19 +05:30
Prateeksha Singh
6855b87f76
[fix] featured product thumbnail
2018-04-25 13:03:11 +05:30
Saurabh
07d030208f
Merge branch 'hotfix'
2018-04-25 12:46:48 +05:30
Saurabh
47f6e32920
bumped to version 10.1.27
2018-04-25 13:16:48 +06:00
Saurabh
7bd1453f8f
Merge pull request #13785 from rohitwaghchaure/fix_patch_pos_taxes
...
[Fix] POS Patch
2018-04-25 12:44:20 +05:30
Rohit Waghchaure
bf416cfbf8
[Fix] POS Patch
2018-04-25 12:32:22 +05:30
Saurabh
67918fff32
Merge branch 'hotfix'
2018-04-25 11:31:48 +05:30
Saurabh
132dac9712
bumped to version 10.1.26
2018-04-25 12:01:48 +06:00
rohitwaghchaure
57914f140e
[HotFix] Taxes not adding in POS sales invoice ( #13776 )
2018-04-24 19:19:47 +05:30
Saurabh
ede0af97cd
Merge branch 'hotfix'
2018-04-24 12:09:38 +05:30
Saurabh
ad4ede0e23
bumped to version 10.1.25
2018-04-24 12:39:38 +06:00
Saurabh
cfcf9b3832
Merge pull request #13772 from saurabh6790/supp_240418
...
typo fix
2018-04-24 12:08:38 +05:30
Saurabh
d2065ce3bf
typo fix
2018-04-24 12:07:37 +05:30
Rohit Waghchaure
31edddace6
[Fix] Tax not changes when user change the POS profile in the sales invoice
2018-04-24 11:43:31 +05:30
Saurabh
8f29159fb7
Merge branch 'hotfix'
2018-04-24 11:12:07 +05:30
Saurabh
d9f1b539dc
bumped to version 10.1.24
2018-04-24 11:42:07 +06:00
Prateeksha Singh
60bd383a25
Merge pull request #13763 from pratu16x7/hotfix
...
[fix] cal view start end date field discrepancies
2018-04-23 13:34:49 +05:30