Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,446 Commits 3 Branches 0 Tags 1 GiB
49e8628627
Commit Graph

786 Commits

Author SHA1 Message Date
Neil Trini Lasrado
58e9590850 Fixed issues with Permissions in Company Doctype 2015-10-13 17:45:43 +05:30
Neil Trini Lasrado
ec5deb6e48 Changed label in Company 2015-10-13 15:28:12 +05:30
Nabin Hait
ae92fc7f35 [fix] Create sample opportunity and quotation only if Customer exists 2015-10-03 13:42:44 +05:30
Nabin Hait
fbef1fdf3a Minor fix 2015-10-02 16:26:18 +05:30
Anand Doshi
4945b94950 [fix] added validation to match account currency with existing gle and test case 2015-09-30 16:41:15 +05:30
Rushabh Mehta
7f75dbf061 [cleanup] remove backup manager 2015-09-28 19:12:54 +05:30
Rushabh Mehta
72b1128467 [fixes] accounts controller add flt 2015-09-28 17:29:46 +05:30
Rushabh Mehta
b5ff9421e1 [optimize] customer outstanding query 2015-09-25 12:25:12 +05:30
Anand Doshi
06ad308ca1 [fixes] setup wizard and other fixes related to cart 2015-09-23 12:50:35 +05:30
Rushabh Mehta
72fbf902d7 [cleanup] added single price list for shopping cart, removed Applicable Territory 2015-09-23 12:50:34 +05:30
Rushabh Mehta
e3401182c8 Merge pull request #4012 from saurabh6790/cart 
Taxation for Shopping Cart based on Tax Rule template
 2015-09-17 16:26:35 +05:30
Anand Doshi
d4aa27cbb8 Merge pull request #4025 from anandpdoshi/split-emails 
use the new split_emails method to split emails by comma. Merge this after Communication CC is merged.
 2015-09-17 14:00:03 +05:30
Anand Doshi
c5f919eb68 [fix] use the new split_emails method to split emails by comma 2015-09-16 19:20:55 +05:30
Saurabh
5fe0086d9a [Fixes] Warehouse check while company delete & Variant Attribute value check 2015-09-16 16:59:24 +05:30
Neil Trini Lasrado
949d7dbaba Added validations, test-cases to Tax Rule 2015-09-15 15:41:00 +05:30
Anand Doshi
9345240ff1 Merge pull request #4007 from anandpdoshi/setup-wizard-duplicate-entry 
catch DuplicateEntryError in install_fixtures step of Setup Wizard
 2015-09-14 16:33:16 +05:30
Anand Doshi
dbe623b167 [fix] Use User Permission value as default only if the document type is Setup 2015-09-14 13:08:53 +05:30
Anand Doshi
5d9cfc76cd Don't copy title field in Duplicate 2015-09-11 15:35:26 +05:30
Anand Doshi
e67fa424b2 [fix] catch DuplicateEntryError in install_fixtures step of Setup Wizard 2015-09-11 15:32:06 +05:30
Anand Doshi
840cad0ff7 Don't copy title field in Duplicate 2015-09-11 12:26:57 +05:30
Nabin Hait
f76d63b92a Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency 
[fix][patch] delete item variant attributes if no variants exists against that item
 2015-09-10 19:26:02 +05:30
