Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,279 Commits 3 Branches 0 Tags 1 GiB
88b3c52533
Commit Graph

211 Commits

Author SHA1 Message Date
Rushabh Mehta
4c46687fb1 [incoming sales email] to opportunity 2015-04-02 22:00:34 +05:30
Rushabh Mehta
05e39992d0 [setup-wizard] don't catch duplicate 2015-04-02 18:55:36 +05:30
Anand Doshi
54448aabd6 Setup wizard fixes 2015-04-02 15:39:44 +05:30
Anand Doshi
bfa3a08576 fixed welcome emails 2015-04-01 23:34:16 +05:30
Anand Doshi
3aaab1a39e setup wizard fixes 2015-04-01 22:01:54 +05:30
Rushabh Mehta
99d90e1f34 [setup] send welcome emails after setup 2015-04-01 20:32:57 +05:30
Rushabh Mehta
eb928b950f [fix] journal entry 3 cols, default weekly digest 2015-03-25 17:34:20 +05:30
Nabin Hait
37eaa0cca3 Merge pull request #3003 from neilLasrado/activity-type 
time_log_for select field in TL changed to against_manufacturing (check)
 2015-03-24 18:03:25 +05:30
Rushabh Mehta
308e6ea21e [fixes] default_website and stock reco 2015-03-24 17:35:16 +05:30
Neil Trini Lasrado
bccec29415 In Time Log 
- time_log_for removed.
- against manufacturing check box introduced
- all logic depending time_log_for shifted to against_manufacturing
- activity type made non-mandatory
- fixes in operations select feild data population in Time log

In Activity Type
- Validations for activity type manufacturing removed.
- Patch for creating activity type manufacturing removed
- activity type manufacturing removed from install fixtures
 2015-03-24 16:53:54 +05:30
