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

4639 Commits

Author SHA1 Message Date
Neil Trini Lasrado
4e6e4726a4 filters added, ui change, update project moved to project.py 2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
ec5c66f8f0 Title Feild added to Expense Claim 2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
05f15bbb88 fixes in Test Cases 2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
9789d06b3e task and project- billing amount and actual amount added 2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
650e679a5e Fixes in Project 2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
78b96ca769 Fixes in time_log 2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
c33ad6b36a fixes in Activity Cost 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
2679b247b3 fixes in Expense Claim 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
7f9ea3bf6a expense claim test records 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
33d58ac431 Test Cases 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
709c43674b feild rename - internal rate/cost into costing rate/amount 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
aabf150423 task made mandatory in project 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
a11770f06f in Time Log - Server side validations added to recalculate cost on save 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
50234cb0fe Task added to expense claim 
all cost (expense claim and time log) against Task; task updates project cost.
 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
8026137998 employee name added to activity cost 
title changed for activity type
time log -fetch logic added for billing and internal rate
validations and calculation logic added
 2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
458b8885f0 New Document Activity Cost created. 
In TL - billing rate and internal rate added
In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims.
In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount.
 2015-04-22 11:25:57 +05:30
Neil Trini Lasrado
d93750a868 Manufacturing Settings - Datatype of capacity_planning_for_days and mins_between_operations changed to Int 2015-04-21 17:40:37 +05:30
Nabin Hait
b650d691a0 fixed conflict 2015-04-21 17:16:28 +05:30
Neil Trini Lasrado
261e27b9ec type of Hour rate in Production order operations and bom operations changed to currency (previouslly float). Desc to Actual Operation Cost changed 2015-04-21 16:43:43 +05:30
Nabin Hait
e68e86f109 execute on_doctype_update 2015-04-21 15:26:42 +05:30
Rushabh Mehta
50918a8fcf [pos] fixes #3138, #3140 2015-04-21 14:38:48 +05:30
Rushabh Mehta
4665f7eb70 [enhancement] added description, batch_no in packing slip 2015-04-21 11:20:24 +05:30
Rushabh Mehta
80381475c4 [ux] re-arranged columns in bank reconciliation, fixes #3114 2015-04-21 11:08:53 +05:30
Rushabh Mehta
dfa93305ab [minor] fixes #3127 2015-04-21 10:36:39 +05:30
Rushabh Mehta
7f9c4d8677 [fix] item grid fix, via #3136 2015-04-21 10:19:53 +05:30
Nabin Hait
5c7f0bcb32 Party filter and columns in general ledger report 2015-04-20 17:13:53 +05:30
Rushabh Mehta
e9bd77d674 [minor] fixes in welcome mails 2015-04-20 13:00:56 +05:30
Nabin Hait
44aaa56000 get standard chart of account if country code not found 2015-04-20 11:51:54 +05:30
Pratik Vyas
dbb3b49625 bumped to version 4.25.1 2015-04-20 11:14:21 +06:00
Pratik Vyas
b78ab03b2b Merge 'upstream/master' into v4.x.x (account receivable hotfix) 2015-04-20 10:41:31 +05:30
Rushabh Mehta
80f8b7be2f [minor] [perms] Expense Claim Type 2015-04-19 16:18:15 +05:30
Rushabh Mehta
d7330ec709 [minor] add disabled property in fiscal year: 2015-04-18 17:04:04 +05:30
Rushabh Mehta
92b253dceb Update accounts_receivable.py 2015-04-18 12:13:57 +05:30
Nabin Hait
1b26c6f02a Merge pull request #3125 from nabinhait/v4.x.x 
hotfix in patch
 2015-04-17 16:16:35 +05:30
Nabin Hait
0287b1f75c hotfix in patch 2015-04-17 16:15:25 +05:30
Pratik Vyas
e7eb92ce70 bumped to version 4.25.0 2015-04-17 16:32:11 +06:00
Nabin Hait
4743cbe002 issue fixed in accounts receivable report 2015-04-17 15:55:19 +05:30
Nabin Hait
ddaedefb32 minor fix for fieldname 2015-04-17 15:01:41 +05:30
Rushabh Mehta
9e6812cfab Merge pull request #3108 from BhupeshGupta/fix_bank_reports 
Add/Fix Bank Reports Filters
 2015-04-17 14:17:22 +05:30