Nabin Hait
5a803d76ad [fix] Bypass Root Not Editable validation from Setup Wizard 2015-09-10 13:20:35 +05:30
Nabin Hait
2377cdfa4e Fixed conflict 2015-09-09 18:45:41 +05:30
Anand Doshi
888a70c2d4 [fix] Setup Wizard - the case of forgetting mute emails 2015-09-09 15:14:54 +05:30
Anand Doshi
bc1e8b4408 [minor] Unset Apply User Permissions in default permissions 2015-09-08 19:23:23 +05:30
Nabin Hait
6c3ff3e2ed Fixed conflict 2015-09-08 18:09:03 +05:30
Anand Doshi
3f1f2dd307 [fix] setup wizard - industry type 2015-09-08 15:53:53 +05:30
Nabin Hait
3607737b5e Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency 2015-09-07 10:41:01 +05:30
Anand Doshi
4df98d52c1 [fix] setup wizard - industry type 2015-09-07 10:11:23 +05:30
Nabin Hait
11a746d363 Fixed conflict 2015-09-03 16:04:11 +05:30
Nabin Hait
1609933748 Test cases for multi currency 2015-09-03 16:03:07 +05:30
Rushabh Mehta
85abdc4fad [minor] added stock settings for serial no. #3967. Merge with https://github.com/frappe/frappe/pull/1291 2015-09-03 10:29:38 +05:30
Nabin Hait
98096771c2 [multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that 2015-09-03 10:28:08 +05:30
Nabin Hait
e1d2bef389 [fix] Dont delete Employee while deleting company transactions 2015-09-02 14:07:46 +05:30
Nabin Hait
0ca3e3d89e [fix] Clear notification count while deleting company transactions 2015-09-02 13:09:48 +05:30
Nabin Hait
a1fa659475 [fix] Delete Time Logs while deleting company transactions 2015-09-02 12:56:29 +05:30
Rushabh Mehta
19e560e73f [fix] dropbox backup check not working 2015-09-01 09:57:25 +05:30
Nabin Hait
76bb927337 Fixed conflict 2015-08-31 17:28:05 +05:30
Nabin Hait
6e439a5e53 Multi currency: test case and fixes 2015-08-28 19:24:22 +05:30
Anand Doshi
8b66f2a691 Exported all doctypes 2015-08-27 16:45:52 +05:30
Anand Doshi
282e4947fa [fix] Changed more section label to 'More Information' 2015-08-27 13:11:46 +05:30
Anand Doshi
fe13bfed44 Fixes to Return Improvements pull request 
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
 2015-08-25 19:07:04 +05:30
Rushabh Mehta
d999dd1bb9 [minor] fix setup wizard buying_items query 2015-08-24 14:23:55 +05:30
Rushabh Mehta
b52724f5b9 [minor] should fix #3884 2015-08-19 11:41:41 +05:30
thecarly
56f5156f3c [minor] fixed typo 2015-08-10 12:50:44 +05:30
Rushabh Mehta
5bd394278d [fix] test-case, warehouse mandatory for mix type product bundle 2015-08-04 14:49:25 +05:30
Rushabh Mehta
a208c56813 [enhancement] auto insert item price if missing, #3533 2015-08-04 14:48:52 +05:30
Nabin Hait
b24d2efc4b [fix] Updated 'Include Holiday' in existing and default leave type records 2015-07-29 16:15:08 +05:30
Nabin Hait
18c2c54633 Merge pull request #3718 from rmehta/item-cleanup 
[cleanup] yes/no selects changed to checks in Item
 2015-07-29 15:49:54 +05:30
Rushabh Mehta
92b6f76612 [fix] disable save in naming series 2015-07-29 15:17:30 +05:30
Rushabh Mehta
1e8025b327 [cleanup] yes/no selects changed to checks in Item 2015-07-29 11:38:33 +05:30
Rushabh Mehta
49a59c075f [minor] [setup-wizard] add check for sample data 2015-07-28 12:23:40 +05:30
Rushabh Mehta
424f0c7b84 [fix] [setup wizard] ignore fiscal year 2015-07-28 10:36:33 +05:30
Rushabh Mehta
aa5fb5e50e [fix] [setup wizard] ignore if user is the primary user 2015-07-28 10:31:09 +05:30
Rushabh Mehta
08a60653ba [fix] [setup wizard] ignore if user is the primary user 2015-07-28 09:22:36 +05:30
Tsutomu Mimori
196a0bc675 Amend for frappe/erpnext/pull/3716 2015-07-24 17:06:00 +09:00
Tsutomu Mimori
7c011985f0 Merge remote-tracking branch 'frappe/develop' into develop 2015-07-24 17:02:13 +09:00
Tsutomu Mimori
c40b99be26 Merge remote-tracking branch 'frappe/develop' into develop 2015-07-23 22:10:40 +09:00
Tsutomu Mimori
982f4ae44d Removed HTML from messages 2015-07-23 22:09:35 +09:00
Anand Doshi
9257413b68 [minor] Added 'Import Data' in sample data 2015-07-23 18:16:44 +05:30
Anand Doshi
db9762be3f Merge pull request #3712 from rmehta/setup-wizard-fix 
[fix] contact name in setup wizard
 2015-07-23 16:46:09 +05:30
Anand Doshi
03ae61afce Merge pull request #3681 from rmehta/sample-data 
[enhancement] update to setup wizard, added users, employees, sample data
 2015-07-23 16:45:28 +05:30
Rushabh Mehta
7cfa5f0508 [fix] contact name in setup wizard 2015-07-23 12:39:44 +05:30
Nabin Hait
098760f0e2 [fix] SMS status and log 2015-07-22 12:17:48 +05:30
Rushabh Mehta
856ee10dc4 [enhancement] update to setup wizard, added users, employees, sample data 2015-07-17 15:03:18 +05:30
Anand Doshi
3210db9056 Merge pull request #3656 from rmehta/sms-log 
[fix] create SMS Log
 2015-07-16 15:56:08 +05:30
Rushabh Mehta
ea4d63cef3 [cleanup] removed welcome emails 2015-07-16 14:17:59 +05:30
Anand Doshi
9490c21b8a Merge pull request #3641 from rmehta/role-rename 
[rename] Material User > Stock User
 2015-07-14 12:10:48 +05:30
Rushabh Mehta
bdb71bca4e [perm] added stock, project user for company 2015-07-14 11:54:42 +05:30
Rushabh Mehta
97b3f750c9 [fixes] hours in time-log #3644, project buttons on condition, removed Guest permission in notification_control 2015-07-14 10:14:48 +05:30
Rushabh Mehta
94157334a7 [rename] Material User > Stock User 2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
ed8cecbdd8 Sales BOM renamed to Product Bundle 2015-07-13 12:41:27 +05:30
Nabin Hait
4770a1abb5 Customer's credit days based on fixed days / last day of the next month 2015-07-09 16:35:53 +05:30
Pratik Vyas
a0f2510b01 Change currency exchange rate api to fixer.io 2015-06-30 12:36:17 +05:30
Nabin Hait
bd9aa13db3 Minor issue in naming series 2015-06-17 15:09:40 +05:30
Nabin Hait
43c1a9b502 [fix] Quote url for item image in product listing page 2015-06-10 18:23:17 +05:30
Nabin Hait
bb429745c0 [fix] Blank option in naming series 2015-06-09 18:59:51 +05:30
Nabin Hait
030ade428b dont reset company on deleting company transactions 2015-06-03 11:24:37 +05:30
Rushabh Mehta
ed43f8015c [lang] let locale be en in setup wizard (?) 2015-06-02 12:31:03 +05:30
Rushabh Mehta
cf29f6468d [minor] add attachment to issue via portal: 2015-06-01 17:47:03 +05:30
Rushabh Mehta
a33d468d30 [fixes] portal, issues, addresses etc 2015-06-01 17:15:42 +05:30
Nabin Hait
a19150ddaf default account's custom query in company 2015-06-01 15:32:57 +05:30
Nabin Hait
c17dff4b01 default account's custom query in company 2015-06-01 15:32:57 +05:30
Rushabh Mehta
4a4a6594d1 [minor] [refactor] 2015-05-29 15:56:40 +05:30
Nabin Hait
80069a6379 Book gl entry automatically due to rounding loss with test cases 2015-05-29 10:39:09 +05:30
Nabin Hait
e2c200a91e Make gl entry for rounded-off amount 2015-05-29 10:39:09 +05:30
Rushabh Mehta
d51cf79fe2 [enhancement] list backups for download 2015-05-26 15:19:27 +05:30
Rushabh Mehta
306c49f8a0 [enhancement] list backups for download 2015-05-26 15:14:58 +05:30
Nabin Hait
b8ad56f819 Merge pull request #3336 from rmehta/ask-password-before-delete 
[minor] re-verify password before deleting company transactions
 2015-05-26 12:20:55 +05:30
Rushabh Mehta
f29a618b69 [email] [website] footer cleanup 2015-05-26 12:15:39 +05:30
Nabin Hait
63e431a219 minor fixes 2015-05-25 16:15:39 +05:30
Nabin Hait
e2787cf2ec [fix] unique employee id validation for sales person 2015-05-25 15:27:40 +05:30
Nabin Hait
8d76d14614 reset item's default accounts, warehouses on deletion of company 2015-05-25 14:13:03 +05:30
Nabin Hait
adc830b712 [fix] rename company abbr 2015-05-25 14:13:03 +05:30
Rushabh Mehta
ed618f284b [minor] re-verify password before deleting company transactions 2015-05-25 12:20:44 +05:30
Rushabh Mehta
c4d38e2183 [minor] setup wizard language fix and no submit messages for gl/sl entry 2015-05-25 11:29:37 +05:30
Nabin Hait
e372fb11ea naming series fix 2015-05-21 14:27:20 +05:30
Rushabh Mehta
9624bac3cf [fix] create SMS Log 2015-05-20 15:48:58 +05:30
Rushabh Mehta
5495bc54a5 [enhancement] default terms in company, fixes #3231 2015-05-19 13:03:01 +05:30
Rushabh Mehta
df2491f6cf [fix] default website fixes #3273 2015-05-19 10:47:10 +05:30