Saurabh
21cf1fd851
[fix] translate domain
2017-06-29 12:04:45 +05:30
Makarand Bauskar
5d8803b23e
Merge pull request #9435 from rmehta/gst
...
GST (India) Setup and Invoices #8711
2017-06-27 11:44:33 +05:30
Makarand Bauskar
c93de0e803
[minor] removed global roles from company doctype field's depends on propery ( #9450 )
2017-06-24 10:39:30 +05:30
Rushabh Mehta
210b6f8f7e
[docs]
2017-06-22 22:32:08 +05:30
Rushabh Mehta
25366a22ad
[minor] cleanup
2017-06-22 22:32:08 +05:30
Rushabh Mehta
919a74ad88
[gst] adde reports + docs
2017-06-22 22:32:08 +05:30
Rushabh Mehta
b3c8f44b3e
[wip] GST for India. Pending reports
2017-06-22 22:31:32 +05:30
Makarand Bauskar
e995371b08
Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings
...
[Enhance] Company wise perpetual inventory settings
2017-06-22 12:35:41 +05:30
Rohit Waghchaure
2d9b3cd270
Fixed test cases
2017-06-22 12:23:15 +05:30
Rushabh Mehta
17e6bb83eb
[fix] typo, item group route to have parent only for non root
2017-06-20 14:07:33 +05:30
Makarand Bauskar
958b06b129
Merge pull request #9369 from sagarvora/gh-4559
...
[minor] calculate balance in company currency instead of account currency
2017-06-20 13:26:10 +05:30
Britlog
faf75c4ddd
Fix and improve shopping cart ( #9348 )
...
* Fix and improve shopping cart
* Update shopping_cart.js
* Update shopping_cart.js
2017-06-20 12:51:32 +05:30
Rushabh Mehta
c422874418
Update company.py
2017-06-20 12:19:36 +05:30
Sagar Vora
5b08d7acb3
[minor] calculate balance in company currency instead of account currency
2017-06-20 11:50:23 +05:30
Rohit Waghchaure
e9ff1914fc
Added is_perpetual_inventory_enabled method
2017-06-20 11:26:37 +05:30
Rohit Waghchaure
a5f40941ae
[Enhance] Companywise perpetual inventory setting
2017-06-20 10:21:33 +05:30
Makarand Bauskar
3d6697949c
[minor] fixed the child table field name ( #9328 )
...
* [minor] exclude Other domain from Domains
* [minor] fixed the child table field name
2017-06-16 14:12:28 +05:30
Makarand Bauskar
dd986f659e
Merge branch 'pratu16x7-domainify' into domainify ( #9324 )
...
* bootstrap domains and set active_domain on setup
* [minor] Patch for domain docs
* [minor]
* Update create_domain_docs.py
2017-06-16 13:02:45 +05:30
Nabin Hait
6e9a146f2b
Merge pull request #9193 from tundebabzy/issue_9180
...
Payment Entry - Latest Exchange Rate not fetched
2017-06-15 12:34:27 +05:30
Nabin Hait
6d7b0ce794
Warehouse Account Linking ( #9292 )
...
* [enhance] Added account in the warehouse
* documentation
* patch to move account head from account to warehouse
* fixed test cases
* Fixes in warehouse-account linking
* minor fix in test case
2017-06-15 11:09:27 +05:30
mbauskar
96ce5821b8
[hot] fixed ImportError: Module import failed for Company (erpnext.setup.doctype.company.company)
2017-06-13 17:03:13 +05:30
KanchanChauhan
1dc26b127b
Salutation and Gender in Lead and Customer ( #9199 )
2017-06-13 15:26:35 +05:30
tunde
88f1d316d8
adds new tests that verify that get_exchange_rate returns the latest exchange rate
2017-06-08 19:44:26 +01:00
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +05:30
Charles-Henri Decultot
5ade661a9a
Weekly digest subject translation ( #9003 )
2017-06-01 19:06:32 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Nabin Hait
c795386230
Fixed merge conflict
2017-05-24 18:39:16 +05:30
Charles-Henri Decultot
032374e76e
Correction of the digest template ( #8992 )
2017-05-24 16:29:42 +05:30
Nabin Hait
7a9bd41a72
Improved currency exchange rate message
2017-05-24 16:18:36 +05:30
Nabin Hait
012c9a0916
Set default account in mode-of-payment Cash, only if default cash account exists ( #8909 )
2017-05-19 12:30:58 +05:30
rohitwaghchaure
a689432a6e
[fix] Can't update naming series if format has year,month ( #8836 )
2017-05-16 12:47:34 +05:30
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
Nabin Hait
1117125841
Update domainify.py
2017-05-01 11:40:13 +05:30
mbauskar
e94c6e7b8e
[minor] disabled the instructor role if the company domain is not Education
2017-05-01 11:40:13 +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
mbauskar
9bac58cdc6
[fixes] fixes in setup wizard for education domain
2017-04-21 11:38:28 +05:30
CH
d20ec25c92
Removal of double brackets to setup the chart of accounts in the setup wizard
2017-04-13 18:59:06 +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
CH
99752e58ec
VAT rates update for France
2017-03-30 12:45:08 +05:30
Nabin Hait
56f650f342
Merge branch 'master' into develop
2017-03-15 11:28:07 +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
Rushabh Mehta
83aa5ee3df
[messages] cleanup
2017-03-10 12:47:29 +05:30
Rushabh Mehta
868bb26e24
[sample] add help for sample tasks and make them into notifications
2017-03-09 18:11:11 +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
Neil Trini Lasrado
c15b5db030
Added 'All Assessment Group' to fixtures
2017-02-24 13:16:46 +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
Rushabh Mehta
cf99dc0e77
[fix] for setup wizard tests and demo;
2017-02-09 18:06:11 +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
Rushabh Mehta
fd82f4b0d4
[minor] fix for item_group.py
2017-01-27 16:00:47 +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
95439db53f
[fixes] address and contact
2017-01-14 00:25:22 +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
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
