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

641 Commits

Author SHA1 Message Date
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Rushabh Mehta
3384cb7e63 [fix] #2836 2015-03-02 16:20:23 +05:30
Rushabh Mehta
905f8328ab cleanup global defaults, fix #2838: 2015-03-02 13:01:39 +05:30
Nabin Hait
8be6939288 help description for party account 2015-02-26 12:31:07 +05:30
Rushabh Mehta
66a92792b4 [fix] default account for manufacturing stock entry should be cogs 2015-02-25 17:15:45 +05:30
Anand Doshi
d75ef108fc Allow user to change page_name in Item and Item Group #2397 2015-02-25 13:50:14 +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
Nabin Hait
2b019ed430 Fixes for discount amount 2015-02-24 10:02:27 +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
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
Nabin Hait
7c28fc4014 Merge branch 'v5.0' of https://github.com/frappe/erpnext into v5.0 2015-02-18 12:24:49 +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
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
Rushabh Mehta
36b84408a8 [fixes] precision in purchase receipt and item group route 2015-02-16 18:26:38 +05:30
Anand Doshi
c82331bc19 [design] Setup Wizard 2015-02-12 20:02:17 +05:30
Nabin Hait
5690be103c Replaced renamed total fields in code files 2015-02-12 16:09:11 +05:30
Nabin Hait
108e935744 minor fix in authorization rule 2015-02-11 12:24:45 +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
Anand Doshi
e241569303 Allow non-english characters in Naming Series 2015-02-06 12:56:26 +05:30
Rushabh Mehta
a232c80d77 [share] add share permission 2015-02-05 15:52:58 +05:30
Rushabh Mehta
06fa46fafe [fix] onshow > on_page_show 2015-01-29 18:09:11 +05:30
Nabin Hait
ecce5141eb replaced budget distribution 2015-01-23 16:32:35 +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
0335005eea [minor] added allow rename 2015-01-15 15:29:22 +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
Rushabh Mehta
e1cb0ae738 [design] list views 2015-01-05 17:39:05 +05:30
Anand Doshi
9b955feff8 [design] POS - item grid and taxes 2015-01-05 16:19:12 +05:30
Rushabh Mehta
4c36d7388c [ux] fixed creation via tree views for Item Group etc 2015-01-01 15:59:34 +05:30
Rushabh Mehta
419ae33c3e [merge] v5-design 2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651 fixed conflict while merging develop into v5 2014-12-31 13:24:36 +05:30
Rushabh Mehta
afbfdcf552 [ui] minor fixes 2014-12-30 18:11:32 +05:30
Nabin Hait
dd38a266b8 Removed tname and fname from code 2014-12-26 13:15:21 +05:30
Rushabh Mehta
f870527e7c [design] wip 2014-12-26 12:52:11 +05:30
Nabin Hait
79f091e2fe field renaming 2014-12-26 11:41:15 +05:30
Nabin Hait
e7d153624f Table Field Renaming: code replace, JV and budget distribution renamed 2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71 Table fieldnames renaming: updated json and patch 2014-12-24 17:04:48 +05:30
Neil Trini Lasrado
31a92bd9d9 company wise letter head feature added 2014-12-23 17:52:41 +05:30
Neil Trini Lasrado
e84fa67f30 Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above 
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
 2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