Anand Doshi
2b2b639492 fixes 2015-03-20 14:29:23 +05:30
Anand Doshi
3353ad42bc setup wizard bounce animation when working 2015-03-17 12:45:44 +05:30
Nabin Hait
7c9d003917 Test case cleanup and fixes 2015-03-13 08:14:46 +05:30
Anand Doshi
838ba02d34 setup wizard image fix 2015-03-10 19:15:49 +05:30
Anand Doshi
ecd2e0f386 Setup Wizard: catch duplicate entry error 2015-03-09 15:42:52 +05:30
Nabin Hait
fcda00f317 Activity spelling correction 2015-03-03 15:48:33 +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
Anand Doshi
d57e793bf3 [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:53 +05:30
Anand Doshi
f9fc04ce8e Website Listing 2015-02-23 22:34:27 +05:30
Rushabh Mehta
d54031f3b5 [tests] [projects] merged tasks and projects and added quick edit of tasks from projects 2015-02-22 22:32:39 +05:30
Rushabh Mehta
e8a37949cf [issue fixes] + added fixtures for item attribute and operation 2015-02-20 20:10:11 +05:30
Nabin Hait
e55def23af Merge pull request #2745 from neilLasrado/time-log 
activity type fixes
 2015-02-18 11:21:25 +05:30
Rushabh Mehta
df9e80c87a [refactor] stock entry, minor ux 2015-02-17 19:56:04 +05:30
Neil Trini Lasrado
744aec8def activity type fixs 2015-02-17 16:12:32 +05:30
Anand Doshi
a6c361c00e Setup Wizard: Load number format based on currency #2627, login as first user on setup complete 2015-02-17 15:56:31 +05:30
Anand Doshi
c82331bc19 [design] Setup Wizard 2015-02-12 20:02:17 +05:30
Anand Doshi
6dfd430a2f Moved flags like ignore_mandatory, ignore_validate etc to doc.flags 2015-02-10 14:41:27 +05:30
Neil Trini Lasrado
11cd4f6c30 time log activity type made mandatory, new activity type manufacturing created 2015-02-06 16:06:45 +05:30
Rushabh Mehta
06fa46fafe [fix] onshow > on_page_show 2015-01-29 18:09:11 +05:30
Rushabh Mehta
5bceebc6a1 [fix] fixes birthday reminders #2021 2015-01-23 15:22:30 +05:30
Rushabh Mehta
81e972eac4 [cleanups] 2015-01-19 17:34:54 +05:30
Rushabh Mehta
5293aa7ca0 [ui] setup wizard 2015-01-15 12:07:02 +05:30
Nabin Hait
e8500ad4e6 Multiple fixes 2015-01-10 16:05:17 +05:30
Anand Doshi
9b955feff8 [design] POS - item grid and taxes 2015-01-05 16:19:12 +05:30
Nabin Hait
54361e8651 fixed conflict while merging develop into v5 2014-12-31 13:24:36 +05:30
Nabin Hait
e7d153624f Table Field Renaming: code replace, JV and budget distribution renamed 2014-12-25 16:01:55 +05:30
Anand Doshi
ca2c297f72 [fix] In Setup Wizard, load languages from languages.txt 2014-12-18 17:31:21 +05:30
Rushabh Mehta
6d950d23a8 [merge] 2014-11-28 12:08:51 +05:30
Nabin Hait
1897360e4b Set default language as English in setup wizard 2014-11-24 15:25:13 +05:30
Nabin Hait
707322adb9 Fixes for standard chart of accounts 2014-11-14 18:13:33 +05:30
Nabin Hait
f5b94143dc Minor fixes 2014-10-22 16:14:41 +05:30
Rushabh Mehta
be1a8d82c5 [merge] develop 2014-10-21 13:14:55 +05:30
Nabin Hait
531077e504 Strip company in setup wizard 2014-10-15 13:55:37 +05:30
Nabin Hait
3d3f0bcf54 Minor fix in setup wizard 2014-10-13 11:32:41 +05:30
Nabin Hait
997a7a1d3e Test case fixes 2014-10-06 13:15:21 +05:30
Nabin Hait
9ddc002d6a country wise chart of accounts restructured 2014-10-06 13:01:58 +05:30
Rushabh Mehta
c0bb453b88 [refactor] [frappe 5.0] 2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a [refactor modules] 2014-09-16 15:08:02 +05:30
Anand Doshi
65a5f85af5 Setup Wizard: set corrected number format in system settings 2014-09-05 17:27:25 +05:30
Anand Doshi
f680626f53 [minor] send translations in response 2014-08-29 11:19:10 +05:30
Rushabh Mehta
52f04da5f5 [style] default website 2014-08-25 15:17:20 +05:30
Anand Doshi
def374370f Merge pull request #2083 from geo-poland/basic-polish-language-support 
Basic Polish language support
 2014-08-25 12:48:33 +05:30
Rushabh Mehta
cb067aa579 [route] refactor, wip 2014-08-20 11:44:30 +05:30
Tytus
35142cb206 Add Polish language to setup wizard. 2014-08-19 15:51:36 +02:00
Anand Doshi
e73ed2afae Setup Wizard: fixed attachment issue #1940 2014-07-16 11:48:51 +05:30
Rushabh Mehta
58692fe4d1 sales order status bugfix, add leading / in website_image and removed send_print_in_body_and_attachment 2014-07-07 12:29:43 +05:30
Rushabh Mehta
c22e11d483 added address template: 2014-06-05 16:01:55 +05:30
Anand Doshi
9a0f6f5bb4 Enable Scheduler in System Settings when Setup Wizard is completed 2014-06-04 17:48:57 +05:30
Anand Doshi
4985691617 Role and User Permissions 2014-06-04 17:48:54 +05:30
Anand Doshi
32063bb472 Removed designation 'Director' owing to problems with Greek translation 2014-05-27 22:40:53 +05:30
Anand Doshi
5468740042 Fixed setup wizard errors for chinese simplified 2014-05-23 09:21:55 +05:30
Anand Doshi
69e4b16817 Setup Wizard: clear cache on language change 2014-05-22 22:52:36 +05:30
Anand Doshi
d6007e7d9c Hook: setup_wizard_success 2014-05-21 15:22:15 +05:30
Nabin Hait
177fb132b9 description added in setup wizard 2014-05-21 12:39:37 +05:30
Nabin Hait
4efc5d74d4 Setup Wizard: company abbr length validation on onchange trigger 2014-05-21 11:53:59 +05:30
Anand Doshi
6664af9557 Fixed multilingual UOM issue 2014-05-17 00:07:45 +05:30
Nabin Hait
e60853930b traslation issue fixed in setup wizard and desktop 2014-05-16 19:56:43 +05:30
Anand Doshi
5ce287d611 Setup Wizard width fix for chrome 2014-05-14 13:31:11 +05:30
Anand Doshi
51ba6f816b Fixed Setup Wizard 2014-05-13 21:02:47 +05:30
Anand Doshi
8fe0208fb6 Improved Item maker in Setup Wizard. Fixes #1501 and #1601 2014-05-13 16:52:26 +05:30
Rushabh Mehta
37f54f9a35 added description to letter head in setup wizard 2014-05-12 16:45:49 +05:30
Anand Doshi
02edae8fac Added hook: setup_wizard_exception 2014-05-12 12:37:32 +05:30
Rushabh Mehta
2667a50334 clear cache before running setup wizard 2014-05-09 19:20:31 +05:30
Rushabh Mehta
24a3ec57e3 update to tests 2014-05-03 16:22:46 +05:30
Anand Doshi
f29bcaf436 Added new fixtures (Fixes #1540). Removed Employee Grade from HR. 2014-05-02 13:55:07 +05:30
Anand Doshi
78eeacb53c Fixes in Lead, Opportunity, Quotation, Setup Wizard 2014-04-23 19:15:15 +05:30
Anand Doshi
4bb87373dc Fixed default website creation 
Default website generation was creating company page twice,
which led to duplicate website route validation
 2014-04-22 19:50:08 +05:30
Rushabh Mehta
4ef1835bee website updates 2014-04-22 16:52:35 +05:30
Anand Doshi
2944f49974 Setup Wizard: on country select, change date format, save logo in Website Settings > Brand HTML 2014-04-22 16:25:58 +05:30
Anand Doshi
07339fc69e Fixes in Setup Wizard and Attachments 2014-04-22 15:30:24 +05:30
Rushabh Mehta
3f51705ba4 website cleanups 2014-04-21 22:10:43 +05:30
Rushabh Mehta
40b2b03bcb demo fixes 2014-04-21 13:43:35 +05:30
Rushabh Mehta
f63513ed38 minor fixes to website 2014-04-21 13:43:35 +05:30
Rushabh Mehta
370a024e46 cleaned up sample website and separated fixtures by country 2014-04-18 16:00:41 +05:30
Rushabh Mehta
169c1fd93b fixed translation for setup-wizard and removed purchase validation for Material Request #925 2014-04-18 10:40:17 +05:30
Rushabh Mehta
52e618d0b2 updates to Setup Wizard, set language as first input 2014-04-17 18:50:33 +05:30
Pratik Vyas
b52618c142 frappe._ to __ 2014-04-14 16:25:30 +05:30
Anand Doshi
13ae548ff6 Fixes for model-cleanup frappe/frappe#478 2014-04-10 18:43:07 +05:30
Rushabh Mehta
49f49ea603 started party frappe/erpnext#1503 2014-04-07 15:09:09 +05:30
Rushabh Mehta
a504f0638b frappe/frappe#478, fixed list passed in 2014-04-04 12:16:26 +05:30
Rushabh Mehta
558a9aabfb removed control panel 2014-04-04 12:00:36 +05:30
Rushabh Mehta
f14b809ab5 frappe/frappe#478, more changes, removed bean 2014-04-03 14:30:42 +05:30
Rushabh Mehta
0a0f2495a2 frappe/frappe#478, frappe tests pass, .txt renamed to .json 2014-03-31 17:27:06 +05:30
Rushabh Mehta
b385ecf65e frappe/frappe#478 2014-03-28 16:54:45 +05:30
Anand Doshi
f78d1aee28 Replaced doc, doc.fields frappe/frappe#478 2014-03-28 13:55:00 +05:30
Anand Doshi
40534f076b Changed creation, modified format frappe/frappe#478 2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608 frappe/frappe#478 2014-03-27 17:54:18 +05:30
Rushabh Mehta
d2b34dc30c frappe/frappe#478 2014-03-27 16:12:56 +05:30
Nabin Hait
0c21e2afef Is_pl_account and debit_or_credit field removed and added report_type field in account 2014-03-21 11:35:59 +05:30