Nabin Hait
2ba88c4a5f patch: delete gle for cancelled invoices 2015-04-17 12:05:00 +05:30
Rushabh Mehta
b092339c3a [minor] ignore list for dropbox 2015-04-17 12:01:40 +05:30
Rushabh Mehta
0939a5ac4c feature to delete company 2015-04-17 11:52:45 +05:30
Anand Doshi
63ea99e929 [hotfix] item group set_parent_website_route 2015-04-16 20:45:54 -04:00
Nabin Hait
1a6299176a delete gl entries on cancellation of sales invoice, if grand total is zero 2015-04-16 19:22:42 +05:30
Nabin Hait
2029ea9abf toggle editable price list rate 2015-04-16 17:55:35 +05:30
Nabin Hait
2182cd5487 Update journal_entry.js 2015-04-16 16:00:37 +05:30
Rushabh Mehta
acf489c5ef [hot] [fix] journal entry 2015-04-16 15:35:49 +05:30
Rushabh Mehta
d839a730cf [hot] [fix] journal entry 2015-04-16 15:27:46 +05:30
Rushabh Mehta
5674c4f28c [splash] new image 2015-04-16 15:09:42 +05:30
Rushabh Mehta
d64e928b50 [favicon] darker 2015-04-16 14:04:51 +05:30
Nabin Hait
c3daa91c8a Reset no-copy fields for recurring docs and patch to fix 2015-04-16 13:13:18 +05:30
Rushabh Mehta
2e7c36ec99 [favicon] light grey for erpnext 2015-04-16 12:41:42 +05:30
Rushabh Mehta
600aa622b1 [fix] [minor] journal entry, via error report 2015-04-16 11:43:26 +05:30
Rushabh Mehta
12ade3573b [minor] fix default permissions for purchase taxes and charges master 2015-04-16 11:43:25 +05:30
bhupeshg2
3f59615555 switch to tabs 2015-04-15 22:29:45 +05:30
Rushabh Mehta
2887913797 [fix] opportunity -> quotation 2015-04-15 15:40:05 +05:30
Rushabh Mehta
2dea40f7be [leave-allocation] can cancel and re-submit or make a new one, fixes frappe/erpnext#3042 2015-04-15 15:08:48 +05:30
Pratik Vyas
850ee3c53d Fix make_email_account patch 2015-04-15 14:36:32 +05:30
Rushabh Mehta
53bc304be2 Merge pull request #3037 from neilLasrado/production-planning 
Production planning
 2015-04-15 12:06:44 +05:30
Rushabh Mehta
e027d3f34f [fix] a better solution for #2776 2015-04-15 12:03:21 +05:30
bhupeshg2
e2e973f7be Add reqd to bank clearance aummary report 
Add filters if filters are in list form to get_account_list [erpnext.controllers.queries.get_account_list] query
 2015-04-14 23:09:32 +05:30
Anand Doshi
68dfc934bf [hotfix] [report] Received Items to be Billed 2015-04-14 11:56:42 -04:00
Rushabh Mehta
3ee1f11771 [cleanup] quality inspection fixes #3061 2015-04-14 17:53:36 +05:30
Rushabh Mehta
5e7f8fd156 [ux] bom fixes #3072 2015-04-14 14:24:21 +05:30
Rushabh Mehta
de9bd108d0 [usability] journal entry type fixes #3085 2015-04-14 14:10:19 +05:30
Rushabh Mehta
39539f14ce [patch-fix] make_email_accounts 2015-04-14 13:07:28 +05:30
Neil Trini Lasrado
18dc151fc7 Fixes in make_time_log function in Production Order 2015-04-14 13:06:07 +05:30
Neil Trini Lasrado
cf96cc26a0 Fixes for test cases 2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
1371afce2e added default date to planned start date in Prod Order & made planned end date read-only 2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
c43ac20115 Fixes in logic for production order scheduling 2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
d3d94d1efe fix- Material Transferred for Manufacturing not Updating in Production Order Error 2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
cd1816cc5a removed unnecesssary functions. Production related feilds made mandatory in TIme Log 2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
5ab7d930b6 make time log button in Production order operations fixed 
show time logs button made available for compleated operations
 2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
