Saurabh
|
f65e8de5a5
|
[fix] if terms exists then only call render_template
|
2017-01-07 08:18:10 +05:30 |
|
Nabin Hait
|
0dab40f4a1
|
Merge pull request #7377 from KanchanChauhan/naming-series
[Fix] Naming series issue
|
2017-01-04 15:44:00 +05:30 |
|
Nabin Hait
|
202bcc09d5
|
Merge pull request #7336 from rohitwaghchaure/pos_enhancement_and_issues
[Enhancement] POS features
|
2017-01-04 15:15:32 +05:30 |
|
Kanchan Chauhan
|
0e8361d1de
|
[Fix] Naming series issue
|
2017-01-03 14:29:17 +05:30 |
|
Nabin Hait
|
ceea71bcfc
|
Merge pull request #7365 from rohitwaghchaure/terms_and_condition
minor fix
|
2017-01-02 17:24:42 +05:30 |
|
Rohit Waghchaure
|
cdbacf5398
|
minor fix
|
2016-12-30 17:06:01 +05:30 |
|
Saurabh
|
6bbed0297b
|
[fix] status check fix
|
2016-12-30 17:05:40 +05:30 |
|
Rohit Waghchaure
|
249bc6167f
|
fix company issue
|
2016-12-28 00:20:08 +05:30 |
|
Rohit Waghchaure
|
8c9c9cfc5f
|
When a new company is made, cash account should be automatically set for Mode of Payment
|
2016-12-27 17:31:32 +05:30 |
|
Nabin Hait
|
58291c77e9
|
Fixed version conflict
|
2016-12-23 17:43:42 +05:30 |
|
Rushabh Mehta
|
4c210527b2
|
[fix] https for SMS gateway, now using requests fixes #5404
|
2016-12-19 16:22:34 +05:30 |
|
Rushabh Mehta
|
99c814b360
|
[fix] paging for products (support)
|
2016-12-19 11:55:10 +05:30 |
|
Nabin Hait
|
6a1c0665bc
|
Merge pull request #7227 from nabinhait/country_coa
Chart of accounts for few countries, added test cases for each country
|
2016-12-15 11:31:07 +05:30 |
|
Rushabh Mehta
|
e9d9b8e6f0
|
[fix] demo and process payroll for demo (#7224)
* [fix] demo and process payroll for demo
* [fix] set payroll dates
|
2016-12-15 11:27:35 +05:30 |
|
Nabin Hait
|
a756d64fca
|
Chart of accounts for some countries, added test cases for each country
|
2016-12-14 18:40:29 +05:30 |
|
Nabin Hait
|
784f6cc31a
|
Merge pull request #7181 from KanchanChauhan/sales-person-status
Added "Enabled" to Sales Person
|
2016-12-13 11:28:36 +05:30 |
|
Kanchan Chauhan
|
f0b0db444d
|
Added Is Active to Sales Person
|
2016-12-12 19:12:41 +05:30 |
|
Kanchan Chauhan
|
b642625ed2
|
Jinja template in Terms and Conditions
|
2016-12-12 17:34:30 +05:30 |
|
Nabin Hait
|
abd5a92bcc
|
Merge pull request #7162 from nabinhait/manqala-exchange_rate_modifications1
Exchange rate base on date
|
2016-12-09 12:34:15 +05:30 |
|
Nabin Hait
|
ad4f1c7fd1
|
date is optional in get_exchange_rate
|
2016-12-09 12:14:47 +05:30 |
|
Nabin Hait
|
d249c76ce0
|
Merge pull request #7165 from KanchanChauhan/salary-component-type-in-new-signups
[Minor]Added type to Salary Components
|
2016-12-09 11:50:43 +05:30 |
|
Kanchan Chauhan
|
13f19993c5
|
[Minor]Added type to Salary Components
|
2016-12-08 17:50:15 +05:30 |
|
Nabin Hait
|
288a18e0cc
|
Fixes and patch for Currency Exchange based on date
|
2016-12-08 15:36:23 +05:30 |
|
Nabin Hait
|
87d70279c6
|
get exchange rate on change of date
|
2016-12-08 14:43:11 +05:30 |
|
Nabin Hait
|
1cc55fbbcb
|
Fixed merge conflict
|
2016-12-08 14:09:23 +05:30 |
|
Nabin Hait
|
5c18bd9b61
|
Fixed merge conflict
|
2016-12-06 16:16:58 +05:30 |
|
robert schouten
|
7f72cd0f97
|
[fix] email digest cache by frequency
|
2016-12-06 08:51:40 +08:00 |
|
Rushabh Mehta
|
323c06ebbf
|
[minor] rename icons as per FontAwesome 4 (#7136)
|
2016-12-05 14:17:26 +05:30 |
|
Nabin Hait
|
3247db4827
|
Merge pull request #7050 from nabinhait/coa_based_on_existing_company
Create Chart of Accounts based on existing company
|
2016-11-24 13:28:11 +05:30 |
|
Nabin Hait
|
a8333be6ad
|
Merge pull request #7023 from frappe/revert-7012-remove-count-star
Revert "[optimize] remove count(*) from queries"
|
2016-11-24 13:26:38 +05:30 |
|
Nabin Hait
|
e0089184e6
|
Create Chart of Accounts based on existing company
|
2016-11-23 17:34:16 +05:30 |
|
bhupen
|
c097a4fe68
|
Changes in company doctype for chart of accounts
|
2016-11-23 17:34:16 +05:30 |
|
Nabin Hait
|
d194cce35c
|
fixed merge conflict
|
2016-11-23 14:55:23 +05:30 |
|
robert schouten
|
085706bcbf
|
[fix] naming series only show non disabled role doctypes
|
2016-11-23 13:57:21 +08:00 |
|
Rushabh Mehta
|
9872d8cdb5
|
Revert "[optimize] remove count(*) from queries"
|
2016-11-21 21:04:47 +05:30 |
|
Rushabh Mehta
|
5a258cbc2d
|
[optimize] remove count(*) from queries
|
2016-11-21 14:57:36 +05:30 |
|
Rushabh Mehta
|
fe816c3852
|
[fix] [wip] daily work summary
|
2016-11-18 12:40:18 +05:30 |
|
Nabin Hait
|
95e6ccd419
|
Merge branch 'master' into develop
|
2016-11-14 12:42:26 +05:30 |
|
Nabin Hait
|
6209f2f75b
|
Merge pull request #6925 from rmehta/setup-wizard-fix
[fix] ignore duplicate names for program, academic term, academic year, course, instructor
|
2016-11-14 11:59:26 +05:30 |
|
Rushabh Mehta
|
463808ef9e
|
[fix] ignore duplicate names for program, academic term, academic year, course, instructor
|
2016-11-14 11:21:11 +05:30 |
|
Rushabh Mehta
|
13fc52d713
|
[minor] added default standard filters (#6854)
|
2016-11-07 17:19:19 +05:30 |
|
pratu16x7
|
a43639edb4
|
[fix] role fix for schools setup (#6824)
|
2016-11-05 10:09:53 +05:30 |
|
Nabin Hait
|
f5d8dd3b18
|
Fixed merge conflict
|
2016-11-04 16:54:53 +05:30 |
|
Rohit Waghchaure
|
0d2f7e62c0
|
set remember last selected value as true for company field
|
2016-11-03 16:19:34 +05:30 |
|
Rushabh Mehta
|
1aac956306
|
[minor] [fixes] can rename program and disable role on domainify
|
2016-11-02 07:33:18 +05:30 |
|
Rohit Waghchaure
|
7488cf1ce1
|
[Fix] country wise tax, country name issue
|
2016-10-28 18:01:43 +05:30 |
|
Saurabh
|
468e41f24f
|
[enhance] introduce ignore_fields param for _tree and get_query
|
2016-10-27 15:23:19 +05:30 |
|
Neil Trini Lasrado
|
5ddd7acdbd
|
Typo fix
|
2016-10-24 15:25:47 +05:30 |
|
Umair Sayed
|
a56775ce9a
|
Update domainify.py
|
2016-10-24 13:00:17 +05:30 |
|
shreyas
|
c48eb45410
|
[Fix] Use company_fieldname as parameter to the query
|
2016-10-24 10:18:28 +05:30 |
|