Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,807 Commits 3 Branches 0 Tags 1 GiB
a88eaa6e20
Commit Graph

253 Commits

Author SHA1 Message Date
Rushabh Mehta
78b7a53635 [cleanup] set default bold, print_hide for prints 2016-04-06 15:29:45 +05:30
Rushabh Mehta
d690094b12 [image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM 2016-04-04 16:57:56 +05:30
Nabin Hait
33f42aaad1 [fix] Get email field if field type is Code, Text, Small Text or Data 2016-03-31 11:59:10 +05:30
Rushabh Mehta
72b4ad8155 [cleanup] for quick-entry 2016-03-30 15:42:22 +05:30
Valmik Jangla
865d547965 Removed from GL Entry, Opportunity and Quotation 2016-03-11 13:05:20 +05:30
Valmik Jangla
634ecae020 Removed from Lead 2016-03-11 13:05:19 +05:30
Rushabh Mehta
aac4dcedc8 [fix] print language and contact_email fields and removed translations 2016-03-02 15:45:09 +05:30
makeen
4741182b25 [fix] add subscribers even though some emails are invalid 2016-02-15 10:58:12 +01:00
Rushabh Mehta
10663ab37f Merge pull request #4762 from nabinhait/multifixes3 
Advance adjustment in invoice cannot be greater than grand total
 2016-02-08 18:53:27 +05:30
Anand Doshi
17d4fc4fa7 [enhancement] Merge Comment and Feed into Communication 💥 
Depends on frappe/frappe#1532
 2016-02-08 13:06:56 +05:30
Nabin Hait
289ffb788c [fix] Advance adjustment in invoice cannot be greater than grand total 2016-02-08 11:07:00 +05:30
Rushabh Mehta
7bb2f3a27b [fix] newsletter priority 2016-02-03 16:20:59 +05:30
Anand Doshi
01de945388 [cleanup] Removed 'Is Service Item' checkbox and filters 
'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.
 2016-01-26 16:22:51 +05:30
Nabin Hait
9824e22ce1 [fix] Price list rate applied via set_missing_values 2016-01-19 16:48:32 +05:30
Rushabh Mehta
b46069d44b [cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order 2016-01-15 16:59:26 +05:30
Saurabh
e23e99f4bd [enhance] merge customize buttons under groups 2016-01-13 09:18:31 +05:30
Rushabh Mehta
5760b79747 [translations] fixes #4533 2016-01-04 15:57:01 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Rushabh Mehta
d6c5235d58 [minor] [translation] fix #4343 2015-11-30 11:33:01 +05:30
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Nabin Hait
915778fb69 [fix] Clear addressed and contacts on a new form 2015-10-30 14:43:13 +05:30
Anand Doshi
1d093a4039 [fix] change attach fields to small text 2015-10-19 12:56:29 +05:30
Rushabh Mehta
ee6862b277 [fix] VARCHAR lengths as 140 2015-10-14 17:28:35 +05:30
Anand Doshi
71ebad5668 Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error 2015-10-14 16:13:49 +05:30
Nabin Hait
f924e08b93 [fix] Validate duplicate email ids in Lead 2015-10-01 11:51:48 +05:30
Anand Doshi
b20baf894f [fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account 2015-09-30 15:11:12 +05:30
Rushabh Mehta
4bcbcd29f7 [enhancement] lower priority for newsletter emails 2015-09-29 14:58:45 +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
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
Nabin Hait
2377cdfa4e Fixed conflict 2015-09-09 18:45:41 +05:30
Anand Doshi
bc1e8b4408 [minor] Unset Apply User Permissions in default permissions 2015-09-08 19:23:23 +05:30
Nabin Hait
216aaaf1d6 Set currency and exchange rate based on Customer's currency while making Quotation from Opportunity 2015-09-04 16:41:04 +05:30
Rushabh Mehta
c2283ca304 [hot] [fix] remove test options in Opportunity 2015-09-02 18:56:35 +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
Rushabh Mehta
f7800c053b [layout cleanup] in Quotation, Sales Order, Delivery Note 2015-08-26 18:53:37 +05:30
Rushabh Mehta
678a4e24ff [cleanup] Opportunity 2015-08-26 12:27:25 +05:30
Rushabh Mehta
b8a6f40370 [cleanup] layouts of item, customer, supplier, lead 2015-08-26 10:51:45 +05:30
Rushabh Mehta
81e9d4e8f5 [fix] changed text > text editor for description fields in tables 2015-08-19 13:00:03 +05:30
Anand Doshi
82988be79f Merge pull request #3846 from rmehta/add-to-learn 
Learn module
 2015-08-18 12:10:03 +05:30
Rushabh Mehta
6c83b6bddc Merge pull request #3811 from rmehta/opportunity-customer 
[minor] add close button in opportunity and project links in customer
 2015-08-10 11:57:23 +05:30
Rushabh Mehta
5f7166de83 [minor] remove section break in opportunity 2015-08-10 11:30:47 +05:30
Rushabh Mehta
48cccca9af [minor] add close button in opportunity and project links in customer 2015-08-06 15:37:01 +05:30
Anand Doshi
ed3a6cf748 [minor] removed print 2015-08-05 18:38:33 +05:30
Nabin Hait
c3e1f6bb96 [fix] newsletter list unique check 2015-08-03 19:09:05 +05:30
Rushabh Mehta
1e8025b327 [cleanup] yes/no selects changed to checks in Item 2015-07-29 11:38:33 +05:30
Anand Doshi
f447c8258a [minor] Newsletter Message should be mandatory 2015-07-20 16:10:04 +05:30
Rushabh Mehta
ea4d63cef3 [cleanup] removed welcome emails 2015-07-16 14:17:59 +05:30
Rushabh Mehta
ccb9117ba5 [minor] Added employees in Newsletter List 2015-07-09 13:56:02 +05:30
Nabin Hait
3b3c48c877 [fix] Set Customer name in opportunity as per company name in lead 2015-07-08 13:10:59 +05:30
Rushabh Mehta
85e6f5d04e [fix] [minor] fix customer_name, supplier_name labels 2015-07-03 12:59:08 +05:30
Neil Trini Lasrado
b9e5cd0df4 Fixed lead status not updating on Creation of oppurtunity issue 2015-06-29 17:01:32 +05:30
Nabin Hait
c87595b2da show item description in item grid view if marked for 'In List View' 2015-06-03 11:24:37 +05:30
Rushabh Mehta
4a4a6594d1 [minor] [refactor] 2015-05-29 15:56:40 +05:30
Rushabh Mehta
f29a618b69 [email] [website] footer cleanup 2015-05-26 12:15:39 +05:30
Nabin Hait
fd4bcd855b test case fixes 2015-05-22 16:55:55 +05:30
Nabin Hait
fcda5b636c patch fix 2015-05-19 11:12:06 +05:30
Rushabh Mehta
0eb2dae5d1 [fix] opportuniy fixes #3262 2015-05-15 13:51:35 +05:30
Nabin Hait
90fc19ed9a Item image in print view 2015-05-14 12:32:26 +05:30
Rushabh Mehta
4f1a7e5aa8 [fix] newsletter list duplicate 2015-05-12 11:32:25 +05:30
Pratik Vyas
2fb0654f97 Show bulk limit error before sending 2015-05-11 14:29:52 +05:30
Rushabh Mehta
82ee5fdba6 [email] changes in email_account api 2015-05-04 18:17:22 +05:30
Rushabh Mehta
ec3ad7d865 [enhancement] close opportunities from list view 2015-04-30 17:17:50 +05:30
Rushabh Mehta
e9bd77d674 [minor] fixes in welcome mails 2015-04-20 13:00:56 +05:30
Rushabh Mehta
2887913797 [fix] opportunity -> quotation 2015-04-15 15:40:05 +05:30
Rushabh Mehta
2c78796716 [fix] opportunity / make quotation 2015-04-14 11:24:42 +05:30
Rushabh Mehta
adfc34ba00 [opportunity] status open 2015-04-13 22:23:50 +05:30
Rushabh Mehta
4ac3094049 [opportunity] status open 2015-04-13 16:56:03 +05:30
Rushabh Mehta
fd0f1cb8b7 [opportunity] not submittable 2015-04-13 16:21:58 +05:30
Anand Doshi
7854779c22 [hotfix] strip email when importing newsletter list 2015-04-05 13:44:52 +05:30
Anand Doshi
85e5d46370 [fix] opportunity email pulling 2015-04-03 15:03:01 +05:30
Rushabh Mehta
7c32770a69 move opportunity item to CRM 2015-04-02 22:06:36 +05:30
Rushabh Mehta
3c626faf8f [incoming sales email] to opportunity 2015-04-02 22:02:33 +05:30
Rushabh Mehta
4c46687fb1 [incoming sales email] to opportunity 2015-04-02 22:00:34 +05:30
Rushabh Mehta
99a41952a4 [lead] [email] fixes 2015-04-02 15:53:11 +05:30
Anand Doshi
fc79492bac Lead Status in List, minor fix in Make Email Accounts patch 2015-03-30 22:35:51 +05:30
Anand Doshi
d6a360b51b [fix] check job application unique email id 2015-03-30 21:11:34 +05:30
Anand Doshi
adcf857c37 fixed newsletter unsubscribe and default footer 2015-03-27 17:42:18 +05:30
Rushabh Mehta
fea22de3e8 [minor] material request and newsletter list 2015-03-23 15:44:54 +05:30
Rushabh Mehta
c2eae25d0e [cleanup] validate_email_add 2015-03-23 14:10:51 +05:30
Neil Trini Lasrado
bef6fa152e make quotation button added to lead 2015-03-23 11:01:22 +05:30
Rushabh Mehta
208a06f5f5 [test] newsletter list 2015-03-20 15:57:25 +05:30
Rushabh Mehta
acdd5189d1 [test-fix] 2015-03-20 15:52:11 +05:30
Rushabh Mehta
a7c377887b [test-fix] 2015-03-20 15:15:38 +05:30
Rushabh Mehta
8f343165ad [patch-fix] convert_stock_reco 2015-03-20 15:04:13 +05:30
Rushabh Mehta
a7e21eb484 [newsletter-list] fixes, patch fix 2015-03-20 14:38:12 +05:30
Rushabh Mehta
611b513a2d [newsletter] fixed tests 2015-03-19 17:16:03 +05:30
Rushabh Mehta
14ae4c3603 [email] many fixes, newsletter, unsubscribe 2015-03-19 17:16:03 +05:30
Anand Doshi
ec5ec60764 Fixed Test Cases 2015-03-05 19:31:40 +05:30
Rushabh Mehta
2cc585f180 [git fixes] salary manager, time log title, notificaitons 2015-03-03 16:06:54 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Anand Doshi
d35354cc06 Merge remote-tracking branch 'frappe/develop' into v5.0 
Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py
 2015-02-24 18:12:17 +05:30
Rushabh Mehta
93b2f167f8 [fixes] opportunity, task minor 2015-02-23 14:43:16 +05:30
Rushabh Mehta
65a2759432 [minor] opportunity / item 2015-02-21 17:35:50 +05:30
Rushabh Mehta
813f0eda05 [form] section labels 2015-02-20 16:02:48 +05:30
Rushabh Mehta
50dc4e90e3 [cleanup] item grid views, removed desc etc 2015-02-19 20:05:45 +05:30
Rushabh Mehta
d60acb9f26 [fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation 2015-02-19 14:53:31 +05:30
Rushabh Mehta
614e7ab757 [cleanup] SMS, and added item filter in stock balance 2015-02-18 19:51:48 +05:30
Neil Trini Lasrado
c48f06c095 Image field and view added to all selling doctypes 2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
66df3566a9 html item desc removed from item master, item image added in oppurtunity 2015-02-18 12:32:37 +05:30
Nabin Hait
6f0a3ed8d4 fixed conflict 2015-02-17 11:12:04 +05:30
Rushabh Mehta
60cfccbf77 [new-module] crm 2015-02-17 10:36:54 +05:30