8d5d5cc0a7 Planned Start Date made mandatory in production order 
server side check added to not plan operations if planned_start_date is None
Production Order on submit - unwanted error messsages problem fixed.
 2015-04-14 13:00:54 +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
f579cf9871 [opportunity] status open 2015-04-13 16:58:47 +05:30
Rushabh Mehta
4ac3094049 [opportunity] status open 2015-04-13 16:56:03 +05:30
Rushabh Mehta
c712dc6729 [opportunity] status open 2015-04-13 16:51:27 +05:30
Rushabh Mehta
99a4d63d97 [opportunity] status open 2015-04-13 16:24:35 +05:30
Rushabh Mehta
fd0f1cb8b7 [opportunity] not submittable 2015-04-13 16:21:58 +05:30
Rushabh Mehta
20bcf6aeff [fixes] print_hide on stock uom and gross profit 2015-04-13 15:31:24 +05:30
Rushabh Mehta
39c84fe31c [hot] coa 2015-04-13 12:16:25 +05:30
Rushabh Mehta
b4c4351513 [report] fix via error report 2015-04-13 11:30:10 +05:30
Pratik Vyas
2437d4cce2 Fix #3046 Customer Acquisition and Loyalty repor 2015-04-10 12:35:43 +05:30
Pratik Vyas
7f8cc32d38 update translations 2015-04-10 10:26:08 +05:30
Anand Doshi
a0630671da [hotfix] batch query 2015-04-09 13:34:57 +05:30
Pratik Vyas
c95e4e89d5 bumped to version 4.24.4 2015-04-09 12:56:05 +06:00
Nabin Hait
4642d0697e fixed conflict 2015-04-09 11:42:24 +05:30
Anand Doshi
00a07de426 fixed test earning type 2015-04-08 21:49:11 +05:30
Anand Doshi
c994647704 fixed test cases 2015-04-08 21:22:36 +05:30
Anand Doshi
2f87fb41fa Merge pull request #3069 from neilLasrado/dob 
validation added - dob cannot accept a future date
 2015-04-08 13:25:01 +05:30
Anand Doshi
a1a3468704 Merge pull request #3068 from neilLasrado/leaves 
Bug Fixes
 2015-04-08 13:20:18 +05:30
Neil Trini Lasrado
4b29ccc2b0 Salary Structure - Earnings made mandatory 2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
4ba4d9dbef fix - update button didnt work in leave allocation after submit 2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
20f0ef2515 validation added - dob cannot accept a future date 2015-04-08 12:29:01 +05:30
Neil Trini Lasrado
28b0cc4d0b fixes in offer letter 2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
496e277d8a print format added 2015-04-08 12:28:21 +05:30
Rushabh Mehta
aca5cb6513 [fixes] offer letter 2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
8ca547b7f2 terms view added 2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
e1d620b168 Offer Letter - New Doctype added and job_applicant naming changed 2015-04-08 12:28:20 +05:30
Nabin Hait
0277ae298a pending amount to be delivered in report 2015-04-07 17:49:53 +05:30
Pratik Vyas
d102cba71c [patch] [fix] Fix missing image column error 2015-04-07 15:32:15 +05:30
Anand Doshi
e4e112a6bc setup wizard - don't send welcome mail 2015-04-07 11:03:58 +05:30
Nabin Hait
6eb55d4d3d allowed import for delivery note 2015-04-07 09:42:44 +05:30
Anand Doshi
03cf407574 [fix] removed print 2015-04-06 19:38:13 +05:30
Anand Doshi
c399709789 fixes to test cases 2015-04-06 19:29:16 +05:30
Anand Doshi
0dc79f4de0 Merge remote-tracking branch 'frappe/v4.x.x' into develop 
Conflicts:
	.travis.yml
	erpnext/__version__.py
	erpnext/controllers/queries.py
	erpnext/hooks.py
	erpnext/selling/sales_common.js
	erpnext/stock/doctype/bin/bin.py
	erpnext/stock/doctype/stock_entry/stock_entry.js
	erpnext/stock/doctype/stock_entry/stock_entry.py
	erpnext/stock/stock_ledger.py
	setup.py
 2015-04-06 13:21:07 +05:30