637d804abd Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log 2014-12-23 17:38:59 +05:30
Anand Doshi
ca2c297f72 [fix] In Setup Wizard, load languages from languages.txt 2014-12-18 17:31:21 +05:30
Nabin Hait
1b5afe737f Fixes in authorization rule based on average discount 2014-11-28 16:59:32 +05:30
Rushabh Mehta
6d950d23a8 [merge] 2014-11-28 12:08:51 +05:30
Rushabh Mehta
bd9b62ff28 [rename] Support Ticket -> Issue 2014-11-28 11:46:10 +05:30
Nabin Hait
249bbbc56f fixes during testing version 5 2014-11-26 15:35:39 +05:30
Nabin Hait
1897360e4b Set default language as English in setup wizard 2014-11-24 15:25:13 +05:30
Rushabh Mehta
7d36875d6f [refactor] address and contact list in customer, supplier, lead, sales person 2014-11-24 14:16:47 +05:30
Nabin Hait
707322adb9 Fixes for standard chart of accounts 2014-11-14 18:13:33 +05:30
Nabin Hait
4cd60d7d61 Included standard charts in json format 2014-11-12 14:29:44 +05:30
Nabin Hait
98050e7646 default receivable / payable accounts in company 2014-11-03 15:46:15 +05:30
Nabin Hait
f09667884b Root type indentified for multiple country's chart 2014-11-03 15:46:15 +05:30
Rushabh Mehta
98ae5bd9db [form] show website link for website generator 2014-10-31 14:28:47 +05:30
Nabin Hait
0822dcbde6 get query for bank/cash account 2014-10-30 15:54:40 +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
36cf4a4708 Test case fixes 2014-10-06 13:15:02 +05:30
Nabin Hait
e2095c0dd7 Created new doctype Party Account to maintain default party account, it is a child table for Customer, Supplier, Customer Group, Supplier type 
Default Receivable / Payable Account in company
Filter results in all receivable/payable link fields
 2014-10-06 13:12:05 +05:30
Nabin Hait
cc582bd774 posted party in gl entry and multiple other fixes 2014-10-06 13:06:11 +05:30
Nabin Hait
3a40435f8c Credit days and credit limit option in customer group / supplier type #1354 2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f Credit Limit and credit days fixes #2031 2014-10-06 13:05:28 +05:30
Nabin Hait
9ddc002d6a country wise chart of accounts restructured 2014-10-06 13:01:58 +05:30
Nabin Hait
c68646c694 [merge] 4.x to 5.0 2014-10-06 12:57:48 +05:30
Nabin Hait
18ccc27b1b Minor fix in naming naming series 2014-09-26 14:23:00 +05:30
Nabin Hait
778ff463af Minor fix in authorization control 2014-09-19 11:39:47 +05:30
Nabin Hait
bbc3d015a3 Update authorization_control.py 2014-09-18 14:09:20 +05:30
Nabin Hait
4073880ecf Escaped single quote in authorization control queries 2014-09-18 11:01:26 +05:30
Anand Doshi
a23151b138 Merge pull request #2202 from 81552433qqcom/develop 
hotfix for project wise report and translation.
 2014-09-16 15:23:34 +05:30
Rushabh Mehta
bf8715dba4 [refactor] used frappe.sendmail 2014-09-16 15:12:18 +05:30
Rushabh Mehta
5cdc8e560c [mailbox] removed separate email settings for jobs, sales, support 2014-09-16 15:12:18 +05:30
Rushabh Mehta
7fb79f6062 #2092 2014-09-16 15:12:18 +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
81552433qqcom
1db294e837 hotfix for project wise report 
translation patch for email digest and support ticket.
 2014-09-16 16:49:58 +08:00
Anand Doshi
30c5b41398 [minor] removed Suggest 2014-09-15 16:43:34 +05:30
Anand Doshi
fc33d5a75b Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810 2014-09-09 15:25:43 +05:30
Anand Doshi
dc79334f1c [fix] Clear website cache for Item Group on saving Item 2014-09-09 12:35:15 +05:30
Nabin Hait
c017ed251d Merge pull request #2151 from ankitjavalkarwork/fix1999 
Allow renaming for Sales Partner Doctype
 2014-09-08 14:23:17 +05:30
Anand Doshi
65a5f85af5 Setup Wizard: set corrected number format in system settings 2014-09-05 17:27:25 +05:30
ankitjavalkarwork
ce9a9eeecc Allow renaming for Sales Partner Doctype 2014-09-05 14:58:21 +05:30
Anand Doshi
f680626f53 [minor] send translations in response 2014-08-29 11:19:10 +05:30
Neil Trini Lasrado
9d1e8b61fe [Fix] Issue #980 final 2014-08-25 19:04:30 +05:30
Neil Trini Lasrado
d676491b6e Merge https://github.com/frappe/erpnext into item_group 2014-08-25 16:18:31 +05:30
Rushabh Mehta
52f04da5f5 [style] default website 2014-08-25 15:17:20 +05:30
Neil Trini Lasrado
caba531e89 [fix] issue#980 2014-08-25 13:22:15 +05:30
Rushabh Mehta
e8dd4160d4 [cleanup] remove allow_attach 2014-08-25 13:04:21 +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