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
Prateeksha Singh
a7c6ff8f3e
Merge pull request #13837 from shreyashah115/serial-batch-linking
...
Serial No. and Batch No. linking
2018-05-02 15:11:19 +05:30
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
Shreya
27e4e244b6
fix codacy
2018-05-02 14:34:14 +05:30
Shreya
ae0b31c31d
changes as per the reviews
2018-05-02 14:34:14 +05:30
Shreya
b47302dd52
unlink reference on cancellation of any invoice
2018-05-02 14:34:14 +05:30
Shreya
c804f424ab
update reference fields on both invoices
2018-05-02 14:34:14 +05:30
Shreya
79584b1cbd
validations to check price list and currencies
2018-05-02 14:34:14 +05:30
Shreya
99ae0439d7
mapping of relevant fields
2018-05-02 14:34:14 +05:30
Shreya
0bd987ab03
validations before routing to invoice
2018-05-02 14:34:14 +05:30
Shreya
ed80cf1f2e
Inter company invoice reference link field
2018-05-02 14:34:14 +05:30
Shreya
30b2480cfe
make inter company invoice button on Invoices
2018-05-02 14:34:14 +05:30
Shreya
462e18ad2e
Allowed To Transact With child table in Customer & Supplier
2018-05-02 14:34:14 +05:30
Shreya
59512aaaaa
Internal Supplier check in Supplier
2018-05-02 14:34:14 +05:30
Shreya
7946ca216e
Internal Customer check in Customer
2018-05-02 14:34:14 +05:30
Nabin Hait
d2861df939
Renamed Health Insurance to Employee Health Insurance
2018-05-02 14:34:14 +05:30
Nabin Hait
43274de5df
Removed employee table from Salary Structure and added employee name in all forms
2018-05-02 14:33:37 +05:30
Nabin Hait
e9ad03e23e
Documents order in hr page
2018-05-02 14:31:27 +05:30
Nabin Hait
501a64becd
Added links in HR module
2018-05-02 14:31:03 +05:30
Shreya Shah
24e8f31be1
[Enterprise] Patch and child table changes ( #13656 )
...
* [patch] rename field
* Employee Property History child table
* remove child tables
2018-05-02 14:29:44 +05:30
Nabin Hait
2f77ccce1b
New doctypes for HR and Accounting ( #13652 )
2018-05-02 14:27:19 +05:30
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
0456ced796
remove unused code
2018-05-01 19:00:06 +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
Nabin Hait
d39386bd55
Renamed some salary related fields
2018-04-30 16:21:37 +05:30
Shreya
96e45902fd
codacy
2018-04-30 15:54:34 +05:30
Faris Ansari
30304e68ff
[fix] Current stock qty calculation in case of different UOM
2018-04-30 15:44:49 +05:30
Shreya
14bd43d5eb
minor changes
2018-04-30 15:30:42 +05:30
Ameya Shenoy
da33b14f78
removed bad code and made compatible with pip 10 ( #13805 )
2018-04-30 11:17:12 +05:30