Anand Doshi
731b15edf4 [hotfix] taxes and totals 2015-04-05 20:09:09 +05:30
Anand Doshi
22af7deadd minor fixes 2015-04-05 17:18:07 +05:30
Anand Doshi
7854779c22 [hotfix] strip email when importing newsletter list 2015-04-05 13:44:52 +05:30
Anand Doshi
e4580447d0 [fix] on setup wizard language selection and load, set it as system default language 2015-04-04 16:15:04 +05:30
Anand Doshi
85e5d46370 [fix] opportunity email pulling 2015-04-03 15:03:01 +05:30
Anand Doshi
c13c4f014e [fix] editable amount in Purchase Taxes and Charges 2015-04-03 14:55:51 +05:30
Anand Doshi
432c12ad93 [fix] email account patch fix and minor setup wizard fix 2015-04-03 14:30:15 +05:30
Rushabh Mehta
8bd54f27c5 Merge pull request #3051 from rmehta/opportunity 
Opportunity
 2015-04-03 11:01:59 +05:30
Rushabh Mehta
f63a3d4a80 [fiscal year] automatically set year end date if more than one year 2015-04-03 10:59:48 +05:30
Anand Doshi
9d3adc3abf Merge pull request #3048 from anandpdoshi/anand-april-2-v5 
Party Model Patch
 2015-04-03 08:22:59 +05:30
Rushabh Mehta
bb2041d22c [patch] fix 2015-04-02 22:11:16 +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
05e39992d0 [setup-wizard] don't catch duplicate 2015-04-02 18:55:36 +05:30
Anand Doshi
5445c460b7 [fix] [patch] party model patch 2015-04-02 17:42:27 +05:30
Rushabh Mehta
750ceedbc1 [production order] explict idx + test fix 2015-04-02 16:03:11 +05:30
Rushabh Mehta
99a41952a4 [lead] [email] fixes 2015-04-02 15:53:11 +05:30
Anand Doshi
54448aabd6 Setup wizard fixes 2015-04-02 15:39:44 +05:30
Rushabh Mehta
ffc190d34d Merge pull request #3013 from neilLasrado/expense 
Expense Claim - 'Total Amount Reimbursed' feild added
 2015-04-02 14:29:29 +05:30
Anand Doshi
83f87da3d1 Show Write-Off for all Sales Invoices if there is a Grand Total 2015-04-02 13:43:51 +05:30
Rushabh Mehta
d7a5b7309b [minor] fix 2015-04-01 23:38:37 +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
Anand Doshi
7b6daafbb9 [minor] left aligned email footer, raise duplicate entry error for common email id in Employee and Sales Person 2015-04-01 16:26:59 +05:30
Anand Doshi
8ea1ed143b Show write-off section if pos or advance payment 2015-04-01 16:25:55 +05:30
Rushabh Mehta
4c8d01ba9e [issue] close, reopen buttons 2015-04-01 15:43:14 +05:30
Rushabh Mehta
918ddf2537 [task] open, close from list: 2015-04-01 15:43:14 +05:30
Anand Doshi
ee57a8d2a4 [hotfix] unique job applicant 2015-04-01 12:29:30 +05:30
Anand Doshi
dd77287cb9 [fix] fiscal year auto-create 2015-04-01 08:26:32 +05:30
Anand Doshi
5745cf7600 fixed rename field patches 2015-03-31 17:31:53 +05:30
Anand Doshi
92af795f12 Fixed note permission query 2015-03-31 14:42:22 +05:30
Rushabh Mehta
aefc01372f [listview] issue: open, close | so, po: stop, unstop 2015-03-31 13:39:42 +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
Pratik Vyas
4ec1a9e8f6 Move frappe field renames to frappe 2015-03-30 19:37:02 +05:30
Sambhaji Kolate
a4fa96cc79 some fix in batch related cleanup 2015-03-30 16:04:55 +05:30
Anand Doshi
6208c49859 Added Company field in various Query Reports 2015-03-30 15:21:20 +05:30
Pratik Vyas
10224c9d86 bumped to version 4.24.3 2015-03-30 13:11:48 +06:00
Anand Doshi
adcf857c37 fixed newsletter unsubscribe and default footer 2015-03-27 17:42:18 +05:30
Nabin Hait
54c865e77c Landed cost voucher: fixes for serialized item 2015-03-27 15:39:06 +05:30