Commit Graph

788 Commits

Author SHA1 Message Date
Charles-Henri Decultot
156eef1907 Description correction (#8811) 2017-05-16 08:34:33 +05:30
Makarand Bauskar
62414565b1 [minor] added the address_html field in company doctype (#8754) 2017-05-10 14:52:03 +05:30
rohitwaghchaure
6324987c15 [fix] Company's abbreviation change will not update the warehouse (#8685) 2017-05-04 16:12:29 +05:30
Nabin Hait
fcc0246b38 Get mobile nos for customer contact (#8674) 2017-05-04 12:11:48 +05:30
Rohit Waghchaure
ac28ffb41e [fix] frappe.db.exists('Series', series) is not working because tabSeries table did not have column modified 2017-04-28 14:34:11 +05:30
Nabin Hait
9b20e07431 [fix] currency field precision 2017-04-25 14:09:29 +05:30
Nabin Hait
2d132e32aa Function name changed in company 2017-04-03 17:26:32 +05:30
Rushabh Mehta
cc8b2b2fdb [fix] [refactor] demo for v8 and remove purchase common 2017-03-31 17:36:48 +05:30
Rushabh Mehta
f6dee248ee Update company.json 2017-03-14 17:10:01 +05:30
Rushabh Mehta
6d4a52562b [fix] posting date, time is always current unless explicitly set 2017-03-14 17:06:51 +05:30
Nabin Hait
fb4b8d926f Company based on exising company fix 2017-03-12 16:55:05 +05:30
Nabin Hait
d0d22ff203 copy letter head from invoice to payment entry 2017-03-12 16:55:05 +05:30
mbauskar
124cf14429 [minor] ignore lead addresses delete query if address against lead not found 2017-03-11 16:02:20 +05:30
Rohit Waghchaure
e7485150a1 added roles in the report 2017-03-06 14:26:09 +05:30
Rohit Waghchaure
312498060f changed doctype name userrole to has role 2017-03-06 14:24:39 +05:30
Nabin Hait
78a650062c Update company.json 2017-03-02 14:48:49 +05:30
Nabin Hait
8bb69ff8bf Fixed merge conflict 2017-02-20 19:01:04 +05:30
Nabin Hait
fd3ec066ce Added fields in global search 2017-02-20 13:38:31 +05:30
Kanchan Chauhan
1b204c8e4e Accrual Payroll System 2017-02-16 16:30:51 +05:30
rohitwaghchaure
ea092a7b24 [Enhancement] Booking of an employee's expense claim (#7267)
* [Enhancement] Auto book of an employee's expense claim

* test cases

* documentation

* fixes and changes

* removed payable from employee and added into the company

* Added party in account, patch to update party type for customer and supplier accounts

* added party type in erpnext, fix patch

* fixed travis
2017-02-01 12:02:08 +05:30
mbauskar
16ce3623bc [fixes] set lead to Null on delete company transaction & other minor fixes 2017-01-30 10:45:28 +05:30
mbauskar
51b1d6de48 [minor] moved the address_and_contact utils to frappe 2017-01-30 10:45:28 +05:30
mbauskar
7fa039f15c [fixes] delete company transaction and other minor fixes 2017-01-30 10:45:28 +05:30
mbauskar
83f4780f74 [Fixes] Address and Contact fixes 2017-01-30 10:45:28 +05:30
mbauskar
cbc49e2989 [WIP] Address and Contact Fixes 2017-01-30 10:45:28 +05:30
Kanchan Chauhan
679cc23abb [Fix] Naming series issue fix 2017-01-23 17:20:55 +05:30
Rushabh Mehta
397e508fc0 [fix] sales_partner.js, fixes #7553 2017-01-21 16:58:57 +05:30
Nabin Hait
6b3670848e Merge pull request #7477 from rmehta/custom-perms
[minor] fix for custom perms
2017-01-18 17:03:58 +05:30
Rushabh Mehta
8d39fd9790 [fix] address queries + tests 2017-01-16 13:06:15 +05:30
Rushabh Mehta
b92087cb2d [cleanup] move contact, address to frappe 💥 2017-01-13 18:54:47 +05:30
Rushabh Mehta
af077dc616 [minor] fix for custom perms 2017-01-13 14:47:37 +05:30
Nabin Hait
6e9d2a3c1f fixed conflict 2017-01-09 17:21:34 +05:30
Saurabh
f65e8de5a5 [fix] if terms exists then only call render_template 2017-01-07 08:18:10 +05:30
britlog
35cefb1275 fix success_list if http status == 200 + utf-8 support + optional success message 2017-01-04 15:53:26 +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
ab42fc006f Merge branch 'master' into develop 2017-01-02 17:26:55 +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
Rushabh Mehta
2097ccfaea [fix] item_group.py #7358 2016-12-30 06:09:41 +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
Nabin Hait
f573d43b90 fixed version conflict 2016-12-20 11:40:15 +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