Saurabh
|
e85a43c1c6
|
Merge branch 'master' into develop
|
2018-05-02 14:48:10 +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 |
|
Umair Sayed
|
cd00f8f458
|
Updated domain pages (only content) and added few new help pages. (#13835)
* domain pages update
* domain docs
* domain pages
* help and domain pages
|
2018-05-02 12:21:35 +05:30 |
|
rohitwaghchaure
|
0065624fe0
|
Tax amount showing under wrong tax header in the report (#13843)
|
2018-05-02 12:20:55 +05:30 |
|
Faris Ansari
|
eae2ddac69
|
validate_conversion_rate in taxes_and_totals (#13880)
|
2018-05-02 12:19:30 +05:30 |
|
Zarrar
|
284de4c15a
|
updated modified time - reload issue in patch (#13881)
|
2018-05-02 12:14:59 +05:30 |
|
Prateeksha Singh
|
9f97c97e25
|
Merge pull request #13832 from shreyashah115/color-field
Ability to add colour to all calendar type views
|
2018-05-01 19:00:41 +05:30 |
|
Shreya
|
eb54331d5f
|
removed color field from sales order and work order
|
2018-05-01 18:56:06 +05:30 |
|
Shreya
|
fd47b92138
|
renamed color field
|
2018-05-01 18:55:17 +05:30 |
|
Shreya
|
9c688f6dbf
|
color field for calendar in leave application
|
2018-05-01 18:55:17 +05:30 |
|
Shreya
|
a7b2fc9250
|
color field for calendar in sales order and work order
|
2018-05-01 18:55:17 +05:30 |
|
Shreya
|
62907472f3
|
color field for calendar in task
|
2018-05-01 18:54:20 +05:30 |
|
Shreya
|
d71c0c1720
|
color field for calendar in holiday list
|
2018-05-01 18:54:20 +05:30 |
|
Shreya
|
4c8a08effb
|
color field for calendar in course schedule
|
2018-05-01 18:54:20 +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 |
|
Nabin Hait
|
48c0b3b328
|
Merge branch 'tundebabzy-new-subscription' into develop
|
2018-04-30 19:33:15 +05:30 |
|
Nabin Hait
|
3652a62b55
|
minor fixes
|
2018-04-30 19:32:29 +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 |
|
Ameya Shenoy
|
da33b14f78
|
removed bad code and made compatible with pip 10 (#13805)
|
2018-04-30 11:17:12 +05:30 |
|
Shreya Shah
|
05ad2802c6
|
Travis test fixes for leave application (#13790)
* test fix
* expense claim test fix
* fix payroll entry test case
|
2018-04-30 11:14:56 +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 |
|
Adam Dawoodjee
|
3cd4fce710
|
Typo fix (#13809)
|
2018-04-30 11:13:18 +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 |
|
Manas Solanki
|
5cc41907a4
|
Merge pull request #13811 from frappe/manassolanki-patch-5
Remove the duplicate description
|
2018-04-27 12:47:24 +05:30 |
|
Manas Solanki
|
0536baacc2
|
Remove the duplicate description
|
2018-04-27 12:46:56 +05:30 |
|
Faris Ansari
|
9f739fe87d
|
Handle item_wise_tax_detail invalid value while item renaming (#13778)
|
2018-04-26 18:48:01 +05:30 |
|
Kenneth Sequeira
|
b01f998b49
|
Update tracking-project-profitability-using-cost-center.md (#13792)
Fixed typo in the title.
|
2018-04-26 18:40:14 +05:30 |
|
AravindPranera
|
805f09a3fe
|
Accounts receivable aging based on supplier due date (#13801)
|
2018-04-26 18:02:37 +05:30 |
|
rohitwaghchaure
|
7e8a7ac6ee
|
Provision to select opening stock in stock reconciliation (#13802)
|
2018-04-26 16:30:35 +05:30 |
|
Rushabh Mehta
|
369afce43c
|
[patch] ignore validations while creating custom fields for gst via patch
|
2018-04-26 10:10:03 +05:30 |
|
Manas Solanki
|
30c267bec6
|
Merge pull request #13784 from KanchanChauhan/typo-fix
[Typo Fix] in Work Order
|
2018-04-25 17:23:36 +05:30 |
|
Kanchan Chauhan
|
7826dd1aeb
|
Typo Fix in Work Order
|
2018-04-25 13:48:47 +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
|
1d5bbe1081
|
Merge branch 'master' into develop
|
2018-04-25 12:46:50 +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
|
63590496c1
|
[fix] resolved merge conflicts
|
2018-04-25 11:32:54 +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 |
|