8634 Commits

Author	SHA1	Message	Date
Rohit Waghchaure	e94d18b4cd	Rename Time Sheet doctype	2016-07-06 20:38:50 +05:30
Nabin Hait	70a1ddb6a1	Merge pull request #5671 from nabinhait/fixes90 ... Multiple fixes	2016-07-06 16:53:31 +05:30
Rohit Waghchaure	53bea82514	[Fixes] POS amount calculation issue	2016-07-06 16:15:10 +05:30
Nabin Hait	4671038211	Item Name added in Stock Reconciliation	2016-07-06 16:05:15 +05:30
Saurabh	c03a3bf580	[minor][fix] fix base_grand_total	2016-07-05 15:58:14 +05:30
Saurabh	066ae8e4c4	[fix] make cheque print compatible with payment entry	2016-07-05 12:46:38 +05:30
Nabin Hait	f6a0d789d0	Payment entry fixes	2016-07-04 17:26:02 +05:30
Nabin Hait	e4bbb696ab	Payment Entry minor improvements	2016-07-04 17:26:02 +05:30
Nabin Hait	ff2f3ef1b1	Test Case Fixes	2016-07-04 11:42:25 +05:30
Nabin Hait	e196190d10	minor fix	2016-07-04 11:42:25 +05:30
Nabin Hait	56548cbfa2	Payment against negative invoice, negative outstanding allocation and much more	2016-07-04 11:42:25 +05:30
Nabin Hait	9db1b223da	Payment Entry: Test cases and default remarks	2016-07-04 11:42:24 +05:30
Nabin Hait	13093b4b68	Make payment entry aginst order, payment request and patch to rename advance table fields	2016-07-04 11:42:24 +05:30
Nabin Hait	05aefbbf5d	Payment Entry from invoice	2016-07-04 11:42:24 +05:30
Nabin Hait	221fa98b51	Payment Entry: Payment period based on invoice date	2016-07-04 11:42:24 +05:30
Nabin Hait	16d6959d01	Payment Entry included in Bank Reconciliation and related reports	2016-07-04 11:42:24 +05:30
Nabin Hait	1991c7b17d	Payment Reconciliation changes for Payment Entry	2016-07-04 11:42:24 +05:30
Nabin Hait	28a0528ae4	Advance Payment Entry adjustment against Invoice	2016-07-04 11:42:04 +05:30
Nabin Hait	e3a10170f7	Payment Entry submission and more	2016-07-04 11:41:24 +05:30
Nabin Hait	12e2a51519	[new][feature] Payment Entry	2016-07-04 11:41:24 +05:30
Rushabh Mehta	2be94f7675	Merge pull request #5615 from rohitwaghchaure/v7_rfq_fixes ... [RFQ Enhancement] Added button on supplier row to download PDF for particular supplier	2016-07-04 10:58:33 +05:30
Rohit Waghchaure	ad884b9fa9	[Fixes] Time sheet dependency removed from sales invoice and patch fixes	2016-07-02 22:28:29 +05:30
Rohit Waghchaure	fc1fa9a774	[RFQ Enhancement] Added button on supplier row to download PDF for particular supplier	2016-07-01 14:53:11 +05:30
Saurabh	621247807a	[fix] BOM tree as default view	2016-06-30 15:05:06 +05:30
Rushabh Mehta	a11839307f	Merge pull request #5553 from saurabh6790/pos_fixes ... [minor][fix] throw if payment modes are not set	2016-06-29 21:56:20 +05:30
Rohit Waghchaure	3fa0b51e5e	[Fixes] Time sheet fixes and changed timesheets to time_logs	2016-06-29 19:04:16 +05:30
Rushabh Mehta	da43539c53	Merge pull request #5558 from saurabh6790/doc_flow_fix ... [minor][fix] fix filter in previous link mapper	2016-06-29 12:19:54 +05:30
Saurabh	52c2affc9c	[fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts	2016-06-28 14:41:48 +05:30
Saurabh	9a6c6663c1	[minor][fix] throw if payment modes are not set	2016-06-27 18:16:07 +05:30
Saurabh	82b8b38b3d	[fix] fix filter in previous link mapper	2016-06-27 17:51:29 +05:30
Rushabh Mehta	d362b734a2	Merge pull request #5529 from saurabh6790/module_flow ... [fix] previous document links	2016-06-27 17:23:46 +05:30
Saurabh	93d68ac0c2	[fixes] change is group to check box	2016-06-27 17:16:56 +05:30
Saurabh	99892c7ce7	[fix] provision to convert group to ledger and vice versa	2016-06-27 17:16:56 +05:30
Rohit Waghchaure	d6c986da8f	[Enhancement] Time log wages and multiple active salary structure	2016-06-27 16:46:39 +05:30
Saurabh	b6d6b8420d	[fix] add filters and child doc name in previous link mapper	2016-06-27 14:48:26 +05:30
Saurabh	2a0b111726	[fix] mark completed docuemts on document flow	2016-06-27 12:28:55 +05:30
Saurabh	8f24ecb173	[fix] set previous doc links for document flow	2016-06-27 12:28:55 +05:30
Saurabh	78333c7e07	[fixes] check group condition	2016-06-26 14:27:46 +05:30
Saurabh	7fecb50360	[enhance] rename warehouse account type to stock	2016-06-26 14:27:46 +05:30
Rushabh Mehta	723cd64249	[fix] tree view hooks and patch fix	2016-06-25 18:30:03 +05:30
Nabin Hait	7b6cdf4a63	Merge pull request #5518 from saurabh6790/warehouse_tree ... Warehouse tree	2016-06-25 13:49:15 +05:30
Saurabh	dc2fa86222	[fixes] rename ctype to doctype	2016-06-25 11:16:55 +05:30
Saurabh	3a0f96bd00	[patch] patch to move all warehouses under all warehouse group	2016-06-25 11:06:14 +05:30
Saurabh	4d02949814	[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account	2016-06-25 11:06:14 +05:30
Saurabh	ec8babe7ac	[minor][fix]	2016-06-25 11:06:14 +05:30
Saurabh	1702273968	[fix] rename account browser and sales browser to tree/doctype for view	2016-06-25 11:06:14 +05:30
Saurabh	ac53357f53	[fixes] renamed _treeview to _tree	2016-06-25 11:06:14 +05:30
Saurabh	a9ba7343c4	[fix] deprecate browser pages for accounts, cost_center, sales , bom, item group	2016-06-25 11:06:14 +05:30
Saurabh	554f6f70aa	[fixes] nested set fix for warehouse, tree for accounts and cost center	2016-06-25 11:06:13 +05:30
Saurabh	0e47bfeb16	[enhance] treeview to BOM, sales person, Cost Center and Chart of acounts	2016-06-25 11:06:13 +05:30
Saurabh	777f556b14	[fixes] set default values to cheque print and set background image only if attachment exist	2016-06-23 20:25:37 +05:30
Nabin Hait	a531ebea8a	Merge branch 'master' into develop	2016-06-21 16:44:05 +05:30
Rohit Waghchaure	c65c38d293	[POS] Minor fixes	2016-06-16 11:49:37 +05:30
Rushabh Mehta	2cb7a9f235	[ux] taxes table editable	2016-06-15 16:45:03 +05:30
Rohit Waghchaure	9fe40d557f	[POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes.	2016-06-14 01:11:09 +05:30
Rushabh Mehta	e0686b32f3	[minor] cleanups	2016-06-10 12:38:52 +05:30
Rohit Waghchaure	28c02fe51d	[Fix] POS page loading issue, if system has only one item	2016-06-10 00:48:03 +05:30
Anand Doshi	51ad436e16	[fix] sales and accounts browser name	2016-06-09 19:37:35 +05:30
Rushabh Mehta	cb29d9886c	[minor] fixes #5252	2016-06-08 17:31:11 +05:30
Rushabh Mehta	6e837599b1	[minor] added cost center to item wise sales register, fixes #5301	2016-06-08 16:35:10 +05:30
Anand Doshi	16e2442278	[cleanup] document flow	2016-06-07 18:55:23 +05:30
Saurabh	7d0e78d399	[fixes] this.frm instead of cur_frm	2016-06-07 17:19:36 +05:30
Saurabh	9df3d0fb8a	[enhance] show module flow on top of document	2016-06-07 17:19:36 +05:30
Rohit Waghchaure	690a0805f6	[Fixes] Purchase register, showing wrong value for total amount if tax has deducted.	2016-06-07 10:46:59 +05:30
Rushabh Mehta	eb1e0673e2	Merge pull request #5354 from saurabh6790/cheque_print ... Cheque print	2016-06-02 17:48:58 +05:30
Rushabh Mehta	c5c0d96064	Merge pull request #5395 from saurabh6790/payment_request_ux ... [enhance] ux fixes for payment request, added jinja for payment reque…	2016-06-02 17:48:36 +05:30
Nabin Hait	8e4ec8d84a	Merge pull request #5416 from nabinhait/tax_rule_based_on_county ... Tax Rule based on County	2016-06-01 13:09:53 +05:30
Nabin Hait	cc07148336	Merge pull request #5428 from ShashaQin/patch-21 ... Update fiscal_year.py	2016-06-01 12:58:13 +05:30
Nabin Hait	9a5cf6000e	[fix] Test cases and editable fields settings for request for quotation	2016-06-01 12:54:26 +05:30
Nabin Hait	4eaeda710d	Tax Rule based on County	2016-06-01 12:54:26 +05:30
Rushabh Mehta	aa60fd9037	[fix] new_doc to frappe.new_doc	2016-06-01 11:46:33 +05:30
ShashaQin	5dd72fe196	Update fiscal_year.py	2016-06-01 11:39:53 +08:00
Nabin Hait	919b1b9d5b	Merge pull request #5408 from neilLasrado/hotfix-2 ... Fixed error in Gross Profit report	2016-05-31 17:41:19 +05:30
Nabin Hait	7ab088ed3f	Merge pull request #5414 from nabinhait/journal_entry_ux ... Fetch party info in Journal Entry on selection of reference Invoice	2016-05-31 17:38:22 +05:30
Nabin Hait	6a110331e8	Merge pull request #5415 from nabinhait/company_permissions_fix ... Ignore permissions for account/warehouse creation from Company	2016-05-31 17:38:08 +05:30
Nabin Hait	bb502f8588	Merge pull request #5417 from nabinhait/grid_editable_fields ... [fix] Enabled editable fields in Budget	2016-05-31 17:37:36 +05:30
shreyas	2bb845e53f	[Fix] User allowed to delete the root account in Chart of Accounts	2016-05-31 17:15:28 +05:30
Rushabh Mehta	0dcb861b56	[minor]	2016-05-31 07:22:51 +05:30
Nabin Hait	37c53f0a04	[fix] Enabled editable fields in Budget	2016-05-30 18:20:31 +05:30
Nabin Hait	f169e5c04d	Ignore permissions for account/warehouse creation from Company	2016-05-30 12:15:36 +05:30
Nabin Hait	9fdd37e1ad	Fetch party info in Journal Entry on selection of reference Invoice	2016-05-30 11:49:16 +05:30
Neil Trini Lasrado	efccb8a704	Fixed error in Gross Profit report	2016-05-27 13:24:02 +05:30
Nabin Hait	0014aa9c26	[fix] Charts in report	2016-05-27 12:21:36 +05:30
Nabin Hait	591a5aba56	Added Project in GL Entry and General Ledger report	2016-05-26 17:51:20 +05:30
Nabin Hait	b46d021f2a	Charts on reports / activity page, deprecated financial analytics report	2016-05-26 15:26:01 +05:30
Nabin Hait	44c1b8e63b	Line/Bar chart in Balance Sheet / Profit and Loss statement	2016-05-26 15:26:01 +05:30
Nabin Hait	28bdff5a55	Pie chart for ageing analysis in accounts receivale/payable	2016-05-26 15:26:01 +05:30
Rohit Waghchaure	f2aa1764cc	[POS] enhancement and minor fixes	2016-05-25 15:04:46 +05:30
Saurabh	ed0816832d	[enhance] ux fixes for payment request, added jinja for payment request message	2016-05-25 11:55:30 +05:30
Rushabh Mehta	1885645d6d	[fix] [patch]	2016-05-24 16:10:21 +05:30
Saurabh	81501ddc6d	[fixes] add setting to mark cheque account pay only	2016-05-24 10:28:14 +05:30
Saurabh	2fc0ffad34	[fixes] js templating to get cheque print view	2016-05-24 10:28:14 +05:30
Saurabh	9ca9f2d551	[Fixes] UX fixes	2016-05-24 10:28:14 +05:30
Saurabh	bb95d36218	[fixes] field re-structuring	2016-05-24 10:28:14 +05:30
Saurabh	1b62ecea44	[enhancement] cheque print	2016-05-24 10:28:14 +05:30
Nabin Hait	79ddf67289	Merge pull request #5362 from nabinhait/budget ... Budgeting	2016-05-23 17:56:42 +05:30
Nabin Hait	8f70370457	Chart of accounts fixed for Spain	2016-05-23 17:41:51 +05:30
Nabin Hait	03b08e7a91	[fix] Period closing voucher	2016-05-23 16:28:39 +05:30
Nabin Hait	832988e2fd	test case fixed	2016-05-23 13:04:26 +05:30
Nabin Hait	ca90963d5b	Redesigned budgets	2016-05-23 13:04:26 +05:30
Nabin Hait	b9bc7d6df3	[feature] New document for Budget	2016-05-23 13:04:26 +05:30
Rushabh Mehta	d0cee1b61b	[fix] minor fixes to pos	2016-05-20 12:54:59 +05:30
Rushabh Mehta	40b3a5bcc4	[optimize] communication query for heatmap	2016-05-20 12:54:59 +05:30
Nabin Hait	563bd056d7	Merge branch 'master' into develop	2016-05-20 12:18:28 +05:30
Nabin Hait	3956c94bbb	Merge pull request #5340 from rohitwaghchaure/support_week_new ... [Fix] Sales Invoice shows default date while no default mentioned	2016-05-20 12:06:22 +05:30
Nabin Hait	5dfcfc5606	Merge pull request #5366 from saurabh6790/set_default_bank_acc_in_bank_reco ... [fixes] set default bank account in bank reconciliation statement report	2016-05-20 11:36:44 +05:30
Rushabh Mehta	532eedf411	[enhance] more editable grids	2016-05-19 18:22:49 +05:30
Rohit Waghchaure	d818bcd888	[Fixes] tax rule, tax rule working even if tax template inside the rule is disabled.	2016-05-19 16:53:01 +05:30
Saurabh	c0c8af06da	[fixes] set default bank account in bank reconciliation statement report	2016-05-19 12:32:08 +05:30
Nabin Hait	1daebc04d0	Merge pull request #5360 from neilLasrado/hotfix ... Fixed reports	2016-05-18 10:39:19 +05:30
Neil Trini Lasrado	4668a69cf5	Fixed reports	2016-05-17 19:04:08 +05:30
Rohit Waghchaure	5d97d89a03	[Fix] Sales Invoice shows default date while no default mentioned	2016-05-17 15:13:17 +05:30
Nabin Hait	a09285122f	Added root type for Income. Fixes #5356	2016-05-17 10:37:31 +05:30
Rushabh Mehta	72615977d7	Merge pull request #5337 from rohitwaghchaure/pos ... [WIP] [POS] Some changes and fixes	2016-05-16 12:06:42 +05:30
Rohit Waghchaure	e0934d118f	[Fixes] Some changes and fixes	2016-05-16 12:01:16 +05:30
Nabin Hait	665568d87e	ignore permissions while creating records from charts builder portal	2016-05-13 15:56:11 +05:30
Nabin Hait	a21f49dd94	Tax rate in chart of accounts	2016-05-13 15:56:11 +05:30
Nabin Hait	e4670a9a45	Cleaned up chart of accounts	2016-05-13 15:56:11 +05:30
Nabin Hait	825070e504	Merge pull request #5331 from nabinhait/multi-fix-55 ... Multiple fixes	2016-05-12 12:27:42 +05:30
Anand Doshi	19fec06366	[fix] Validate Company in Account autoname	2016-05-11 13:27:18 +05:30
Nabin Hait	b81ed45b2b	fixed conflict	2016-05-11 12:52:31 +05:30
Nabin Hait	b3a0e05bae	included path fixed in report print formats	2016-05-11 12:38:11 +05:30
Nabin Hait	a1ec7f1eed	Add root account	2016-05-11 12:38:11 +05:30
Nabin Hait	3323d06be0	Mode of Payment columns and filters added in sales/purchase register	2016-05-10 13:17:02 +05:30
Rohit Waghchaure	6087fe178e	[Enhancement] POS	2016-05-09 23:36:15 +05:30
Nabin Hait	332d29f166	Merge branch 'master' into develop	2016-05-06 16:13:35 +05:30
shreyas	c2a49211a5	[Fix] Payment Tool, Fetch due date when user does 'Get Outstanding Vouchers'	2016-05-05 15:56:48 +05:30
shreyas	622fe3f1e3	[Fix] Fetch due date for Sales/Purchase invoice in payment tool	2016-05-05 15:11:04 +05:30
Rushabh Mehta	c711b82889	Merge pull request #5296 from KanchanChauhan/websitemakeover ... New look to the website	2016-05-02 15:54:41 +05:30
Nabin Hait	863cb12426	minor fix	2016-05-02 13:48:27 +05:30
Kanchan Chauhan	239b351367	New look to the website	2016-05-02 11:43:44 +05:30
Nabin Hait	b78adcf279	Merge branch 'master' into develop	2016-04-29 18:26:46 +05:30
Neil Trini Lasrado	c33b5b74c6	Itemwise purchase and Itemwise sales	2016-04-29 18:21:51 +05:30
Rushabh Mehta	be2ee18de4	[fixed] frappe.require is now async 💥	2016-04-29 17:22:42 +05:30
Nabin Hait	6146cc1e33	Merge branch 'master' into develop	2016-04-29 11:44:55 +05:30
Nabin Hait	48577c15a2	Show all scheduled depreciation in dotted line	2016-04-28 18:12:41 +05:30
Nabin Hait	70f05df075	Asset Movement	2016-04-28 18:01:32 +05:30
Nabin Hait	ce35c56cd3	Added line graph in asset dashboard	2016-04-28 18:01:32 +05:30
Nabin Hait	92426f5e56	Added Image field in Asset	2016-04-28 18:01:32 +05:30
Nabin Hait	314246939f	[report][fix] Item-wise tax calculation if item appears multiple times in the same invoice	2016-04-28 17:32:36 +05:30
Nabin Hait	b7b7f0062d	[report][fix] Consider taxes only the tax contributed in invoice total	2016-04-28 17:31:27 +05:30
Anand Doshi	79c536acb5	Merge branch 'master' into develop	2016-04-27 15:44:11 +05:30
Anand Doshi	b5e700f3af	Merge pull request #5248 from saurabh6790/hotfix ... [fixes] raise exception on deletion of fiscal year if fiscal year is set as Default	2016-04-27 14:25:58 +05:30
Neil Trini Lasrado	4c95ed49ed	Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports	2016-04-27 13:09:17 +05:30
Saurabh	9be40ee7c3	[fixes] raise exception while deleting fiscal year if fiscal year is set as default in Global Settings and while calculating get_month_details if year_start_date not found	2016-04-27 12:58:40 +05:30
Anand Doshi	c6479bcbb6	Merge pull request #5264 from neilLasrado/hotfix ... Fixed Currency Symbol in Trial Balance and Trial Balance for Party re…	2016-04-27 12:32:05 +05:30
Neil Trini Lasrado	b93d525c96	Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports	2016-04-25 17:18:52 +05:30
Rushabh Mehta	621283c5c5	[enhancement] stock balance page	2016-04-21 19:00:34 +05:30
Rushabh Mehta	202cb7cdf1	Merge pull request #5249 from nabinhait/fixed_asset ... Fixed asset	2016-04-21 11:41:11 +05:30
Nabin Hait	595d3c03ef	updated docs for fixed asset	2016-04-20 18:17:05 +05:30
Nabin Hait	85a2776e91	Depreciation Schedule considering already booked depreciations for existing asset and testcases	2016-04-20 17:57:12 +05:30
Nabin Hait	318fa287df	[report] Asset Depreciations and Balances	2016-04-20 17:57:12 +05:30
Nabin Hait	e58c26edca	[report] Added asset depreciation ledger report	2016-04-20 17:57:12 +05:30
Nabin Hait	cd0e8ce8ad	Fixes and modification in fixed asset	2016-04-20 17:57:12 +05:30
Nabin Hait	3d9c5c0c20	Fixed Asset module cleanup and fixes	2016-04-20 17:57:11 +05:30
Kanchan Chauhan	11638ba358	Changes 3	2016-04-20 16:24:25 +05:30
Kanchan Chauhan	704f248952	Changes 2	2016-04-20 16:24:24 +05:30
Rushabh Mehta	0525387328	[enhancement] added reserved_qty_for_production in bin and updated item dashboard	2016-04-18 19:27:46 +05:30
Nabin Hait	c46c1f0288	[fix] Rejected serial nos in purchase invoice	2016-04-18 17:46:36 +05:30
Nabin Hait	14aa9c5320	[fix] Cleanup and fixes in update stock feature in Purchase Invoice	2016-04-18 16:59:47 +05:30
Saurabh	7fee1b8343	[fixes] set expence account to item on sales invoice	2016-04-18 15:58:43 +05:30
Saurabh	224737b9ed	[fixes] split make gl entry function into chuncks as per SI	2016-04-18 15:58:43 +05:30
Saurabh	fbb342c1ac	[enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI	2016-04-18 15:58:43 +05:30
Saurabh	130c57b201	[fixes] code clean-up	2016-04-18 15:58:43 +05:30
Saurabh	e29248bcb3	[fixes] test-case to validate quantity after update stock and purchase return and code-cleaning	2016-04-18 15:58:43 +05:30
Saurabh	d697f3d6a3	[minor][fix] reset is_paid if company not selected	2016-04-18 15:58:42 +05:30
Saurabh	43520f93a1	[fixes] test cases, code cleanup.	2016-04-18 15:58:42 +05:30
Saurabh	2a0e2fe95c	[test-case] test update stock and payment	2016-04-18 15:57:56 +05:30
Saurabh	4bd34a58ba	[fixes] fix perpetual inventory	2016-04-18 15:57:55 +05:30
Saurabh	bd5fc8ecbe	[fixes] add posting time	2016-04-18 15:57:55 +05:30
jof2jc	c204775fe2	Added posting_time in purchase invoice	2016-04-18 15:57:55 +05:30
jof2jc	821f571640	added payments, make receipt field	2016-04-18 15:57:55 +05:30
jof2jc	524ebbcbb9	Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice	2016-04-18 15:57:55 +05:30
Umair Sayyed	72534deea2	removed Is Sales Item and Is Purchase Item	2016-04-15 12:57:00 +05:30
Nabin Hait	bd07ea43e8	fixed conflict	2016-04-15 11:06:41 +05:30
Nabin Hait	972c25f78d	Fixed conflict	2016-04-14 18:25:53 +05:30
Nabin Hait	e393c62086	[fix] Set debit / credit as per field precision	2016-04-14 18:15:42 +05:30
Rushabh Mehta	15a7f215b9	[enhancement] heatmaps on item and notifications for item	2016-04-14 17:30:53 +05:30
Umair Sayyed	6269f1e3d0	address and contact related fields re-arranged in the sales transactions fixes #5192	2016-04-14 13:07:41 +05:30
Rushabh Mehta	8c9c57c8f3	[minor] update party timestamp after transaction	2016-04-13 18:22:06 +05:30
Nabin Hait	c2ae1a7375	fixed merge conflict	2016-04-13 11:55:15 +05:30
Rushabh Mehta	8bbca6fa2e	[enhancement] links menu in customer, supplier, item	2016-04-12 19:16:33 +05:30
Nabin Hait	471908ab9f	Merge pull request #5194 from nabinhait/gross_profit_fix ... Gross profit fix	2016-04-12 18:57:45 +05:30
Nabin Hait	8a686ba982	[fix] Prevent from directly creating payment request	2016-04-12 17:02:15 +05:30
Nabin Hait	f509d13d28	[fix] Get average selling rate based on group by	2016-04-12 17:01:39 +05:30
Rushabh Mehta	5d0e8dee11	[fix] dashboard for customer, supplier	2016-04-11 17:34:49 +05:30
Nabin Hait	3912a31a6f	Merge pull request #5176 from nabinhait/ar_ap_print_currency ... Currency column in AR/AP and Sales/Purchase register report	2016-04-11 17:13:04 +05:30
Nabin Hait	f945e10cce	Currency column in AR/AP and sales/purchase register report	2016-04-11 11:56:57 +05:30
Rushabh Mehta	2dff9275f3	[test] fixed circular dependencies	2016-04-08 18:05:12 +05:30
Anand Doshi	2f957f27b0	[fix] apply Tax Rule for lead	2016-04-08 17:43:08 +05:30
Rushabh Mehta	f16f9c569b	[enhancement] add status in customer, supplier	2016-04-08 17:21:00 +05:30
Rushabh Mehta	203cc962f5	[enhancement] Item Selector	2016-04-08 17:21:00 +05:30
Anand Doshi	79a415e3b8	[fix] Use for shopping cart validation in Tax Rule	2016-04-08 17:08:26 +05:30
Rushabh Mehta	78b7a53635	[cleanup] set default bold, print_hide for prints	2016-04-06 15:29:45 +05:30
Anand Doshi	a32b3ea3e8	Merge pull request #5115 from nabinhait/test_fix ... [fix] Test cases	2016-04-04 17:43:02 +05:30
Nabin Hait	94360cca20	[fix] received and delivered items to be billed report based on percentage billed	2016-04-04 17:40:33 +05:30
Anand Doshi	f1b276122e	Merge pull request #5117 from nabinhait/report_modified_change ... [fix] Modified date changed in query report due to project field renaming	2016-04-04 17:04:14 +05:30
Anand Doshi	62be8dfd21	Merge pull request #5131 from shreyasp/creditnote-print-format ... [Fix] Correct amount shown in credit note print format	2016-04-04 15:37:31 +05:30
shreyas	c6b47bcdda	[Fix] Show amount in credit note print format	2016-04-04 15:13:03 +05:30
Anand Doshi	15f7b1ee1a	[fix] POS paid amount validation using grand total	2016-04-04 15:03:28 +05:30
sudip	0e55417f81	Add User Remarks to Quick Entry Form in Journal Entry	2016-04-02 08:42:42 +05:45
Nabin Hait	4f10f15686	[fix] Modified date changed in query report due to project field renaming	2016-04-01 17:59:06 +05:30
Nabin Hait	adddf6f471	[fix] Test cases	2016-04-01 16:47:46 +05:30
Rushabh Mehta	8ca426d94a	Merge pull request #5095 from rohitwaghchaure/new_rfq ... [Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party	2016-04-01 11:41:15 +05:30
Rushabh Mehta	fff8e6c733	Merge pull request #5080 from nabinhait/fy_overlap ... [fix] Added overlap validation in fiscal year	2016-04-01 11:37:03 +05:30
rohitwaghchaure	62fea0374b	[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party	2016-03-31 21:49:07 +05:30
Rushabh Mehta	45c6b550f0	[cleanup] assets and made items mandatory in transactions	2016-03-31 15:37:51 +05:30
Rushabh Mehta	acf28af19c	[fix] set default depreciation accounts and test fix	2016-03-31 15:04:06 +05:30
Nabin Hait	2ed0b59747	[fix] Added overlap validation in fiscal year	2016-03-31 12:40:37 +05:30
Nabin Hait	91a58808c0	[fix] Allowed deletion of root account	2016-03-31 11:59:10 +05:30
Nabin Hait	684052e978	[fix] Permissions added in asset and asset category	2016-03-30 15:06:25 +05:30
Nabin Hait	7fcec4118b	[fix] Test case	2016-03-30 15:06:25 +05:30
Rushabh Mehta	3fc6fdeba0	[cleanup] for quick-entry	2016-03-30 13:18:30 +05:30
Rushabh Mehta	652dee45a6	[minor] make margin collapsible	2016-03-29 16:42:13 +05:30
Rushabh Mehta	1d05ada5e9	Merge pull request #4950 from nabinhait/fixed_asset_depreciation ... Fixed asset depreciation	2016-03-29 16:39:31 +05:30
Rushabh Mehta	22fe3a8b7e	Merge pull request #5081 from nabinhait/trans_fix ... [fix] Translations	2016-03-29 15:16:07 +05:30
Rushabh Mehta	b5aa50de06	[fix] select default company in chart of accounts	2016-03-29 14:41:20 +05:30
Nabin Hait	d9449e396f	[fix] Translations	2016-03-29 13:22:31 +05:30
Rushabh Mehta	c9850f9e04	Merge pull request #5077 from frappe/master ... Master	2016-03-29 11:59:32 +05:30
Nabin Hait	fb03b96992	fixed asset fixes	2016-03-29 11:54:38 +05:30
Nabin Hait	7de15321c9	[docs] Managing fixed assets	2016-03-29 11:54:38 +05:30
Nabin Hait	06a41aca13	fixed asset: related accounts added in default chart of accounts	2016-03-29 11:54:37 +05:30
Nabin Hait	7536349f17	Fixed asset: status, restore, testcase and much more	2016-03-29 11:54:37 +05:30
Nabin Hait	4d668dbaa3	[tests] creation of asset and asset category	2016-03-29 11:54:37 +05:30
Nabin Hait	4fdb05228d	fixed asset depreciation	2016-03-29 11:54:37 +05:30
Nabin Hait	3a15c92c5e	Fixed Asset Depreciation first commit	2016-03-29 11:54:37 +05:30
Rushabh Mehta	9904c5acf4	Merge pull request #5050 from neilLasrado/develop ... Fixes Translations	2016-03-29 10:51:44 +05:30
Rushabh Mehta	e1b20a0b29	Merge pull request #5044 from rohitwaghchaure/add_margin_feature ... [Enhancement] Add margin in sales flow.	2016-03-28 18:27:05 +05:30
rohitwaghchaure	a1064a6149	[enhancement] request for quotation	2016-03-28 17:28:45 +05:30
Neil Trini Lasrado	b176dea74e	Fixed issues in Pricing Rule if multiple pricing rules existed with same priority	2016-03-28 13:23:47 +05:30
Neil Trini Lasrado	b6d9946854	Fixes Translations	2016-03-28 12:44:05 +05:30
Rushabh Mehta	c20c536f28	[fix] [wip] cleanup for collaborative pm	2016-03-25 17:22:17 +05:30
mbauskar	a52472cf5b	[fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py	2016-03-24 14:07:51 +05:30
mbauskar	c1331d0e8e	[minor-fix] pricing rule test-case fix	2016-03-24 14:07:51 +05:30
mbauskar	75b6fbb6a7	[fix] apply pricing rule added type and rate on ignore pricing rule trigger	2016-03-24 14:07:50 +05:30
mbauskar	b6d19bcfc2	[fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item	2016-03-24 14:07:50 +05:30
mbauskar	dcd8b7773d	[fix] calculated rate on py side, added depends on for sales order item	2016-03-24 14:07:50 +05:30
mbauskar	5e76a1cffa	[fix] added eval for total margin and margin rate field	2016-03-24 14:07:50 +05:30
mbauskar	ea60c635ab	changed the description of rate fields depending on margin type and if ignore pricing is unchecked returned the rate=0	2016-03-24 14:07:48 +05:30
mbauskar	8c8fa17a9b	[new fields] added Margin type (Percetage/Amount) and Rate field to capture Margin details in Pricing Rule, Sales Order Item, Quotation Item	2016-03-24 14:07:48 +05:30
Rushabh Mehta	b2269dd326	[fix] back links from project web view	2016-03-23 18:29:00 +05:30
Anand Doshi	a75fe1a4c3	Revert "[cleanup] PayPal payment UX and moved related methods to hooks of respective apps"	2016-03-23 11:59:24 +05:30
Rushabh Mehta	eec21d041c	Merge pull request #5028 from anandpdoshi/paypal-cleanup ... [cleanup] PayPal payment UX and moved related methods to hooks of respective apps	2016-03-23 11:50:46 +05:30
Rushabh Mehta	1e7ca6c77a	Merge pull request #5023 from nabinhait/balance_sheet_opening ... [fix][balance sheet] Check if precious fiscal year is closed	2016-03-23 11:46:13 +05:30
Anand Doshi	71b90b7b7d	[cleanup] PayPal payment UX and moved related methods to hooks of respective apps	2016-03-21 17:50:02 +05:30
Nabin Hait	c8baa01e9c	[fix] Updated modified datetime	2016-03-21 17:20:03 +05:30
Nabin Hait	443a7c13e4	[fix][balance sheet] Check if previous fiscal year is closed	2016-03-21 14:38:32 +05:30
Nabin Hait	9a75530c26	[fix] reload doctype for renaming project	2016-03-18 16:19:25 +05:30
Nabin Hait	d6c59656e8	Merge pull request #5009 from saurabh6790/cart_fixes-1.0 ... [fixes] return debtors account name	2016-03-18 15:36:06 +05:30
Nabin Hait	5996b2f1bb	[fix] recurring document logic	2016-03-18 15:19:54 +05:30
Saurabh	b43df36e85	[fixes] return debtors account name	2016-03-18 15:05:50 +05:30
rohitwaghchaure	90ff509f6d	[fix]Earlier recurring billing	2016-03-18 10:44:53 +05:30
Umair Sayyed	8cbc076dc2	fixes in the Account Receivale print format - with Nabin	2016-03-17 15:12:31 +05:30
Nabin Hait	6221117069	[fix] shipping address position in document	2016-03-16 16:23:30 +05:30
Saurabh	14d646f636	[fixes] shipping address on purchase flow	2016-03-16 16:23:30 +05:30
Neil Trini Lasrado	f433a5a124	Fixed bug while selecting project in sales_invoice, sales_order, delivery_note	2016-03-16 16:00:27 +05:30
Neil Trini Lasrado	6e343e23d9	Renamed project_name to project	2016-03-15 17:50:53 +05:30
Nabin Hait	f853a92676	Fixes in AR/AP Print Format	2016-03-15 16:10:15 +05:30
Nabin Hait	89301863e5	minot fixes	2016-03-15 15:20:49 +05:30
rohitwaghchaure	c54b805981	[fixes]Unable set recurring date in sales order	2016-03-14 19:03:22 +05:30
Saurabh	c54619570a	[fixes] check party_account_currency while creating Pull Request from Sales Invoice	2016-03-14 15:55:23 +05:30
Saurabh	9f94266892	[fixes] fetch value from grand total field while creating payment request from si	2016-03-14 11:23:03 +05:30
Anand Doshi	c75c1d7e3e	[fix] additional fixes after deprecating Fiscal Year	2016-03-11 14:56:19 +05:30
Valmik Jangla	063946a02f	Removed from Purchase Invoice and Purchase Reciept	2016-03-11 13:07:48 +05:30
Valmik Jangla	d89dcf60e6	Removed from Delivery Note and Appraisal ... Added back in Stock Ledger Entry Added validation in GL Entry and SL Entry Stock Controller sets Fiscal Year using Posting Date	2016-03-11 13:07:48 +05:30
Valmik Jangla	d4ac3d8ceb	Removed from Stock Ledger Entry and Sales Invoice	2016-03-11 13:07:48 +05:30
Valmik Jangla	cd9daf6671	Removed from Journal Entry and Stock Reconciliation	2016-03-11 13:07:16 +05:30
Valmik Jangla	c7e774fda9	BudgetError Fix	2016-03-11 13:05:20 +05:30
Valmik Jangla	865d547965	Removed from GL Entry, Opportunity and Quotation	2016-03-11 13:05:20 +05:30
Valmik Jangla	bc60970fcb	Removed from Maitenance Visit and Warranty Claim	2016-03-11 13:05:19 +05:30
Valmik Jangla	57b69cecbf	Removed from C-Form	2016-03-11 13:05:19 +05:30
Valmik Jangla	c4c603dcd2	Removed from Expense Claim	2016-03-11 13:05:19 +05:30
shreyas	6c89bb1900	[Minor] Moved company field to top of the form, making it more consistent other doctypes	2016-03-11 12:12:30 +05:30
Anand Doshi	f0e16e68c5	Merge pull request #4962 from nabinhait/trial_balance_fix ... [fix] Trial Balance report, showing rows with zero values	2016-03-10 12:24:24 +05:30
Nabin Hait	3883e86ad7	[fix] Trial Balance report, showing rows with zero values	2016-03-10 12:01:01 +05:30
Nabin Hait	dd8dbe000b	[fix] Rearranged position of mode_of_payment in sales invoice	2016-03-10 10:58:31 +05:30
Anand Doshi	065d24b26d	Merge pull request #4951 from shreyasp/gross-profit-wn-sup17486 ... [Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report	2016-03-09 14:22:16 +05:30
shreyas	7c42995949	[Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report	2016-03-09 13:15:38 +05:30
Nabin Hait	acb28954ff	[fix][report] Show group rows with zero values if there are values against children	2016-03-04 12:32:44 +05:30
Rushabh Mehta	0c1b8f4334	[fix] [minor] autoload chart of accounts	2016-03-03 16:47:36 +05:30
Rushabh Mehta	1396b776bc	[fix] print hide for submit_on_creation	2016-03-03 13:57:15 +05:30
Rushabh Mehta	7114b7786e	[fix] print hide for submit_on_create	2016-03-03 13:12:21 +05:30
Rushabh Mehta	5839a8d7f0	[fixes] usability cleanup of recurring document and added explicit submit_on_creation	2016-03-02 17:51:52 +05:30
Rushabh Mehta	aac4dcedc8	[fix] print language and contact_email fields and removed translations	2016-03-02 15:45:09 +05:30
Rushabh Mehta	b0f0aaf5b1	[minor] added chart of accounts, cost centers buttons on Company	2016-03-02 13:08:40 +05:30
Rushabh Mehta	cbed331047	Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test ... Multilingual print format test	2016-03-01 17:10:50 +05:30
rohitwaghchaure	4151e3dc92	[enhancement] Multi-lingual print format	2016-03-01 16:33:08 +05:30
Rushabh Mehta	39a6f804bf	Merge pull request #4871 from ShashaQin/patch-27 ... Improvements about recurring documents	2016-03-01 16:06:33 +05:30
Rushabh Mehta	ddeb576d52	Merge pull request #4849 from rasos/patch-1 ... Create at_austria_chart_Einheitskontenrahmen.json	2016-03-01 16:05:13 +05:30
Nabin Hait	bdf0f0a08d	[fix] Show debit note button in purchase invoice	2016-02-26 16:26:28 +05:30
Nabin Hait	0f6eac3b35	[fix] Show credit note button in sales invoice	2016-02-26 13:01:32 +05:30
Nabin Hait	55f0834e99	[fix] Show payment button in purchase invoice	2016-02-25 19:12:37 +05:30
ShashaQin	ae629ad29f	Update purchase_invoice.json	2016-02-25 11:17:13 +08:00
ShashaQin	02a38e8b5e	Update sales_invoice.json ... Add 'Notify by Email' check box and set next_date can be changed by user	2016-02-25 11:13:19 +08:00
Saurabh	00212a23e1	[fixes] removed base_grand_total from payment request	2016-02-24 16:50:19 +05:30
Saurabh	6d1dbd6384	[fixes] currency exchange rate and payment gateway account fixes for multicurrency	2016-02-24 15:07:26 +05:30
Saurabh	4a6bbf9b72	[fixes] added filters company and currency to get account, removed account name wise comparison	2016-02-24 15:07:26 +05:30
Saurabh	f54be2c7f0	[fixes] test case fixes for multi-currency check	2016-02-24 15:07:25 +05:30
Saurabh	1864879b91	[fixes] fix grand total calculation for Payment Request and set visibility of Resend Payment Email button	2016-02-24 15:07:25 +05:30
Saurabh	3a2682919a	[enhance] set customer payable account to new customer as per payment gateway account currency via cart if cart and checkout is enable	2016-02-24 15:07:25 +05:30
Saurabh	2dc2d671da	[clean-up]	2016-02-24 15:07:25 +05:30
Saurabh	7d5b47e113	[fixes] minor fix in test-case	2016-02-24 15:07:25 +05:30
Saurabh	fa32588e72	[fixes] minor fix in test-case	2016-02-24 15:07:25 +05:30
Saurabh	1e800a9ef0	[fixes] multi-currency via payment request	2016-02-24 15:07:25 +05:30
Saurabh	da9e9cdb13	[fixes] minor get_payment_gateway_account	2016-02-24 15:07:24 +05:30
Saurabh	dca6302e15	[fixes] field renaming, cart checkout fixes, JE fixes for multi-currency payment	2016-02-24 15:07:24 +05:30
Saurabh	883cc04701	[fixes] compare attributes in lower case	2016-02-24 15:07:24 +05:30
Anand Doshi	acd1bcffde	[fix] changed field type to Code	2016-02-24 12:38:08 +05:30
Nabin Hait	d2d261dc87	Merge pull request #4854 from patilsangram/develop ... Removed Stop Button from SO and PO	2016-02-24 11:21:17 +05:30
patilsangram	a812d67837	[fixes]	2016-02-23 19:04:29 +05:30
saurabh	8e49951821	fetch customer or supplier language and set on sales and purchase flow's form	2016-02-23 02:17:03 +05:30
saurabh	65820ed013	added new field language for users	2016-02-23 02:17:03 +05:30
patilsangram	bf2b511988	[Removed Stop Button from SO and PO]	2016-02-22 16:24:23 +05:30
Nabin Hait	db746f5bc7	[fix] Condition for Payment and Return button visibility	2016-02-22 16:17:10 +05:30
Roland	ed2849adf9	Create at_austria_chart_Einheitskontenrahmen.json ... Austrian Chart of Accounts compiled by fairkom.eu from various sources, among them the official "Österreichishcer Kontenrahmen" published by ÖPWZ - Fachsenat für Betriebswirtschaft und Organisation der Kammer der Wirtschaftstreuhänder Version May 2014. Numbering scheme has been slightly adapted to fit best with ERPnext setup of a company, where the most important accounts are automatically assigned. When using this chart of accounts, feel free to reduce / adapt the accounts - it is not legally binding.	2016-02-22 09:26:54 +01:00
Anand Doshi	52780cb937	Merge pull request #4841 from nabinhait/escape ... [fix] Escaping strings with percentage	2016-02-19 13:01:00 +05:30
Nabin Hait	1a99cb8bfe	[fix] Escaping strings with percentage	2016-02-19 12:45:57 +05:30
Nabin Hait	fb24a27201	[fix] GLE for Rounding loss allowed upto 1 for all transactions except JE	2016-02-18 19:18:07 +05:30
Anand Doshi	828d5ffaab	[fix] Show Debit/Credit in Bank Reconciliation table	2016-02-17 18:31:58 +05:30
Anand Doshi	620252cadb	[fix] validate Fiscal Year in Trial Balance	2016-02-15 12:03:04 +05:30
Rushabh Mehta	6f574cd60f	[minor] do not commit pay-to-recd from in journal entry	2016-02-11 14:27:28 +05:30
Nabin Hait	7e02831897	[fix] Test case fixed	2016-02-10 15:54:52 +05:30
Nabin Hait	e1f6e60cea	[fix] Payment Request Fixes	2016-02-10 13:07:42 +05:30
Rushabh Mehta	7f3983a3d6	Merge pull request #4769 from rmehta/pricing-rule-on-variant ... [fix] pricing rule for variant, if rule for template available, use it	2016-02-09 11:20:00 +05:30
Rushabh Mehta	faf9b589c4	[fix] pricing rule for variant, if rule for template available, use it	2016-02-08 18:49:27 +05:30
Nabin Hait	4c6af87ad0	[fix] Read permission to All for permlevel 1 fields	2016-02-08 16:56:19 +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	2b8472fe54	Merge pull request #4744 from ccfiel/develop ... undo bank recon.	2016-02-08 10:45:55 +05:30
Chris Ian Fiel	af667f77e6	Update bank_reconciliation.py ... set to null if clearance_date is blank because if not it will set it just 0000-00-00.	2016-02-04 22:10:36 +08:00
ShashaQin	bcc56a4557	Update gross_profit.py ... Gross Profit report improvement	2016-02-04 11:45:00 +08:00
Nabin Hait	bd7f48cfd4	[report] Financial Statements: Accumulated periodic balance based on filters	2016-02-02 19:05:43 +05:30
ShashaQin	cc6ce5beac	Update financial_statements.py	2016-02-02 19:05:42 +05:30
ShashaQin	15d7224335	Update balance_sheet.py	2016-02-02 19:05:42 +05:30
ShashaQin	1f51e71827	Update profit_and_loss_statement.py	2016-02-02 19:05:42 +05:30
Nabin Hait	d5fda57297	[fix] Ignore permissions and made Customer warehouse field hidden in selling cycle	2016-02-01 15:55:09 +05:30
Anand Doshi	7c0a58ac3f	[fix] show formatted currency value in advance paid validation	2016-01-29 12:16:24 +05:30
Nabin Hait	b2206d1155	[fix] Multi currency advance payment against Order	2016-01-27 15:43:24 +05:30
shreyas	eba9ca4d66	[Minor]Change to maintain args ordering convention	2016-01-26 16:29:26 +05:30
shreyas	79872bf62c	[Refactor]Changed variable name to avoid conflict between args and local variable	2016-01-26 13:57:06 +05:30
shreyas	c8ac3b042b	[Minor]Refactored code for better readability	2016-01-26 13:23:38 +05:30
shreyas	f76853a8d9	[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen	2016-01-25 21:25:11 +05:30
shreyas	323dc96c99	[Travis] Fixed reference failure in party.py	2016-01-25 18:19:14 +05:30
shreyas	29b565fdf5	Added Disabled field to Supplier and Customer doctype ... Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO	2016-01-25 18:19:13 +05:30
Anand Doshi	2ea5c6913d	Merge pull request #4685 from shreyasp/supplier-credit-fix ... Added the credit_days_based_on field to Supplier and Supplier Type doctype	2016-01-25 17:58:21 +05:30
Anand Doshi	5dcb40bc96	Merge pull request #4687 from anandpdoshi/fix/recurring-docs-no-copy ... [fix] obey no_copy while creating recurring documents	2016-01-25 17:27:04 +05:30
Anand Doshi	c07489a096	[fix] Journal Entry: init debit/credit in account currency	2016-01-25 17:23:36 +05:30
Anand Doshi	39e2c2bb09	[fix] obey no_copy while creating recurring documents	2016-01-25 17:03:50 +05:30
shreyas	28a6578ba2	Added the credit_days_based_on field to Supplier and Supplier Type doctype	2016-01-25 12:44:14 +05:30
Nabin Hait	568054ab96	[fix] Make Delivery Note from Sales Invoice	2016-01-21 18:50:28 +05:30
Nabin Hait	bb7e499cbd	Merge pull request #4662 from ccfiel/develop ... undo reconciled journal entry record	2016-01-21 15:32:33 +05:30
Chris Ian Fiel	cb66d3a8c9	undo reconciled journal entry record ... https://github.com/frappe/erpnext/issues/4661	2016-01-21 16:26:22 +08:00
Chris Ian Fiel	43a62ad0f0	undo reconciled journal entry record	2016-01-21 06:50:13 +08:00
Nabin Hait	002fa6c1d9	Merge pull request #4650 from RicardoJohann/patch-2 ... Accounts - Bank reconciliation - Workflow and labeling improvements	2016-01-20 17:03:06 +05:30
Nabin Hait	dbbc3eb8a6	Merge pull request #4656 from nabinhait/gle_rounding ... [fix] Round off gle due to currency conversion	2016-01-20 16:48:42 +05:30
Nabin Hait	dd2f0330a6	Merge pull request #4641 from nabinhait/report-currency ... [fix] Currency in Gross Profit report	2016-01-20 16:45:57 +05:30
Nabin Hait	d4507ac6a0	[fix] Round off gle due to currency conversion	2016-01-20 16:14:27 +05:30
RicardoJohann	05aa3b391e	Update bank_reconciliation.py	2016-01-20 13:38:20 +08:00
RicardoJohann	e095eeb084	Update bank_reconciliation_statement.py	2016-01-20 13:36:36 +08:00
RicardoJohann	6f9afffd8a	Update bank_reconciliation_statement.html	2016-01-20 12:15:20 +08:00
RicardoJohann	7425af6968	Update bank_reconciliation_detail.json ... Accounts - Bank reconciliation - Workflow and labeling improvements	2016-01-20 12:02:20 +08:00
Nabin Hait	6d8688f8b4	[fix] Currency in Gross Profit report	2016-01-19 17:27:06 +05:30
Nabin Hait	34d2822483	Fixes in get_item_details and test cases	2016-01-19 16:48:32 +05:30
Nabin Hait	77532cc8db	[fix] Total Amount in Journal Entry	2016-01-19 16:48:31 +05:30
Maxwell	4da17348fd	Add localization in the on_submit event	2016-01-18 23:29:21 -02:00
Rushabh Mehta	6bf3c7453b	[fix] payment request	2016-01-18 14:29:26 +05:30
Rushabh Mehta	681c9dde84	[ui] payment request cleanup	2016-01-18 14:21:45 +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
Rushabh Mehta	2e3d2b8426	Merge pull request #4613 from nabinhait/fixes ... [fix] Item query and exchange rate	2016-01-15 11:19:44 +05:30
Rushabh Mehta	66eaf7e1c3	Merge pull request #4607 from saurabh6790/group_custom_buttons ... [enhance] merge customize buttons under groups	2016-01-15 11:15:23 +05:30
Nabin Hait	ad42d2f67a	Minor fixes	2016-01-15 11:09:41 +05:30
Saurabh	f7caad8ecb	[fixes] redirect uri fixes	2016-01-14 11:30:47 +05:30
Nabin Hait	a88912a2f5	[fix] Item query and exchange rate	2016-01-14 10:43:17 +05:30
Saurabh	e23e99f4bd	[enhance] merge customize buttons under groups	2016-01-13 09:18:31 +05:30
Saurabh	cbebb4b8ba	[fixes] code cleanup	2016-01-12 14:13:35 +05:30
Saurabh	3ade883fd9	[fixes] place cart button via js	2016-01-12 14:09:52 +05:30
Saurabh	df2783dbb0	[enhance] i. facility to send PR email; ii. update cart, item view and order view;	2016-01-12 14:09:52 +05:30
Saurabh	a940b6d149	[fixes] handle cancled payment requests	2016-01-12 14:09:51 +05:30
Saurabh	0a0c78729f	[enhace] display payment status on order	2016-01-12 14:09:51 +05:30
Saurabh	276d3e60bd	[enhance] pay via cart	2016-01-12 14:09:51 +05:30
Saurabh	c22e525a14	[Fixes] payment request url fixes	2016-01-12 14:09:51 +05:30
Saurabh	2ffea6ba94	[document & fixes] document and test case rewrite	2016-01-12 14:09:51 +05:30
Saurabh	6fc408e974	[fixes] conmify account details and validate gateway currency	2016-01-12 14:09:51 +05:30
Saurabh	ed0723c6fe	[fixes] Create payment gateway account	2016-01-12 14:09:50 +05:30
Saurabh	766f6a43d5	[fixes] test case for Payment request	2016-01-12 14:09:50 +05:30
Saurabh	1664668b0e	[fixes] multi-currency fixes	2016-01-12 14:09:50 +05:30
Saurabh	3ba22676bf	[fixes] Create and manage payment request	2016-01-12 14:09:50 +05:30
Saurabh	db7a56b453	[fixes] fieldtype, message fixes on Payment Request	2016-01-12 14:09:50 +05:30
Saurabh	cb98d9ec5f	[fixes] print format listing	2016-01-12 14:09:50 +05:30
Saurabh	b109ee96de	[fixes] Base structure for Payment Request	2016-01-12 14:09:49 +05:30
Saurabh	eba7aa496c	[enhace] basic structure for payment gateway	2016-01-12 14:09:49 +05:30
Rushabh Mehta	4a3140102c	Merge pull request #4606 from nabinhait/report_currency ... [fix] Currency symbol based on account/company currency, not based on Global Defaults	2016-01-12 12:12:43 +05:30
Rushabh Mehta	659bc1aca4	[minor] fixes reported on support	2016-01-12 11:57:25 +05:30
Nabin Hait	226a101119	[fix] Currency symbol based on account/company currency, not based on Global Defaults	2016-01-12 11:56:40 +05:30
Nabin Hait	af2bf7541f	Merge pull request #4603 from ccfiel/develop ... note added equity	2016-01-11 13:13:15 +05:30
Chris Ian Fiel	d070d56f72	note added equity	2016-01-11 15:34:24 +08:00
Rushabh Mehta	7be0b47778	[minor] [fix] validate fiscal year in trial balance	2016-01-11 11:59:08 +05:30
Anand Doshi	6b71ef5843	[refactor] changed set_modified, change_modified to update_modified like in the framework	2016-01-06 16:32:06 +05:30
Nabin Hait	c040075bd4	[patch] Update billing status in Delivery Note and Purchase Receipt	2016-01-06 15:42:44 +05:30
Nabin Hait	bdab0eea0f	Billing status in Purchase Receipt	2016-01-06 15:42:43 +05:30
Nabin Hait	5b13b99441	Update billing status in Delivery Note if directly invoiced against SO	2016-01-06 15:42:27 +05:30
Anand Doshi	09fc4a456e	Merge pull request #4582 from nabinhait/develop ... Chart of accounts added for Singapore and some other fixes	2016-01-06 15:01:49 +05:30
Anand Doshi	4774c41958	[fix] validate_multi_currency	2016-01-06 14:16:10 +05:30
Anand Doshi	e88ffe032e	[fix] show fields like sales_order, against_sales_order, schedule_date in item grid if In List View is checked	2016-01-06 12:54:59 +05:30
Nabin Hait	ea8bc8ecb0	Chart of accounts added for Singapore and some other fixes	2016-01-06 12:32:48 +05:30
Anand Doshi	06a82d4e1f	Merge pull request #4574 from rmehta/translations ... Translation fixes	2016-01-05 18:41:18 +05:30
Rushabh Mehta	e64fbd6d3c	[minor] fixes for chart_of_accounts_builder app	2016-01-04 18:11:21 +05:30
Rushabh Mehta	eb961370ff	[translations] fixes #4532	2016-01-04 15:48:37 +05:30
Anand Doshi	f7980927a1	[fix] Payment Reconciliation: use the date and amount filters only for Invoice	2016-01-04 13:00:14 +05:30
Anand Doshi	c1e1026486	[fix] validate 'cannot change fiscal year dates' only if not new	2016-01-04 12:20:25 +05:30
Nabin Hait	0e2d1bd4ed	[fix] Ignore permissions while creating fiscal year automatically	2015-12-28 13:04:19 +05:30
Nabin Hait	b6b56453e1	[fix] Get defaults based on doctype or fieldname	2015-12-23 16:37:06 +05:30
Nabin Hait	6f8dafbb5e	[fix] Validate advance entry based on party	2015-12-23 13:03:31 +05:30
Nabin Hait	d37cef7f60	[fix] Set debit/credit in company currency	2015-12-22 15:13:01 +05:30
Anand Doshi	ee2129ce1c	Merge pull request #4513 from nabinhait/discount_percentage ... Additional Discount amount based on percentage	2015-12-21 16:13:17 +05:30
Nabin Hait	3769d87240	Additional Discount amount based on percentage	2015-12-18 13:12:08 +05:30
Nabin Hait	adab5d308c	[fix] Group account merging with sub-ordinate group	2015-12-17 12:53:25 +05:30
Nabin Hait	afda26e4f3	Fixed conflict	2015-12-17 12:19:58 +05:30
Chris Ian Fiel	d6d354b5c3	By: nabinhait ... Depreciation account is an expense account, it is debited while booking depreciation. Thats why Depreciation amount is coming as negative, I think it should be positive and added to the "Net Profit and Loss".	2015-12-17 09:42:12 +08:00
Chris Ian Fiel	7d310bd182	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2015-12-17 09:18:24 +08:00
Nabin Hait	8b33a6cdc0	Cleanup in cash flow	2015-12-16 16:09:43 +05:30
Nabin Hait	5e173c7106	Merge branch 'develop' of https://github.com/ccfiel/erpnext into ccfiel-develop	2015-12-15 17:39:55 +05:30
Nabin Hait	8bdf8e675f	[fix][report] General Ledger	2015-12-15 15:02:04 +05:30
Rushabh Mehta	e8ab320028	[fix] rename tree item fixes #2524	2015-12-15 12:06:37 +05:30
Chris Ian Fiel	c80796cdd5	Cash Flow Report	2015-12-12 11:26:54 +08:00
Chris Ian Fiel	fde03453e4	Cash Flow Report	2015-12-12 10:54:56 +08:00
Chris Ian Fiel	826e18a29f	Cash Flow Report	2015-12-12 10:33:01 +08:00
Nabin Hait	c119cbcb50	Merge pull request #4449 from nabinhait/coa_fix ... [fix] Stock account identified in COA of Guatamala	2015-12-09 13:58:09 +05:30
Giovanni Lion	5de53eb0eb	Voucher dynamic link fix to allow links to work if user language is not english	2015-12-09 15:45:40 +08:00
Nabin Hait	49fe7af6de	[fix] Stock account identified in COA of Guatamala	2015-12-09 11:27:10 +05:30
Nabin Hait	4372ac559a	Merge pull request #4443 from nabinhait/bank_reco_print ... [fix] Print format for bank reco statement	2015-12-08 15:17:24 +05:30
Nabin Hait	7af5c4aefc	[fix] Print format for bank reco statement	2015-12-08 14:25:10 +05:30
Rushabh Mehta	441b2c7657	[minor] limit pos search to 24 items at a time	2015-12-08 12:16:53 +05:30
Nabin Hait	92bb480fc3	Merge pull request #4432 from bohlian/develop ... Purchase Invoice - Show Payment Button when Outstanding Amount !=0	2015-12-07 11:12:11 +05:30
bohlian	5e4c8a52ee	Payment To Be Shown When Outstanding Amount != 0 ... Payment button should be shown when outstanding amount != 0.	2015-12-07 12:06:08 +08:00
Saurabh	4f39fd243e	[fixes] recreate print format, shipping address on po for drop ship, validate update stock	2015-12-06 10:09:06 +05:30
Nabin Hait	9547b774f7	[fix] Fixed amounts not reflected in bank	2015-12-04 11:05:25 +05:30
Rushabh Mehta	39e603a154	Merge pull request #4413 from nabinhait/bank_transfer_exchange_rate ... Bank transfer exchange rate and account balance in COA	2015-12-03 17:56:03 +05:30
Nabin Hait	4c7a32e446	[fix] Toggle required for sales and purchase tax template based on tax type	2015-12-03 11:47:38 +05:30
Rushabh Mehta	f7911687a0	[minor] fixes to patch	2015-12-03 08:09:42 +05:30
Nabin Hait	f58a3726a7	Balance in chart of accounts in both company and account currency	2015-12-02 12:28:06 +05:30
Nabin Hait	1c77506e80	[fix] Don't overwrite exchange rate on saving for bank transfer	2015-12-02 12:28:06 +05:30
Rushabh Mehta	29cca2352c	[hot] [fix] trial balance report	2015-12-01 18:17:33 +05:30
Rushabh Mehta	29f9f6c147	[fixes] [ux] get product bundle items only on po, mr and button on toolbar	2015-12-01 11:36:22 +05:30
Rushabh Mehta	37d9d6fdea	Merge pull request #4402 from nabinhait/allow_root_accounts ... [feature] Allowed custom root accounts in Chart of Accounts	2015-12-01 10:59:44 +05:30
Rushabh Mehta	0cc177f73c	Merge pull request #4400 from nabinhait/total_amount_in_jv ... [fix] Total Amount in Journal Entry in bank currency	2015-12-01 10:58:34 +05:30
Nabin Hait	8c4e043747	[feature] Allowed custom root accounts in Chart of Accounts	2015-12-01 10:34:43 +05:30
Nabin Hait	621f4cd7c9	[fix] Invoicing against drop-ship Purchase Order	2015-11-30 18:40:28 +05:30
Nabin Hait	6c173e9730	[fix] Total Amount in Journal Entry in bank currency	2015-11-30 16:13:42 +05:30
Nabin Hait	ec1695dbe3	[fix] Bank Reconciliation in account currency	2015-11-30 15:23:46 +05:30
Rushabh Mehta	32e55e174d	[minor] fix error message	2015-11-30 10:51:29 +05:30
Anand Doshi	563c243ec6	Revert "[hotfix] total amount in journal entry" ... This reverts commit 5b03a75970.	2015-11-27 17:38:17 +05:30
Anand Doshi	5b03a75970	[hotfix] total amount in journal entry	2015-11-27 17:24:06 +05:30
Anand Doshi	e38a53443a	Merge pull request #4386 from rmehta/bank-reco-bulk-edit ... [enhancement] bulk edit in bank reconciliation, #4356	2015-11-27 14:46:58 +05:30
Rushabh Mehta	2d70887aaf	[enhancement] bulk edit in bank reconciliation, #4356	2015-11-27 11:37:18 +05:30
Rushabh Mehta	b82bdd6f1f	[fix] total amount in journal entry	2015-11-26 09:08:07 +05:30
Anand Doshi	5c968abcef	[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0	2015-11-25 16:33:00 +05:30
Nabin Hait	c4f4c09e42	Get Items from Product Bundle button in purchase cycle	2015-11-23 12:51:37 +05:30
Nabin Hait	072c540ae3	[fix] Period closing account should be of type Liability / Equity	2015-11-23 09:52:08 +05:30
Nabin Hait	f649013079	Merge pull request #4329 from anandpdoshi/int-float-not-null ... [enhancement] Int, Currency, Float, Percent as not null and default to 0	2015-11-19 14:30:58 +05:30
Anand Doshi	120ea62acc	[fix] get_balance_on: convert date to string	2015-11-19 14:24:39 +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	5284b22c53	[fix] Mapping from negative outstanding invoice	2015-11-19 11:42:23 +05:30
Nabin Hait	343c1a5cbd	[fix] Mapping from Payment Tool	2015-11-19 11:42:22 +05:30
Saurabh	2e292060c5	[fix] Reserved and ordered qty fix for drop ship orders	2015-11-18 17:39:26 +05:30
Nabin Hait	b73f3da02c	Merge pull request #4332 from nabinhait/pi_fix ... [fix] Check Purchase Receipt mandatory only for stock items	2015-11-18 17:30:29 +05:30
Nabin Hait	f0607b45c5	Merge pull request #4334 from revant/patch-1 ... Mode of Payment validate	2015-11-18 17:29:54 +05:30
Nabin Hait	b45ca3ada0	Merge pull request #4331 from nabinhait/pcv_fix ... [fix] Allowed Equity accounts in closing account in Period Closing Voucher	2015-11-18 17:15:57 +05:30
Revant Nandgaonkar	27c266b081	improve mode_of_payment validate_accounts ... using frappe.db.get_value instead of frappe.get_list	2015-11-18 13:28:09 +05:30
Revant Nandgaonkar	11f8a0033a	Mode of Payment validate ... Error when Same Company is entered multiple times in accounts Error when Company of Ledger account doesn't match with Company Selected	2015-11-17 21:15:00 +05:30
Anand Doshi	da79740cdf	[fix] injection	2015-11-17 18:27:50 +05:30
Nabin Hait	2cf1699937	[fix] Check Purchase Receipt mandatory only for stock items	2015-11-17 17:32:07 +05:30
Nabin Hait	1a3413875f	[fix] Allowed Equity accounts in closing account in Period Closing Voucher	2015-11-17 17:12:44 +05:30
Anand Doshi	d40d1e9a59	[optimize] Payment Reconciliation and Payment Tool	2015-11-12 17:42:05 +05:30
Anand Doshi	c5c6c0669f	[fix] gross profit	2015-11-12 11:07:32 +05:30
Rushabh Mehta	739aa4d51a	[minor] allow pricing rule to have negative discount	2015-11-09 17:05:12 +05:30
Rushabh Mehta	64e31e9a4e	[fix] process payroll	2015-11-06 14:47:12 +05:30
Nabin Hait	c3ced9a0b5	[fix][report] Buying amount for product bundle in Gross Profit report	2015-11-05 13:13:31 +05:30
Rushabh Mehta	58101e9e6c	Merge pull request #4272 from nabinhait/report-fix1 ... [report] Added delay in payment column	2015-11-04 13:18:42 +05:30
Rushabh Mehta	666131d2fe	Merge pull request #4271 from saurabh6790/drop-shipping ... Exclude warehouse from drop ship and re-open status for DN / PR	2015-11-04 13:18:20 +05:30
Nabin Hait	b4a51ec80b	[report] Added delay in payment column	2015-11-04 13:09:48 +05:30
Saurabh	b7f0a4961e	- no delivery / reserve warehouse in drop ship ... - “Re-open” in DN / PR after “Stop” / “Close" - check for closed status in reports	2015-11-04 12:03:54 +05:30
Rushabh Mehta	bd4814fbb7	[fix] email digest periods for weekly and monthly	2015-11-03 16:55:33 +05:30
Rushabh Mehta	b1d8979a59	Merge pull request #4179 from saurabh6790/drop-shipping ... Drop shipping	2015-11-02 15:43:48 +05:30
Rushabh Mehta	ec2d0030b7	Merge pull request #4265 from nabinhait/jv_fix ... [cleanup] Make Payment Entry from Order/Invoice	2015-11-02 15:23:01 +05:30
Saurabh	7cd0ba70d9	[fixes] typo error	2015-11-02 15:18:23 +05:30
Nabin Hait	66340f9894	[cleanup] Make Payment Entry from Order/Invoice	2015-11-02 14:40:47 +05:30
Saurabh	a8a91cca16	[feature] Close feature for Purchase Receipt and Delivery Note	2015-11-02 12:57:08 +05:30
Saurabh	381385d19a	[fixes] add status 'Closed' in filter creating PR, PI from PO and SI, DN from SO	2015-11-02 11:30:51 +05:30
Saurabh	653cffec1e	[change_log and fixes] set print hide, add change_log	2015-10-29 19:43:35 +05:30
Saurabh	2f702dcb32	[fixes] bulk close facility, rename Drop Ship to Delivered By Supplier	2015-10-29 19:43:35 +05:30
Saurabh	f857d81f35	[fixes]test case to check updated delivered qty	2015-10-29 19:43:34 +05:30
Saurabh	8a8ef85174	[fixes] reviwe fixes	2015-10-29 19:43:33 +05:30
Saurabh	5e0b0b4b97	[enhance] make PO from SO if supplier is specified	2015-10-29 19:43:33 +05:30
Saurabh	a4efbf0db7	[fixes] check for close status	2015-10-29 19:43:33 +05:30
Saurabh	e930f0f74e	[fixes] filter on supplier list for DropShip, checking closed status	2015-10-29 19:43:33 +05:30
Saurabh	c6dbe70256	[Fixes] Drop Shipping	2015-10-29 19:43:32 +05:30
Nabin Hait	8372c44262	[fix] Default cost center as per company	2015-10-29 11:50:36 +05:30
Nabin Hait	6c6f3789d0	[fix] Is POS trigger	2015-10-26 18:01:12 +05:30
Nabin Hait	415df04834	[fix] Account Type in Chart of Accounts	2015-10-26 16:43:09 +05:30
Nabin Hait	6485d4a749	[fix] account currency is not mandatory in get exchange rate	2015-10-26 14:31:17 +05:30
Nabin Hait	8e3ea32d6d	Merge pull request #4222 from nabinhait/tax_rule ... Set tax rule based on date	2015-10-26 13:02:21 +05:30
Nabin Hait	00818bfa90	Set tax rule based on date	2015-10-23 16:26:09 +05:30
Nabin Hait	7a9f46d9d1	[fix] Value mapping while making bank entry from Expense Claim	2015-10-23 13:19:01 +05:30
Anand Doshi	0b93bdcf40	[fix] get_party_gle_currency caching	2015-10-22 19:33:08 +05:30
Anand Doshi	d8bc40d7f0	[fix] party gle currency validation	2015-10-22 17:55:22 +05:30
Nabin Hait	fbe08ec7d0	Period Closing Voucher Test Cases	2015-10-22 16:21:37 +05:30
Nabin Hait	0045c305ac	Period Closing Voucher as per multi currency	2015-10-22 16:21:37 +05:30
Nabin Hait	31c51ef914	[fix] test case for purchase invoice gle	2015-10-21 17:40:06 +05:30
Nabin Hait	be464696cc	[fix][patch] Fix wrong gle for Purchase Invoice against Expenses Included in Valuation account	2015-10-21 17:40:06 +05:30
Anand Doshi	87da662703	[enhancement] Quick Entry in Journal Entry, remember Posting Date	2015-10-21 16:27:13 +05:30
Nabin Hait	c35b35abca	[fix] Set higher precision for exchange rate field	2015-10-20 12:11:51 +05:30
Anand Doshi	9dad86c189	Merge pull request #4190 from nabinhait/income_expense_account_query ... [fix] Allowed accounts with account type='Income Account' for default income account in item	2015-10-19 15:43:32 +05:30
Nabin Hait	afd14f6f0e	[fix] Allowed accounts with account type='Income Account' for default income account in item	2015-10-19 15:27:58 +05:30
Nabin Hait	aa015902d5	Validate currency of default receivable/payable accounts	2015-10-19 15:10:11 +05:30
Nabin Hait	2873f2e7de	Validate currency of default receivable/payable accounts	2015-10-19 15:10:11 +05:30
Anand Doshi	1d093a4039	[fix] change attach fields to small text	2015-10-19 12:56:29 +05:30
Anand Doshi	d665a07621	[fix] remove label 'Column Break'	2015-10-16 15:44:28 +05:30
Rushabh Mehta	2e7f9d2b8f	[fixes] email digest	2015-10-15 16:31:16 +05:30
Anand Doshi	1d23ebb51d	[fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339	2015-10-15 12:54:40 +05:30
Rushabh Mehta	f861856ed9	[fix] do not check purchase invoice uniqueness for cancelled documents	2015-10-15 11:37:34 +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
Rushabh Mehta	c27748b2b3	Merge pull request #4040 from nabinhait/dn_target_warehouse ... Delivery to target warehouse	2015-10-14 15:29:54 +05:30
Nabin Hait	b445be3552	Test case for delivery to target warehouse	2015-10-13 15:46:42 +05:30
Nabin Hait	c865f229fb	Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status	2015-10-13 15:46:42 +05:30
Neil Trini Lasrado	f49b085625	Allowed Income account to be added to Cost Center	2015-10-13 14:54:39 +05:30
Rushabh Mehta	60f1739ca5	Merge pull request #4158 from rmehta/journal-entry-title-fix ... [fix] set title in Journal Entry only if not set	2015-10-12 18:35:49 +05:30
Rushabh Mehta	cefa106a06	Merge pull request #4151 from anandpdoshi/purchase-invoice-letterhead ... [fix] Added Letter Head field to Purchase Invoice	2015-10-12 18:30:25 +05:30
Rushabh Mehta	67ecfcf52c	Merge pull request #4148 from saurabh6790/erp_support ... [minor fix], escape % char	2015-10-12 18:30:13 +05:30
Rushabh Mehta	bc5ecfff06	Merge pull request #4146 from nabinhait/fix10 ... [fix] Multiple minor fixes	2015-10-12 18:27:02 +05:30
Rushabh Mehta	8fa4845d00	[fix] set title in Journal Entry only if not set	2015-10-12 16:59:52 +05:30
Anand Doshi	4b72d05793	[fix] get allocated_percentage from party's sales team	2015-10-12 16:15:52 +05:30
Anand Doshi	4fa69780a8	[fix] Added Letter Head field to Purchase Invoice	2015-10-12 15:55:24 +05:30
Nabin Hait	fc9031924e	[fix] Field type of Age field converted to Int	2015-10-12 15:47:07 +05:30
Saurabh	e14124198d	minor fix, escape % char	2015-10-12 15:08:09 +05:30
Nabin Hait	bcd655a985	Merge pull request #4109 from rmehta/fix-sales-purchase-order-status ... [fix] sales & purchase order status	2015-10-07 11:34:30 +05:30
Nabin Hait	c5a25f44e1	Merge pull request #4119 from nabinhait/fix3 ... [fix] Return account currency only if account provided	2015-10-07 11:25:19 +05:30
Nabin Hait	ebbd163903	[fix] allowed more than 2 currencies in Journal Entry	2015-10-05 13:21:38 +05:30
Nabin Hait	8954b24b22	[fix] Return account currency only if account provided	2015-10-04 12:27:46 +05:30
Rushabh Mehta	d10ba853e6	[fix] sales & purchase order status	2015-10-02 17:16:51 +05:30
Anand Doshi	1a1f790150	[fix] test case	2015-10-02 12:34:18 +05:30
Rushabh Mehta	3c54e9779b	Merge pull request #4108 from nabinhait/payment_reco ... [fix] Payment Reconciliation in multi-currency	2015-10-02 12:32:54 +05:30
Nabin Hait	db48b7d764	[fix] Payment Reconciliation in multi-currency	2015-10-02 12:05:55 +05:30
Rushabh Mehta	83c0899c83	[fix] [minor] default ranges for demo	2015-10-02 11:31:37 +05:30
Anand Doshi	d9ab725be4	[fix] In Payment Tool, Set Payment Amount = Outstanding Amount if checked	2015-10-01 19:17:02 +05:30
Nabin Hait	5c623dae4d	[fix] General Ledger report fixed	2015-10-01 11:22:15 +05:30
Anand Doshi	e2c3d40b57	[hotfix] Payment Reconciliation Invoice Type	2015-10-01 11:21:26 +05:30
Nabin Hait	72d2d682ae	Repost GL Entries for Journal Entries where reference name is missing	2015-09-30 18:50:54 +05:30
Anand Doshi	21f6ea6f7e	[hotfix] remove allow on submit from item tables	2015-09-30 18:45:29 +05:30
Anand Doshi	15d2c89939	Merge remote-tracking branch 'upstream/master' into develop ... Conflicts: erpnext/accounts/report/general_ledger/general_ledger.py	2015-09-30 17:13:58 +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
Anand Doshi	248c867a2c	[minor] removed test case for party multi-currency validation, since party multi-currency is now based on account	2015-09-30 15:11:13 +05:30
Anand Doshi	da98ab6f3c	[fix] Only 1 account per company for a party	2015-09-30 15:11:12 +05:30
Anand Doshi	cd0989e051	Added method get_account_currency	2015-09-30 15:11:12 +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
Nabin Hait	d3cf4f1264	Merge pull request #4075 from anandpdoshi/journal-entry-get-exchange-rate ... return exchange rate as 1 if no account is specified	2015-09-30 15:05:41 +05:30
Rushabh Mehta	89349d3ae3	[fix] [payment-reconciliation] ignore rows with blank invoice numbers	2015-09-29 16:39:53 +05:30
Anand Doshi	740a11263f	[minor] validate invoice number is selected in Payment Reconciliation	2015-09-29 12:55:11 +05:30
Anand Doshi	d6cb55ad1a	[fix] return exchange rate as 1 if no account is specified	2015-09-28 17:20:02 +05:30
Anand Doshi	6f39300d43	Merge pull request #4068 from anandpdoshi/due-date-validation ... if no party, don't validate due date based on credit days	2015-09-25 17:31:33 +05:30
Anand Doshi	0ca587e018	[fix] if no party, don't validate due date based on credit days	2015-09-25 16:32:14 +05:30
Rushabh Mehta	8ffe12ebe4	[chart-of-accounts] added default for Guatemala	2015-09-25 15:40:33 +05:30
Anand Doshi	8579af371c	Merge pull request #4057 from rmehta/gl-report-fix ... GL Report Fix	2015-09-25 12:30:26 +05:30
Nabin Hait	44bd3b2601	[fix] Fetch gl entries in receivable/payable report only if party mentioned	2015-09-25 10:33:51 +05:30
Nabin Hait	1b6c00e2c7	[report] Trial Balance for Party	2015-09-25 09:18:03 +05:30
Anand Doshi	3297c43bdf	[fix] Tax Rule permission to Account Manager	2015-09-24 17:29:28 +05:30
Anand Doshi	d37d4dfdec	[fix] applicable territory patch and tax rule tests	2015-09-24 15:44:39 +05:30
Anand Doshi	bba0a5d38f	[fix] [patch] tax rule	2015-09-24 15:11:24 +05:30
Rushabh Mehta	8f2b8afcb7	[fix] gl entry report if not filtered	2015-09-24 15:03:53 +05:30
Anand Doshi	e63da9813c	Merge remote-tracking branch 'frappe/master' into develop ... Conflicts: erpnext/patches.txt	2015-09-24 14:34:50 +05:30
Anand Doshi	361eca4cae	Merge pull request #4054 from anandpdoshi/sales-team-update-after-submit ... Sales Team editable after submit	2015-09-24 11:30:31 +05:30
Anand Doshi	e2d46d0474	[fix] Allow Sales Team to be added/updated after submit	2015-09-23 19:26:29 +05:30
Rushabh Mehta	307978fea9	[test-fixes]	2015-09-23 15:43:09 +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	8ffd483e24	[wip] shopping cart shipping rule, price list cleanup	2015-09-23 12:49:16 +05:30
Rushabh Mehta	3d76686b82	[shopping-cart] cart via Jinja WIP	2015-09-23 12:49:16 +05:30
Rushabh Mehta	abdfb4d3db	[fixed] New button in POS Sales Invoice, reported via forum	2015-09-23 12:05:51 +05:30
Nabin Hait	5b649521d1	[fix] Get outstanding invoices in Payment Reconciliation and Payment Tool	2015-09-22 13:06:34 +05:30
Anand Doshi	798e75832c	[fix] Show payment's invoice number as 'Invoice Type | Invoice Number' for better unsability	2015-09-22 12:59:43 +05:30
Nabin Hait	c0c94aef44	[fix] Get outstanding invoices in Payment Reconciliation and Payment Tool	2015-09-22 08:37:37 +05:30
Anand Doshi	e4dfeb651f	[optimization] get balance on	2015-09-21 19:31:43 +05:30
Anand Doshi	f7e6eb4fd7	[optimization] get balance on	2015-09-21 19:30:21 +05:30
Rushabh Mehta	97c858a5e3	[fix] pull sales team from customer	2015-09-21 10:03:38 +05:30
Rushabh Mehta	974892bf87	Merge pull request #4036 from rmehta/no-party-currency ... [fix] no default party currency	2015-09-18 13:40:42 +05:30
Rushabh Mehta	361df8993f	[fix] no default party currency	2015-09-18 12:59:51 +05:30
Nabin Hait	a48d754158	[fix] minor issue	2015-09-17 20:37:07 +05:30
Anand Doshi	26bcd89d10	[hotfix] journal entry - get balance	2015-09-17 20:36:44 +05:30
Anand Doshi	20fd360a63	[hotfix] journal entry - get balance	2015-09-17 20:36:19 +05:30
Nabin Hait	a8ef4c9220	[fix] minor issue	2015-09-17 19:38:11 +05:30
Nabin Hait	926ae17e5a	Update journal_entry.py	2015-09-17 18:42:55 +05:30
Nabin Hait	8adb5f3e32	Update journal_entry.py	2015-09-17 18:40:35 +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	70fed64cd5	Merge pull request #4029 from nabinhait/mc2 ... [fix] Account Currency and Balance fixed in chart of accounts #4019	2015-09-17 14:37:00 +05:30
Nabin Hait	59f4fa9a8c	[fix] Account Currency and Balance fixed in chart of accounts #4019	2015-09-17 13:57:42 +05:30
Nabin Hait	262ac09305	[fix] Currency symbol fixed in Accounts receivable/payable report #4020	2015-09-17 13:24:14 +05:30
Anand Doshi	12106725fb	[fix] set Payment Amount in Payment Tool	2015-09-17 12:59:44 +05:30
Anand Doshi	0b031cdd6c	[fix] ignore journal entry based invoice in payment tool and payment reconciliation tool	2015-09-16 12:46:54 +05:30
Saurabh	0bd145a608	[fixes] test cases and tax rule validation	2015-09-15 17:06:52 +05:30
Saurabh	c663f5c2bd	[Test] test state based taxasion	2015-09-15 15:41:01 +05:30
Saurabh	adde1cff48	[Enhancement] add state ccriteria in tax rule	2015-09-15 15:41:01 +05:30
Saurabh	7c867ae9ad	[Fixes] Tax Rule preparation and test taxes creation, remove dummy quotation	2015-09-15 15:41:01 +05:30
Saurabh	8f7317175d	[enhancement] bring taxes from tax rules and test cases	2015-09-15 15:41:01 +05:30
Saurabh	957e7a37be	[Shopping Cart][Fixes] tax calculation based on tax rule	2015-09-15 15:41:01 +05:30
Saurabh	def71d4d5d	[Shopping Cart][Fixes] tax calculation based on tax rule	2015-09-15 15:41:00 +05:30
Neil Trini Lasrado	ef511b160e	Added Tax Rule under ERPNext > Accounts > Setup	2015-09-15 15:41:00 +05:30
Neil Trini Lasrado	09f9c96c53	Fixes in Tax Rule	2015-09-15 15:41:00 +05:30
Neil Trini Lasrado	1a2d121073	Removed default taxes and charges from customer and supplier master. Added patch to create tax rules against customer/supplier	2015-09-15 15:41:00 +05:30
Neil Trini Lasrado	810bd35609	Apply Tax Rule based on Customer Selection in Sales / Purchase Transactions	2015-09-15 15:41:00 +05:30
Neil Trini Lasrado	949d7dbaba	Added validations, test-cases to Tax Rule	2015-09-15 15:41:00 +05:30
Neil Trini Lasrado	72e6aa160c	Added New Doctype Tax Rule	2015-09-15 15:41:00 +05:30
Anand Doshi	1fef2fad2d	[minor] fixes in queries and payment tool	2015-09-14 18:27:21 +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	71e51c179c	[fix] changed modified for multi-currency sync	2015-09-11 16:55:11 +05:30
Anand Doshi	4b8dbbdf98	[minor] Change modified of Sales Invoice.json	2015-09-11 16:39:03 +05:30
Anand Doshi	979326b0b1	minor fixes in multi-currency	2015-09-11 16:33:45 +05:30
Anand Doshi	5d9cfc76cd	Don't copy title field in Duplicate	2015-09-11 15:35:26 +05:30
Nabin Hait	8db7bd2d8f	[fix] Igonre permissions while saving Company and Warehouse from Accounts Settings	2015-09-11 15:34:42 +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	71ef6675ce	[fix] Journal Entry client side minor fixes	2015-09-10 19:25:50 +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
Nabin Hait	e3ae05aabd	Multi-currency: Exchange Rate in Journal Entry	2015-09-09 18:43:12 +05:30
Anand Doshi	9d5b84e78a	Merge pull request #3996 from nabinhait/fix6 ... Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order	2015-09-09 15:11:12 +05:30
Nabin Hait	83dd3e14e5	[fix] Gross Profit report should not include return entries	2015-09-09 10:37:04 +05:30
Nabin Hait	cd103c05d6	Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order	2015-09-08 19:24:35 +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
Nabin Hait	96bb070781	Payment against invoices where party not specified ... Conflicts: erpnext/accounts/doctype/gl_entry/gl_entry.py	2015-09-08 16:36:44 +05:30
Nabin Hait	d608363d7b	[fix] Map amount in advance payment entry agaionst SO/PO based on party account currency	2015-09-08 12:53:59 +05:30
Nabin Hait	b2739cbb79	Get average exchange rate in case of bank transfer	2015-09-08 12:18:45 +05:30
Nabin Hait	bf9691ed39	Multiple fixes	2015-09-07 10:40:48 +05:30
Rushabh Mehta	be9edae961	[fixes] to task test case and fix tree ui for mobile	2015-09-04 16:18:17 +05:30
Nabin Hait	3a53d49b7e	[fix] Set account and party balance in Journal Entry	2015-09-04 15:46:47 +05:30
Nabin Hait	4d62d7867e	[report] Bank Reconciliation Statement in account currency	2015-09-04 13:26:45 +05:30
Nabin Hait	c0e3b1a0c7	Removed account and party balance in company currency from Journal Entry	2015-09-04 13:26:23 +05:30
Nabin Hait	34fe81f7eb	Patch fixed	2015-09-03 19:18:00 +05:30
Nabin Hait	1609933748	Test cases for multi currency	2015-09-03 16:03:07 +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	bac9b8eef6	Payment Tool changes due to multi currency	2015-08-31 19:01:11 +05:30
Nabin Hait	76bb927337	Fixed conflict	2015-08-31 17:28:05 +05:30
Nabin Hait	699751c531	[report] Accounts Receivable / Payable in multi currency	2015-08-31 17:02:04 +05:30
Nabin Hait	06b15bfd63	[report] General Ledger in multi currency	2015-08-31 15:39:03 +05:30
Nabin Hait	1901ca5a45	[fix] Fixed gross profit report due to removal of designation field from Sales Team table	2015-08-31 12:02:50 +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
Nabin Hait	f6f38f2f2d	[new fields] Exchange Rate in Journal Entry and some properties changes in Journal Entry Account	2015-08-27 16:27:33 +05:30
Nabin Hait	9a9a4293b3	[new fields] Party Account Currency, Paid Amount and Write Off Amount in Acompany Currency	2015-08-27 16:26:38 +05:30
Nabin Hait	13d8835b75	Fixed merge conflict	2015-08-27 14:55:34 +05:30
Nabin Hait	2091f0c97e	Checked out json files from upstream	2015-08-27 14:35:17 +05:30
Anand Doshi	282e4947fa	[fix] Changed more section label to 'More Information'	2015-08-27 13:11:46 +05:30
Nabin Hait	54fe26dcfb	[patch] Multi currency	2015-08-27 12:55:24 +05:30
Nabin Hait	a12d959729	GL Entries for Sales/Purchase Invoice in multi currency	2015-08-27 12:27:24 +05:30
Rushabh Mehta	cd2d8a0410	[merge] re-applied changes to sales invoice & delivery note	2015-08-27 11:05:26 +05:30
Rushabh Mehta	5bec301929	Merge branch 'layout-cleanup' into develop ... Conflicts: erpnext/accounts/doctype/sales_invoice/sales_invoice.json erpnext/stock/doctype/delivery_note/delivery_note.json	2015-08-27 11:01:39 +05:30
Rushabh Mehta	491df14426	[minor] catch invalid item code in pricing list (via support ticket)	2015-08-27 10:31:28 +05:30
Rushabh Mehta	17679c6902	[layout cleanup] purchase, stock, journal entry	2015-08-26 22:20:38 +05:30
Anand Doshi	2b6bdc1edb	[fix] filter and validation of Debit To and Credit To accounts	2015-08-26 17:42:40 +05:30
Anand Doshi	7fa8fb984e	[fix] Show write off account	2015-08-26 16:48:41 +05:30
Anand Doshi	cb3a4caa44	[fix] removed validate due date in Journal Entry	2015-08-26 14:50:04 +05:30
Rushabh Mehta	f24f6044bd	[layout] cleaned up Sales Invoice	2015-08-26 10:51:44 +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
Nabin Hait	1f94fa25a8	Update delivered / ordered qty in sales/purchase order from return entry ... Reserved Qty logic cleaned up	2015-08-25 14:11:12 +05:30
Nabin Hait	3a990d946d	[fix] In general ledger report, consider cost center in group by voucher	2015-08-24 17:21:01 +05:30
Rushabh Mehta	da24698cf7	[minor] in ap, ar renamed label for date as 'as on date' as it was confusing	2015-08-24 14:31:07 +05:30
Nabin Hait	c561a499d7	Multi currency GL entry fixes	2015-08-21 14:31:47 +05:30
Nabin Hait	50ba6faaf6	Currency input from Chart of Accounts page	2015-08-21 14:31:47 +05:30
Nabin Hait	46bcbaf97b	GL Entry in account currency	2015-08-21 14:31:47 +05:30
Nabin Hait	0e46a9b86e	Journal Entry: client side triggers	2015-08-21 14:31:46 +05:30
Nabin Hait	e459cb4d09	Journal Entry: validate and post gle in multi currency	2015-08-21 14:31:46 +05:30
Nabin Hait	7dbd395781	Toggle alternative currency fields	2015-08-21 14:31:46 +05:30
Nabin Hait	6aea1c0da5	Currency validation in gl entry	2015-08-21 14:31:46 +05:30
Rushabh Mehta	aeab6c559c	[enhancement] multi-currency, added fields #1002	2015-08-21 14:31:46 +05:30
Nabin Hait	efc89f4395	[fix] payment amt against invoice outstanding	2015-08-20 11:30:44 +05:30
Anand Doshi	f3eeb601ad	Merge pull request #3908 from rmehta/text-editor ... [fix] changed text > text editor for description fields in tables	2015-08-19 16:48:06 +05:30
Nabin Hait	3922823bd6	[fix] Test case fixed for purchase cost against project	2015-08-19 14:23:13 +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	4765d75b83	[minor] fix typo	2015-08-19 12:50:44 +05:30
Rushabh Mehta	ad9156a6ae	[enhancement] POS print after save #385:wq:wq	2015-08-18 18:05:43 +05:30
Nabin Hait	dc76823a81	[fix] Get Balance only if account or party mentioned	2015-08-17 14:28:19 +05:30
Nabin Hait	cbfd387c0b	Included Party and reference name in Journal Entry Account grid view	2015-08-17 11:42:48 +05:30
Anand Doshi	04dfd7b98f	[fix] Journal Entry Reference Name query	2015-08-14 17:34:43 +05:30
Anand Doshi	e116cb596c	[hotfix] [report] payment period based on invoice date	2015-08-13 17:25:20 +05:30
Anand Doshi	5eb84352ec	Merge pull request #3868 from nabinhait/price_list_rate ... [fix] Reset price list rate based on Pricing Rule type	2015-08-13 15:10:08 +05:30
Anand Doshi	1580bf9ca4	Merge pull request #3869 from rmehta/pricing-rule-layout ... [minor] pricing rule layout	2015-08-13 15:08:54 +05:30
Rushabh Mehta	4c4c534dcd	[minor] pricing rule layout	2015-08-13 15:00:54 +05:30
Nabin Hait	0da11f1b10	[fix] Reset price list rate based on Pricing Rule type	2015-08-13 14:58:19 +05:30
Nabin Hait	2e54da2ea5	[fix] fraction issue in gl entry	2015-08-13 12:19:27 +05:30
Rushabh Mehta	ed40542658	[fix] minor auto-select party type and add has_permission in whitelisted methods	2015-08-13 10:34:49 +05:30
Rushabh Mehta	207b3efed7	[fix] journal entry get_query	2015-08-12 15:18:35 +05:30
Rushabh Mehta	3131c732ff	[fix] capacity planning error	2015-08-12 12:29:16 +05:30
Rushabh Mehta	1828c12481	[refactor] added dynamic link in journal entry, #3847	2015-08-12 12:28:33 +05:30
Nabin Hait	3c3a3ecea8	Additional Costs in Stock Entry	2015-08-10 14:07:45 +05:30
Nabin Hait	fc155c7712	Added tax table in stock entry	2015-08-10 14:07:01 +05:30
Nabin Hait	ea925d26a8	[fix] Made expense account non-mandatory in POS Profile	2015-08-10 12:57:05 +05:30
Nabin Hait	7c5124140e	[fix] Party / Account Validation message against Invoice	2015-08-06 12:58:53 +05:30
Nabin Hait	1648605950	[fix] Disabled OHADA system while fetching COA based on country	2015-08-05 15:56:05 +05:30
Nabin Hait	5bbe823106	[patch] Fix outstanding amount for original invoice for return entry	2015-08-03 19:19:11 +05:30
Nabin Hait	893db7a5c3	Allow payment against invoice with negative outstanding	2015-08-03 19:18:22 +05:30
Nabin Hait	433cdc960d	Update outstanding in original invoice from return invoice	2015-08-03 19:18:22 +05:30
Nabin Hait	4f2832ecd2	[fix] Allow against purchase invoice against credit amount row	2015-08-03 19:18:22 +05:30
Nabin Hait	b3b059b0ea	[fix] payment reconciliation	2015-08-03 19:18:21 +05:30
Nabin Hait	03bccb81d8	[test case] Test case for discount amount on net total	2015-08-03 19:11:44 +05:30
Nabin Hait	94f15fcec6	Propogate root type and report type into children based on parent	2015-08-03 11:17:07 +05:30
Anand Doshi	ba9dbb1b09	[minor] removed Link/DocType in Payment Period Based on Invoice Date	2015-08-03 11:05:45 +05:30
Nabin Hait	67079d292c	Merge pull request #3725 from neilLasrado/test ... Fixed test cases related to Time Logs	2015-07-30 11:51:26 +05:30
Neil Trini Lasrado	d851bd8d85	Fixed test cases related to Time Logs	2015-07-29 18:48:58 +05:30
Nabin Hait	fcc4021e44	minor fix in payment reconciliation	2015-07-29 17:41:51 +05:30
Nabin Hait	453cc374d4	- Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice ... - Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered - Make packing list on validate	2015-07-29 15:59:57 +05:30
Nabin Hait	43e46a8506	Merge pull request #3733 from nabinhait/fix3 ... POS Profile: removed income account, cost center, territory and bank/cash account from mandatory	2015-07-29 15:57:05 +05:30
Nabin Hait	e95c18a42d	Merge pull request #3744 from nabinhait/return ... Sales / Purchase Return Improvements	2015-07-29 15:51:34 +05:30
Nabin Hait	746c162055	Return status in listview for return entry	2015-07-29 14:54:33 +05:30
Nabin Hait	9eb9ccd785	Make Debit / Credit Note button in Purchase / Sales Invoice	2015-07-29 13:23:37 +05:30
Nabin Hait	1e046aa49a	Hide buttons for return entry	2015-07-29 13:16:37 +05:30
Nabin Hait	3ad26e4dd1	Fix Against Voucher in GL Entry for return against purchase invoice	2015-07-29 13:15:57 +05:30
Rushabh Mehta	1e8025b327	[cleanup] yes/no selects changed to checks in Item	2015-07-29 11:38:33 +05:30
Nabin Hait	26052df76e	POS Profile: removed income account, cost center, territory and bank-cash account from mandatory	2015-07-28 15:12:54 +05:30
Neil Trini Lasrado	ff3b220c79	Fixed gl_entry Validation	2015-07-28 12:23:14 +05:30
Neil Trini Lasrado	cc7cb2a70a	Allowed frozen_accounts_modifier to create records against frozen customer/supplier	2015-07-28 12:17:03 +05:30
Neil Trini Lasrado	79bf233734	Test Cases added to check if customer is frozen	2015-07-28 12:17:03 +05:30
Neil Trini Lasrado	3fbbb71afc	Added ability to freeze Customer/Supplier	2015-07-28 12:17:02 +05:30
Anand Doshi	14859faf17	[minor] Accounts Payable Report Type='Script Report'	2015-07-24 17:30:39 +05:30
Nabin Hait	2b7eda8135	Merge pull request #3683 from nabinhait/return ... Sales / Purchase Return Enhancement	2015-07-24 16:53:01 +05:30
Anand Doshi	751d7ecd85	Merge pull request #3716 from tmimori/develop ... Removed HTML from messages	2015-07-24 14:28:59 +05:30
Nabin Hait	21897e3c52	Merge pull request #3714 from nabinhait/fix4 ... [fix] gross profit report	2015-07-24 14:25:35 +05:30
Tsutomu Mimori	196a0bc675	Amend for frappe/erpnext/pull/3716	2015-07-24 17:06:00 +09:00
Nabin Hait	3cf67a462b	Cleanup and test cases for serialized item	2015-07-24 13:26:54 +05:30
Nabin Hait	04d244a360	Credit Note print format	2015-07-24 13:26:54 +05:30
Nabin Hait	b74999da82	[testcase] Testcase for return purchase invoice	2015-07-24 13:26:53 +05:30
Nabin Hait	246ed3f122	Test cases for sales return	2015-07-24 13:26:53 +05:30
Nabin Hait	1d21842f68	Sales / Purchase Return redesigned via negative DN / SI / PR / PI	2015-07-24 13:26:53 +05:30
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
Nabin Hait	f666535223	[fix] gross profit report	2015-07-23 17:08:44 +05:30
Nabin Hait	08fb19ac8c	Validation on Account for assigning budget	2015-07-23 16:59:43 +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	fec61fe33e	[minor] fix report type for Accounts Payable	2015-07-23 10:39:13 +05:30
Nabin Hait	e2b8ccf1bb	[report] Letter Head option in General Ledger report	2015-07-21 12:02:36 +05:30
Anand Doshi	83694fd180	[minor] removed is_group from search fields of Account	2015-07-20 13:26:22 +05:30
Nabin Hait	1be94efcfa	[fix] Fetch debit/credit from reference journal entry	2015-07-17 17:25:52 +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	9490c21b8a	Merge pull request #3641 from rmehta/role-rename ... [rename] Material User > Stock User	2015-07-14 12:10:48 +05:30
Anand Doshi	e8861e2871	Merge pull request #3649 from rmehta/purchase-invoice-fix ... [fix] supplier invoice number fix	2015-07-14 11:50:07 +05:30
Rushabh Mehta	1956028ddc	[fix] supplier invoice number fix	2015-07-14 10:26:50 +05:30
Rushabh Mehta	a87dc3b4e6	[minor] move position in accounts settings	2015-07-14 10:22:07 +05:30
Rushabh Mehta	94157334a7	[rename] Material User > Stock User	2015-07-13 15:06:12 +05:30
Neil Trini Lasrado	fe2ffaeafa	Fixes in Production Planning Tool	2015-07-13 12:41:28 +05:30
Neil Trini Lasrado	09a66c4201	Fixed issue with Customer Contacts in Transaction Documents	2015-07-13 12:41:27 +05:30
Neil Trini Lasrado	ed8cecbdd8	Sales BOM renamed to Product Bundle	2015-07-13 12:41:27 +05:30
Rushabh Mehta	f3b0b95b15	[fix] [filter] for general ledger	2015-07-13 10:24:25 +05:30
Nabin Hait	93d3c82737	minor fix in due date validation	2015-07-10 17:12:08 +05:30
Nabin Hait	6c4085fc0c	Merge pull request #3616 from nabinhait/credit_days ... Customer's credit days based on fixed days / last day of the next month	2015-07-10 16:16:14 +05:30
Nabin Hait	c37484c8da	Merge pull request #3622 from rmehta/minor-fixes ... [fix] cart and general leger report	2015-07-10 16:12:01 +05:30
Rushabh Mehta	fc3d87181a	[fix] cart and general leger report	2015-07-10 10:11:07 +05:30
Nabin Hait	6336ff7323	minor fixes	2015-07-09 19:48:21 +05:30
Nabin Hait	122e4e0a96	Currency symbol fixed in sales invoice outstanding and advance amount	2015-07-09 17:36:58 +05:30
Nabin Hait	40e92b679b	Posting date trigger function commonified	2015-07-09 17:12:23 +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
Nabin Hait	e594e5de49	Merge pull request #3596 from neilLasrado/pos ... Mode of Payment added to POS Profile	2015-07-08 15:36:30 +05:30
Neil Trini Lasrado	75b00e3958	Mode of Payment added to POS Profile	2015-07-08 14:43:47 +05:30
Nabin Hait	28a9e35de9	Validate item rate with reference document with tolerance 0.009	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
Rushabh Mehta	6b35ea873b	[fix] against account in general ledger will show party	2015-07-02 14:25:51 +05:30
Nabin Hait	04fb1c7fe4	Merge pull request #3550 from neilLasrado/item-desc ... Image feild added to Sales Invoice & Purchase Invoice	2015-07-02 14:17:52 +05:30
Nabin Hait	885c70984d	[fix] Always show Sales invoice in Gross profit report	2015-07-02 14:09:49 +05:30
Neil Trini Lasrado	9c15ef903d	Image feild added to Sales Invoice & Purchase Invoice	2015-07-02 13:09:57 +05:30
Nabin Hait	56bc215855	Merge pull request #3505 from neilLasrado/print-format ... Recurring Invoice Print Format	2015-06-29 18:54:24 +05:30
Nabin Hait	11243a4fb4	Show amount in Journal Entry list view	2015-06-29 18:38:38 +05:30
Neil Trini Lasrado	e2d8dd0663	added recurring print format to sales/purchase invoice and order	2015-06-29 12:50:41 +05:30
Nabin Hait	93cdee4503	[fix] Escape values in queries	2015-06-27 12:51:00 +05:30
Nabin Hait	818d9674d9	[fix] Update outstanding amount function fixed if party not mentioned	2015-06-22 18:21:38 +05:30
Nabin Hait	c3b492b237	[fix] Auto remarks in Journal Entry based on company currency	2015-06-22 07:52:38 +05:30
Nabin Hait	9d0dd5066a	Removed 'Root Type' validation for receivable/payable account in sales/purchase invoice	2015-06-22 07:32:46 +05:30
Nabin Hait	e7f479b26a	Validate accounting entry agaist Stock account if perpetual inventory enabled	2015-06-22 07:31:49 +05:30
Nabin Hait	be496bc91c	[fix] Trial Balance opening	2015-06-18 10:33:20 +05:30
Nabin Hait	59f063e5c3	[fix] opening balance in general ledger report	2015-06-18 10:33:20 +05:30
Nabin Hait	e91025c0aa	[fix] Opening balance in trial balance and general ledger based on is_opening	2015-06-17 15:35:06 +05:30
Nabin Hait	1ac9f2f50d	[fix] Opening balance in trial balance and general ledger based on is_opening	2015-06-17 15:09:40 +05:30
Nabin Hait	9c852108d0	Added index in sales/purchase invoice and fix in index patch	2015-06-16 16:48:47 +05:30
Nabin Hait	a123638d37	[fix][report] Payment period based on invoice date	2015-06-16 15:21:00 +05:30
Nabin Hait	7c5ba957ac	Label changed for discount amount in base currency	2015-06-15 15:47:07 +05:30
Nabin Hait	65922d3079	[fix] supplier invoice date can not be after posting date	2015-06-15 10:23:53 +05:30
Nabin Hait	810041cbe3	[fix] Fixed error due to performance upgrade cleanup	2015-06-15 10:20:11 +05:30
Nabin Hait	39046d663d	[patch] Add index on Account and GL Entry table	2015-06-14 20:59:28 +05:30
Nabin Hait	6b01abe9ad	[report][performance] Speed increased by approx 10 times in Trial Balance, General Ledger, AR/AP, Balance Sheet and P&L Statement	2015-06-14 20:59:28 +05:30
Nabin Hait	e4f689184f	Merge pull request #3459 from neilLasrado/po ... Multiple Fixes.	2015-06-12 17:55:23 +05:30
Neil Trini Lasrado	1792ff3be7	Validation added in Purchase Invoice to check if Supplier Invoice Date is greater than Posting Date ... Check Supplier Invoice Number Uniqueness setting added to Accounts Settings Validation added in Purchase Invoice to check Supplier Invoice Number Uniqueness if Check Supplier Invoice Number Uniqueness is enabled in Accounts Settings	2015-06-11 18:36:52 +05:30
Nabin Hait	804b4acb9b	[fix] Issue fixed in C-Form related to field renaming	2015-06-11 16:56:36 +05:30
Nabin Hait	4cee27eec0	Merge pull request #3446 from anandpdoshi/anand-june-9 ... POS - search by Item Group	2015-06-10 18:42:14 +05:30
Nabin Hait	53d94996ad	[fix] Query for Against Journal Entry	2015-06-10 18:20:18 +05:30
Anand Doshi	26f6752c1e	POS - search by Item Group	2015-06-09 16:33:46 -04:00
Nabin Hait	909f0c38f1	[report][enhancement] Payment period based on invoice date: show party columns and filter based on party	2015-06-09 18:42:52 +05:30
Nabin Hait	b63ad44b10	Book in round-off account upto max 0.05	2015-06-08 14:15:12 +05:30
Nabin Hait	5ef121bc10	get party details only if party exists	2015-06-08 14:15:11 +05:30
Nabin Hait	27d7f21553	[fix] pos profile link in Start POS page	2015-06-05 15:09:44 +05:30
Nabin Hait	0b18a2d347	Reset values in tools like Payment Tool	2015-06-05 12:01:29 +05:30
Nabin Hait	c9963f1805	[fix] journal entry against expense claim: pending amount validation	2015-06-03 18:01:09 +05:30
Nabin Hait	8a2b1bcb97	[fix] bank reconciliation: fetch journal entry order by posting date asc	2015-06-03 18:01:09 +05:30
Nabin Hait	7d04dd0bfd	Merge pull request #3408 from williamjmorenor/patch-1 ... Update Chart of Account for Nicaragua	2015-06-03 17:17:09 +05:30
Nabin Hait	352187bee6	purchase register fix	2015-06-03 12:06:19 +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
Nabin Hait	5359f2651a	[fix] sales register report	2015-06-03 11:24:37 +05:30
William Moreno	42dcffdad4	Update Chart of Account for Nicaragua ... Hi The Law 891 reform some taxes rates, please update the Chart of Account for Nicaragua so it can reflect the new tax rates.	2015-06-02 16:48:47 -06:00
Nabin Hait	11190268ab	[fix][patch] GL Entries for Journal Entries with multiple Party, merge entries considering party	2015-06-01 16:21:25 +05:30
Nabin Hait	3ebfad7115	minor fixes	2015-06-01 14:01:56 +05:30
Nabin Hait	c7ef8dda79	[fix] Pricing Rule based on qty	2015-06-01 14:01:56 +05:30
Nabin Hait	8908543a9c	In standard print format, item name will now honour 'Print Hide' property	2015-06-01 14:01:56 +05:30
Rushabh Mehta	065badc54b	[minor] move buttons from sales invoice to toolbar	2015-05-31 10:36:47 +05:30
Rushabh Mehta	2c30acdcb2	[minor] journal entry, copy over party details to new row and automatically set difference	2015-05-29 16:33:36 +05:30
Rushabh Mehta	a3e9dbbcc3	Merge pull request #3374 from nabinhait/develop ... Make gl entry for rounded-off amount	2015-05-29 14:20:20 +05:30
Rushabh Mehta	b0b446e899	[fix] cleanup tables from description and re-sync print format	2015-05-29 12:44:33 +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	6ee8c545e3	[fix] gross profit report	2015-05-29 10:39:09 +05:30
Nabin Hait	3c67146e4b	Make gl entry for rounded-off amount	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
Nabin Hait	86e479f908	Merge pull request #3355 from rmehta/purchase-invoice-fixes ... [minor] remove letter head / terms from purchase invoice, fixes #3328, #3345	2015-05-28 11:19:22 +05:30
Rushabh Mehta	c185734bf3	[minor] remove letter head / terms from purchase invoice, fixes #3328, #3345	2015-05-28 11:17:22 +05:30
Rushabh Mehta	88655890be	[fix] [refactor] pos hangs in multi-company, if company is not set	2015-05-28 11:11:25 +05:30
Nabin Hait	10026ea85c	Merge pull request #3354 from rmehta/discount-field-relabel ... [cleanup] rename discount and reserver warehouse #3325	2015-05-28 11:02:51 +05:30
Pratik Vyas	f52b5ac8af	Merge pull request #3339 from rmehta/help ... [help] added links in modules, added learn desktop module	2015-05-27 15:21:00 +05:30
Nabin Hait	5b8db3729c	[fix] General ledger print format	2015-05-27 13:02:59 +05:30
Rushabh Mehta	69fb13f229	[cleanup] rename discount and reserver warehouse #3325	2015-05-27 12:20:07 +05:30
Nabin Hait	d4c8dc2915	multiple minor fixes	2015-05-26 16:32:30 +05:30
Rushabh Mehta	f29a618b69	[email] [website] footer cleanup	2015-05-26 12:15:39 +05:30
Rushabh Mehta	6771240471	[help] added links in modules, added learn desktop module	2015-05-25 18:31:08 +05:30
Nabin Hait	f61f76ba45	[fix] gross profit report	2015-05-25 14:13:03 +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
Rushabh Mehta	3bc3384bc4	[minor] remove section headings	2015-05-21 15:06:51 +05:30
Nabin Hait	4c924bb76c	totals etc should not be clickable	2015-05-21 13:38:03 +05:30
Nabin Hait	6789680fa3	Merge pull request #3302 from rmehta/fix-report-strings ... [fix] totals etc should not be clickable	2015-05-21 13:18:22 +05:30
Rushabh Mehta	555fa4fbc2	[fix] totals etc should not be clickable	2015-05-20 17:21:53 +05:30
Rushabh Mehta	a27cca97b5	[rename] POS Setting > POS Profile #3271	2015-05-20 15:43:17 +05:30
Nabin Hait	a7bd8ee34b	Update utils.py	2015-05-20 12:53:04 +05:30
Nabin Hait	8d50eb32c1	validate diabled fiscal year	2015-05-20 12:26:21 +05:30
Nabin Hait	0cf9469f86	validate disabled fiscal year	2015-05-19 18:44:02 +05:30
Nabin Hait	c602396366	validation message improved	2015-05-19 16:30:16 +05:30
Nabin Hait	6684c470c5	Merge pull request #3287 from rmehta/customer-fix ... Customer fix	2015-05-19 15:33:06 +05:30
Pratik Vyas	803e998e9d	Fix merge mistakes	2015-05-19 13:08:54 +05:30
Rushabh Mehta	5495bc54a5	[enhancement] default terms in company, fixes #3231	2015-05-19 13:03:01 +05:30
Pratik Vyas	1a84d8ecd2	Merge branch 'develop'	2015-05-19 12:23:52 +05:30
Nabin Hait	0a705fe582	gross profit report fix	2015-05-19 11:12:06 +05:30
Rushabh Mehta	5b69a93871	[test-fix] circular reference	2015-05-18 12:15:35 +05:30
Nabin Hait	a6ee8290ce	Inclusive tax for deduction and manipulation of tax amount to fix rounding issue	2015-05-15 12:02:27 +05:30
Nabin Hait	b45d4e0e16	In general ledger report opening amount is purely based on posting date	2015-05-12 17:40:14 +05:30
Nabin Hait	4ed40be3c2	remove toggling SO and DN field in SI based on pos	2015-05-12 15:26:45 +05:30
Nabin Hait	2d76825936	remove toggling SO and DN field in SI based on pos	2015-05-12 15:24:55 +05:30
Nabin Hait	4b9b92ba2f	minor fix in report	2015-05-12 15:12:30 +05:30
Nabin Hait	ffc7f3fef6	Apply default taxes on loading of document	2015-05-12 15:07:02 +05:30
Rushabh Mehta	ab1ed013b3	[hot] taxes	2015-05-08 11:09:25 +05:30
Rushabh Mehta	bcdea3ea51	[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template	2015-05-06 18:45:47 +05:30
Nabin Hait	a0b1124d6f	minor fix in report	2015-05-06 11:59:43 +05:30
Rushabh Mehta	4f41bb35b9	Merge pull request #3192 from neilLasrado/purchase-costing ... Purchase costing in Projects	2015-05-05 10:59:11 +05:30
Nabin Hait	ba43afc461	fix in chart of cost centers	2015-05-01 16:41:15 +05:30
Nabin Hait	2ca18ff913	Stock Entry validation in Journal Entry	2015-05-01 12:46:59 +05:30
Rushabh Mehta	5dbf8a7418	[cleanup] frappe.get_user	2015-05-01 11:51:26 +05:30
Anand Doshi	e6ac87e86f	Gross Profit Report: Company filter should be reqd	2015-04-30 15:33:31 -07:00
Neil Trini Lasrado	42a554e5cb	fixes in Purchase Invoice	2015-04-30 13:06:02 +05:30
Neil Trini Lasrado	01720404db	fixes in Test Cases	2015-04-30 13:06:02 +05:30
Neil Trini Lasrado	349461e9e6	Test Cases Added	2015-04-30 13:06:02 +05:30
Neil Trini Lasrado	9a56764bf2	Total Purchase Cost added to Projects	2015-04-30 13:06:02 +05:30
Nabin Hait	4716278f69	minor fix in chart of cost centers	2015-04-29 19:12:46 +05:30
Nabin Hait	2db8dc922a	fixed trial balance related to showing zero balance	2015-04-29 18:39:33 +05:30
Nabin Hait	6e59aca394	[enhancement] sort root accounts as assets, liability, equity, income, expense	2015-04-29 13:08:00 +05:30
Nabin Hait	59ab65ded6	fixed trial balance related to showing zero balance	2015-04-29 13:08:00 +05:30
Rushabh Mehta	0590cdceab	[enhancement] sort root accounts as assets, liability, equty, income, expense	2015-04-29 12:26:15 +05:30
Nabin Hait	081935eff7	[fix] fetch bank/cash account	2015-04-28 19:08:42 +05:30
Nabin Hait	2ff177a4fb	fix for opening purchase invoice	2015-04-28 17:17:37 +05:30
Nabin Hait	47e5c764c3	[fix] accounts payable report	2015-04-28 16:45:32 +05:30
Nabin Hait	b1b95526c6	Update sales_invoice.js	2015-04-28 13:56:48 +05:30
Nabin Hait	872eaf1541	Update purchase_invoice.js	2015-04-28 13:56:17 +05:30
Nabin Hait	aef76bfa1d	Update journal_entry.js	2015-04-28 13:55:04 +05:30
Nabin Hait	5616ff417c	Account type Temporary and removed Aging Date field from all documents	2015-04-27 18:08:51 +05:30
Rushabh Mehta	50ce9753e0	[minor] added cache in get_value	2015-04-27 13:13:50 +05:30
Rushabh Mehta	6894b9e457	[minor] only one Temporary Opening account	2015-04-24 14:22:54 +05:30
Nabin Hait	01e4c8f0f8	fix in chart of accounts	2015-04-23 16:29:15 +05:30
Rushabh Mehta	38c6b52770	[rename] group_or_ledger to is_group	2015-04-23 13:14:17 +05:30
Nabin Hait	b650d691a0	fixed conflict	2015-04-21 17:16:28 +05:30
Rushabh Mehta	50918a8fcf	[pos] fixes #3138, #3140	2015-04-21 14:38:48 +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
Nabin Hait	5c7f0bcb32	Party filter and columns in general ledger report	2015-04-20 17:13:53 +05:30
Nabin Hait	44aaa56000	get standard chart of account if country code not found	2015-04-20 11:51:54 +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	4743cbe002	issue fixed in accounts receivable report	2015-04-17 15:55:19 +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	1a6299176a	delete gl entries on cancellation of sales invoice, if grand total is zero	2015-04-16 19:22:42 +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	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	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	de9bd108d0	[usability] journal entry type fixes #3085	2015-04-14 14:10:19 +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
Anand Doshi	c994647704	fixed test cases	2015-04-08 21:22:36 +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	c13c4f014e	[fix] editable amount in Purchase Taxes and Charges	2015-04-03 14:55:51 +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	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	8ea1ed143b	Show write-off section if pos or advance payment	2015-04-01 16:25:55 +05:30
Anand Doshi	dd77287cb9	[fix] fiscal year auto-create	2015-04-01 08:26:32 +05:30
Anand Doshi	6208c49859	Added Company field in various Query Reports	2015-03-30 15:21:20 +05:30
Nabin Hait	7057970c0c	purchase order items to be billed report	2015-03-26 11:05:13 +05:30
Rushabh Mehta	eb928b950f	[fix] journal entry 3 cols, default weekly digest	2015-03-25 17:34:20 +05:30
Nabin Hait	a3eec1603a	fixed against jv query	2015-03-24 14:49:09 +05:30
Nabin Hait	53450b08b0	Fixes in general ledger report	2015-03-24 13:13:25 +05:30
Nabin Hait	d2af60c825	Root Equity added in standard chart of accounts and finalized chart of India And UAE	2015-03-23 16:08:32 +05:30
Nabin Hait	da5cfb1630	Exchange rate upto 9 decimals	2015-03-23 14:51:45 +05:30
Nabin Hait	ca7e778f82	modified date updated	2015-03-23 14:17:59 +05:30
Nabin Hait	2df422de25	Test case fixes	2015-03-18 14:57:09 +05:30
Nabin Hait	a1bf43b1a6	Merged develop into v5	2015-03-17 10:50:47 +05:30
Nabin Hait	d3fd8965de	test case fixed	2015-03-17 10:15:19 +05:30
Anand Doshi	9d9e31f4e8	moved get_list_context to module	2015-03-13 12:48:05 +05:30
Nabin Hait	7c9d003917	Test case cleanup and fixes	2015-03-13 08:14:46 +05:30
Nabin Hait	c8c1d1c693	Test case fixes	2015-03-13 08:14:45 +05:30
Sambhaji Kolate	98dbccd1d6	added actual_batch_qty at warehouse in DN & SI #1873	2015-03-10 15:04:28 +05:30
Rushabh Mehta	f5f0d5a83a	[breadcrumbs] refactor	2015-03-09 15:48:16 +05:30
Nabin Hait	081c3ec476	c-form message issue	2015-03-09 15:11:34 +05:30
Anand Doshi	c0eb8c0de3	Fixed some Stock Entry test cases	2015-03-08 12:42:18 +05:30
Anand Doshi	1119fb4c00	Fixed Sales Invoice test cases	2015-03-06 20:50:51 +05:30
Anand Doshi	ec5ec60764	Fixed Test Cases	2015-03-05 19:31:40 +05:30
Rushabh Mehta	06a6bcce17	[fixes] pos, chart of accounts	2015-03-05 16:38:43 +05:30
Rushabh Mehta	c4dce99f4b	[fixes] pos #2830, #2795	2015-03-05 15:09:04 +05:30
Nabin Hait	b50833a1e8	Fields alignment	2015-03-04 16:14:02 +05:30
Nabin Hait	95ff2d4fed	discount loss adjustment in base currency	2015-03-04 16:02:21 +05:30
Rushabh Mehta	2cc585f180	[git fixes] salary manager, time log title, notificaitons	2015-03-03 16:06:54 +05:30
Rushabh Mehta	e693f794f5	[subcontract] refactor, make stock entry from PO	2015-03-03 15:50:24 +05:30
Nabin Hait	49ecbd7353	Sales invoice query in journal entry	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
Nabin Hait	c7aba3331b	verified chart of accounts	2015-03-03 14:07:21 +05:30
Rushabh Mehta	b83fa3bc2d	[pos] [barcode] fixes #2831	2015-03-02 18:25:14 +05:30
Nabin Hait	ad7ece63fe	Update sales_invoice.py	2015-02-27 22:45:28 +05:30
Anand Doshi	5bd8cfd9fe	[fix] queries	2015-02-26 12:40:58 +05:30
Nabin Hait	851c745fdf	Merge branch 'develop' of https://github.com/frappe/erpnext into v5.0	2015-02-26 12:32:04 +05:30
Nabin Hait	836f9f34e4	warehouse mandatory in sales invoice if update_stock	2015-02-26 11:40:20 +05:30
Nabin Hait	79ffc2b3a7	fix in financial statements	2015-02-25 18:32:25 +05:30
Rushabh Mehta	2a21bc9fc2	[taxes and charges] refactor	2015-02-25 15:08:57 +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
Nabin Hait	7ce2f55ca9	print_hide for total_taxes_and_charges in buying	2015-02-24 16:06:14 +05:30
Nabin Hait	903c42a130	multiplefixes	2015-02-24 15:24:49 +05:30
Anand Doshi	d57e793bf3	[fix] Added unicode_literals if missing in py files	2015-02-24 12:24:53 +05:30
Nabin Hait	82e3e25cdb	fixes for base_rate, base_amount, tax_amount: mass search and replace	2015-02-24 10:02:28 +05:30
Nabin Hait	37b047d9a8	Fields added in all sales and purchase doctypes	2015-02-24 10:02:28 +05:30
Nabin Hait	613d081a60	Validate taxes and charges input, commonified	2015-02-24 10:02:28 +05:30
Nabin Hait	ce24512ed7	Commonified sales/purchase taxes and charges master.js code	2015-02-24 10:02:27 +05:30
Nabin Hait	e7679703cf	Taxes and totals calculation in party currency	2015-02-24 10:02:27 +05:30
Anand Doshi	f9fc04ce8e	Website Listing	2015-02-23 22:34:27 +05:30
Rushabh Mehta	a1da88a3d3	[capacity planning] automatically plan Time Logs from Production Order	2015-02-23 20:18:38 +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	364054a6fc	[fix] payment tool #2791	2015-02-21 14:39:35 +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	d51a47155b	[fixed] #2614	2015-02-20 10:39:39 +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
Nabin Hait	fe81da2dd1	listview indicator fix	2015-02-18 12:23:18 +05:30
Nabin Hait	da5f766dd5	fixed conflict	2015-02-18 11:55:13 +05:30
Anand Doshi	8c0f05fbae	[minor] grid report loading	2015-02-17 19:53:23 +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	cdb8e374e3	Merge pull request #2727 from neilLasrado/voucher-type ... journal entry - accounts table cannot be blank - validation added	2015-02-17 14:07:44 +05:30
Nabin Hait	6f0a3ed8d4	fixed conflict	2015-02-17 11:12:04 +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	dd1c2d3018	Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc	2015-02-12 13:31:48 +05:30
Nabin Hait	4a149c0791	Chart of accounts cleanup for Nicaragua	2015-02-12 12:39:32 +05:30
Nabin Hait	461ee2ebae	Renamed total fields	2015-02-12 11:47:45 +05:30
Nabin Hait	0c0749a884	Merge pull request #2721 from williamjmorenor/v5.0 ... Add chart of accounts template for Nicaragua	2015-02-12 11:46:43 +05:30
William Moreno	5b72e21186	Final Fixing ... I will no make other changes, please can chech the JSON	2015-02-11 16:57:43 -06:00
William Moreno	a05e6df3f5	Minor Fix	2015-02-11 15:48:41 -06:00
William Moreno	dab1db9874	Minor Fix	2015-02-11 15:43:40 -06:00
William Moreno	8e5e414276	Minor fix	2015-02-11 15:38:27 -06:00
William Moreno	92774e4743	Minor fix	2015-02-11 15:36:14 -06:00
William Moreno	c2037c5444	Add root_type and account_type	2015-02-11 15:06:58 -06:00
William Moreno	0a582ec885	Validate JSON	2015-02-11 12:41:11 -06:00
William Moreno	df023bd8ad	Best accounts tax details	2015-02-11 12:38:51 -06:00
William Moreno	f2bf17f2e2	Best IFRS for SMES compatibility	2015-02-11 12:06:40 -06:00
William Moreno	43d39f8e4d	Best IFRS for SMES compatibility	2015-02-11 11:57:22 -06:00
William Moreno	6b34bca7d0	Best IFRS for SMES compatibility	2015-02-11 11:53:45 -06:00
William Moreno	6fd091d979	Rearrange accounts to improve readability	2015-02-11 09:36:03 -06:00
William Moreno	7d7113328d	Change Style => TITLE to Title	2015-02-11 09:22:55 -06:00
William Moreno	1caea2ebae	Fix missing Comma (,) ... Yes, I did not validate the last edit to the JSON before commit, sorry	2015-02-11 07:39:23 -06:00
Neil Trini Lasrado	802d717a9e	fixes	2015-02-11 17:27:58 +05:30
Neil Trini Lasrado	934d63de16	journal entry - accounts table cannot be blank - validation added	2015-02-11 17:05:41 +05:30
Nabin Hait	7945712171	Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc	2015-02-11 12:55:10 +05:30
William Moreno	ad45007362	Add chart of accounts template for Nicaragua ... On branch v5.0 new file: erpnext/accounts/doctype/account/chart_of_accounts/ni_ni_chart_template.json	2015-02-10 23:57:24 -06:00
Nabin Hait	8fa503e177	Fixed conflict while merging v4 into v5	2015-02-10 16:44:00 +05:30
Nabin Hait	15cd12214e	Fixed conflict while merging v4 into v5	2015-02-10 16:37:18 +05:30
Anand Doshi	6dfd430a2f	Moved flags like ignore_mandatory, ignore_validate etc to doc.flags	2015-02-10 14:41:27 +05:30
Rushabh Mehta	a232c80d77	[share] add share permission	2015-02-05 15:52:58 +05:30
Anand Doshi	dd942bb3d2	[minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists	2015-02-04 18:53:24 +05:30
Nabin Hait	1dc8ff5220	item-wise tax distribution if amount entered in actual	2015-02-04 18:06:59 +05:30
Rushabh Mehta	0e13221338	[print] item tables - override description and uom	2015-02-04 17:02:24 +05:30
Nabin Hait	0c883500bb	Expense account query in purchase invoice	2015-02-03 17:59:00 +05:30
Rushabh Mehta	c567e8e960	[fix] analytics reports + remove print item tables #2667	2015-02-03 17:56:25 +05:30
Rushabh Mehta	06fa46fafe	[fix] onshow > on_page_show	2015-01-29 18:09:11 +05:30
Nabin Hait	538253e503	removed test files for purchase taxes and charges master	2015-01-23 17:47:44 +05:30
Nabin Hait	ecce5141eb	replaced budget distribution	2015-01-23 16:32:35 +05:30
Nabin Hait	b4a3dfa893	All the calculations in taxes_and_totals file	2015-01-22 17:13:13 +05:30
Nabin Hait	59de1e23bc	POS fix: setting discount amount	2015-01-21 17:50:28 +05:30
Nabin Hait	963393409e	minor fix: child table length	2015-01-21 17:22:11 +05:30
Nabin Hait	0a3e5653ba	bank reconciliation fix	2015-01-21 16:40:47 +05:30
Rushabh Mehta	81e972eac4	[cleanups]	2015-01-19 17:34:54 +05:30
Anand Doshi	f02e142d5d	[design] mobile	2015-01-19 15:59:45 +05:30
Anand Doshi	b942cb86ae	[minor] auto-create Fiscal Year, loading, general ledger	2015-01-19 15:59:45 +05:30
Nabin Hait	cff8993478	Merge pull request #2572 from neilLasrado/credit-note ... journal entry linked with Stock Entry	2015-01-19 14:26:58 +05:30
Nabin Hait	9ef2e78905	Merge pull request #2553 from neilLasrado/mode-of-payment ... mode of payment - company wise default account added	2015-01-19 14:26:00 +05:30
Nabin Hait	84662f2db5	minor fix in payment receipt voucher print format	2015-01-16 11:59:47 +05:30
Rushabh Mehta	0335005eea	[minor] added allow rename	2015-01-15 15:29:22 +05:30
Nabin Hait	239c2c327c	Hide currency and price list section after submission	2015-01-15 14:22:04 +05:30
Nabin Hait	fff3ab752c	Fixed conflict	2015-01-14 16:27:13 +05:30
Neil Trini Lasrado	bd2ac2f51f	mode of payment - company wise default account added	2015-01-14 12:00:17 +05:30
Neil Trini Lasrado	50763d58ce	frappe.db.exist used	2015-01-14 11:54:55 +05:30
Neil Trini Lasrado	adfdd6f83c	journal entry linked and validation added	2015-01-14 11:54:55 +05:30
Neil Trini Lasrado	e3e3a56b5c	Journal entries recalc totals on del of accounts table row	2015-01-13 12:33:15 +05:30
Nabin Hait	2244ac4d52	Discount amount in party currency	2015-01-12 17:35:37 +05:30
Neil Trini Lasrado	0866272ba1	get fiscal year fix	2015-01-12 16:41:55 +05:30
Nabin Hait	39c8c9e7b0	Fixes in print format css	2015-01-12 11:04:07 +05:30
Nabin Hait	e8500ad4e6	Multiple fixes	2015-01-10 16:05:17 +05:30
Anand Doshi	015fa7a1d1	[fix] escape quote in Accounts Receivable	2015-01-08 18:26:53 +05:30
Rushabh Mehta	d49a123fd0	[ui] listviews	2015-01-07 16:43:47 +05:30
Nabin Hait	6c1773025b	fiscal year error message	2015-01-07 11:33:14 +05:30
Rushabh Mehta	738d4ef5c8	[ui] [listviews] indicators	2015-01-06 18:09:02 +05:30
Anand Doshi	50d7e8cf8f	[design] Point of Sale	2015-01-06 17:14:26 +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
Anand Doshi	3f5e95a99e	[design] Fixed Grid Reports	2015-01-01 16:26:18 +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	bfaf0a8f43	[tree] [ui]	2015-01-01 12:49:18 +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
Nabin Hait	40431cbf89	focus on barcode field after adding a row	2014-12-30 17:53:16 +05:30
Nabin Hait	dd38a266b8	Removed tname and fname from code	2014-12-26 13:15:21 +05:30
Rushabh Mehta	a5b149c061	[design] module pages, messages, timelines	2014-12-26 12:53:02 +05:30
Rushabh Mehta	4096a3ab2b	[design] form toolbar	2014-12-26 12:53:02 +05:30
Rushabh Mehta	a9ba5eff99	[design] pos	2014-12-26 12:52:11 +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	4b8185db19	renaming: entries	2014-12-25 18:19:39 +05:30
Nabin Hait	23d2a53017	Code replacement for journal voucher renaming	2014-12-25 17:14:18 +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
Nabin Hait	0741ed3a82	Merge pull request #2472 from neilLasrado/expense-claim ... New feature for issue #2419	2014-12-23 18:07:38 +05:30
Nabin Hait	57595cf73b	fixed merge conflict	2014-12-23 18:05:13 +05:30
Neil Trini Lasrado	31a92bd9d9	company wise letter head feature added	2014-12-23 17:52:41 +05:30
Neil Trini Lasrado	9712e7dad4	holiday logic removed	2014-12-23 17:38:59 +05:30
Pratik Vyas	dc2630b7fa	Make Tax Assets a group in standard chart of accounts	2014-12-17 16:23:51 +05:30
Nabin Hait	6ffa445dfd	minor fixes in coa templates	2014-12-16 12:49:35 +05:30
Neil Trini Lasrado	e1f21682fb	changes made	2014-12-12 13:09:42 +05:30
Neil Trini Lasrado	cc73999497	validate fixed	2014-12-12 12:33:55 +05:30
Neil Trini Lasrado	f13c4f0145	New feature for issue #2419	2014-12-12 12:33:55 +05:30
Nabin Hait	abfc72ded4	Merge pull request #2450 from ankitjavalkarwork/fix2363 ... Add print formats for Acc. Receivable/Payable and Summary reports	2014-12-11 17:40:54 +05:30
Nabin Hait	4f7c51d68e	Merge pull request #2442 from ankitjavalkarwork/gross-profit ... Gross profit	2014-12-11 17:37:54 +05:30
Nabin Hait	bef80bab0d	Removed gross profit field from sales invoice	2014-12-11 16:27:18 +05:30
Nabin Hait	35ebe1bf78	Tax amount in POS invoice print format	2014-12-10 12:42:32 +05:30
Nabin Hait	b14cc0417d	Display tax amount after discount, if there is any discount amount	2014-12-10 12:28:25 +05:30
Neil Trini Lasrado	c0063a6e74	sales Invoice- filter added for debit to	2014-12-09 17:03:13 +05:30
Nabin Hait	7887ccb441	Credit days fix	2014-12-09 14:34:14 +05:30
Nabin Hait	d57b57a21d	Minor fix in accounts receivable report	2014-12-09 11:56:13 +05:30
ankitjavalkarwork	35db282765	Fix gross_profit.py, commonify and add elementwise grouping to report	2014-12-04 13:08:42 +05:30
Rushabh Mehta	ec9db4b799	[report] gross profit WIP	2014-12-04 12:37:39 +05:30
Rushabh Mehta	969069fbf9	[report] gross profit WIP	2014-12-04 12:37:39 +05:30
ankitjavalkarwork	c41a0e2e38	Add print formats for Acc. Receivable/Payable and Summary reports	2014-12-02 15:13:36 +05:30
Nabin Hait	6871c74ce1	Merge pull request #2444 from ankitjavalkarwork/contactmob ... Display mobile no. of contact	2014-12-02 10:35:46 +05:30
Rushabh Mehta	3d65d9602e	[error-reports]	2014-11-28 14:58:43 +05:30
Rushabh Mehta	6d950d23a8	[merge]	2014-11-28 12:08:51 +05:30
ankitjavalkarwork	9440d080d4	Print Hide Recurring Order/Invoice based fields	2014-11-27 17:28:53 +05:30
Nabin Hait	249bbbc56f	fixes during testing version 5	2014-11-26 15:35:39 +05:30
Nabin Hait	707322adb9	Fixes for standard chart of accounts	2014-11-14 18:13:33 +05:30
Nabin Hait	601fcde31c	Merge pull request #2383 from neilLasrado/pos ... POS feature #2305	2014-11-14 18:12:26 +05:30
Nabin Hait	40c47b2236	Merge pull request #2395 from ankitjavalkarwork/fix2230 ... [#2230] Add Totals row to Gross Profit report	2014-11-14 18:06:19 +05:30
ankitjavalkarwork	fff1b42f80	Fix Error message, add account_type to 'inventories' in Chart Of Acc.	2014-11-14 14:19:06 +05:30
Nabin Hait	4215b3afc3	temporary fix in payment tool	2014-11-14 10:51:31 +05:30
Nabin Hait	4cd60d7d61	Included standard charts in json format	2014-11-12 14:29:44 +05:30
Nabin Hait	4963ac2af5	charts for brazil	2014-11-12 14:29:44 +05:30
Nabin Hait	f3d7ef3a1b	Chart of accounts name cleanup	2014-11-12 14:29:44 +05:30
Nabin Hait	ed9c26db4d	Show only active and enabled charts for any country	2014-11-12 14:29:44 +05:30
Neil Trini Lasrado	737cedaeef	Required modifications done	2014-11-11 16:52:34 +05:30
Neil Trini Lasrado	2c388f9d7e	POS feature #2305	2014-11-11 16:00:09 +05:30
Nabin Hait	6c1011df92	Reference / Cheque date is after due date	2014-11-10 14:57:53 +05:30
ankitjavalkarwork	bd8a8b9bd7	[#2230] Add Totals row to Gross Profit report	2014-11-10 12:36:43 +05:30
Nabin Hait	d795dfd8de	Credit days validation fixes	2014-11-10 11:39:55 +05:30
Nabin Hait	bf836277f9	Payment tool fix: get outstanding sales orders	2014-11-10 11:28:25 +05:30
Nabin Hait	10d1806d81	Credit days validation fixes	2014-11-10 11:11:58 +05:30
Nabin Hait	ae1dcabcb5	Fixed merge conflict	2014-11-05 12:41:02 +05:30
Nabin Hait	fad0d566f9	Payment receipt voucher print format fixed	2014-11-04 15:34:03 +05:30
ankitjavalkarwork	e6e65b0907	[#2362] Commonify Acc. Receivable Summary Report and add Acc. Payable Summary Report	2014-11-04 14:40:33 +05:30
Nabin Hait	36463ed790	Merge pull request #2375 from nabinhait/fix1 ... Check credit limit only if customer debited	2014-11-03 15:55:03 +05:30
Nabin Hait	3c8838816d	Check credit limit only if customer debited	2014-11-03 15:49:29 +05:30
Nabin Hait	7b3543caaf	Check credit limit only if customer debited	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
ankitjavalkarwork	f5804438bb	Auto set default bank/cash account on select of Bank/Cash Voucher in JV	2014-11-03 12:23:55 +05:30
Nabin Hait	e6370860a0	accounts receivable summary report cleanup	2014-10-30 15:54:40 +05:30
Nabin Hait	7dbcee87af	AR/AP report cleanup	2014-10-30 15:54:39 +05:30
Nabin Hait	99be941e7b	Party is only relevant to receivable/payable account	2014-10-30 15:54:39 +05:30
ankitjavalkarwork	574e55788f	[#1379] Add Accounts Receivable Summary Report	2014-10-30 15:54:39 +05:30
ankitjavalkarwork	e63432db63	Commonify AR and AP reports	2014-10-30 15:54:39 +05:30
Nabin Hait	ee212e7bb5	[fix] Floating point issue fixed in payment reconciliation	2014-10-29 14:26:05 +05:30
Nabin Hait	7cdb25b733	Merge pull request #2337 from neilLasrado/makepaymententryfix ... Error fix, arguments in function call for Make Payment Entry from SI/PI	2014-10-27 11:42:50 +05:30
Nabin Hait	f5b94143dc	Minor fixes	2014-10-22 16:14:41 +05:30
Rushabh Mehta	39dbf73de7	[merge] item-variants	2014-10-21 13:24:46 +05:30
Rushabh Mehta	be1a8d82c5	[merge] develop	2014-10-21 13:14:55 +05:30
Rushabh Mehta	ab43942b35	Merge pull request #2231 from rmehta/item-variants ... Item variants	2014-10-21 12:38:16 +05:30
Neil Trini Lasrado	572ad4c8ef	Error fix, arguments in function call for Make Payment Entry from SI/PI	2014-10-21 12:34:07 +05:30
Nabin Hait	259f9779db	Credit Note: Set total amount and print format fix	2014-10-20 11:18:11 +05:30
Neil Trini Lasrado	1cdfbdb899	fiscal year auto-create added	2014-10-17 15:44:22 +05:30
Nabin Hait	fc2dd44694	Partial payment reconciliation. Fixes #1982	2014-10-17 14:57:20 +05:30
Nabin Hait	f1a07ff105	Allow zero rate while reposting	2014-10-15 12:23:35 +05:30
Nabin Hait	38d0ed9f3a	Negative stock allowed for perpetual inventory. Blocked in specific case	2014-10-14 16:08:19 +05:30
Nabin Hait	17a16eeaf4	Tets case fixed for payment tool	2014-10-13 11:43:14 +05:30
Nabin Hait	79ed124939	Update journal_voucher.py	2014-10-10 18:19:03 +05:30
Nabin Hait	30a0e3e8b4	Merge pull request #2275 from ankitjavalkarwork/fix2164 ... Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes	2014-10-10 18:05:19 +05:30
ankitjavalkarwork	0cf4cc283c	Add Shipping Addr to Sales Invoice	2014-10-10 16:55:03 +05:30
ankitjavalkarwork	9a4b173b88	Add validation for stopped orders, advance payment in journal voucher	2014-10-10 16:28:41 +05:30
ankitjavalkarwork	6d83454237	Disallow Stopped Orders in Against Voucher table	2014-10-10 13:30:10 +05:30
ankitjavalkarwork	ff231b5e62	Allow advance JV payments in Accounts Receivable/Payable	2014-10-10 13:13:39 +05:30
ankitjavalkarwork	e69a611991	[#2164] New field names in DN, fix field name refs, Patch added	2014-10-09 17:31:46 +05:30
ankitjavalkarwork	9aadb0d95d	[#2164] Add Delivered Qty to Sales Inv from Delivery Note, fix issues	2014-10-09 17:31:46 +05:30
Neil Trini Lasrado	9614b552fd	fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim	2014-10-09 15:01:12 +05:30
Neil Trini Lasrado	e6b14a4bf6	Fixed issues	2014-10-09 15:01:12 +05:30
Neil Trini Lasrado	78fa6954e5	Fiscal year autofetch added	2014-10-09 15:01:12 +05:30
ankitjavalkarwork	e93b1fc508	[fix][#1450] Add Shipping Addr field to Sales Invoice	2014-10-09 12:11:49 +05:30
Nabin Hait	12ade3c682	Merge pull request #2250 from ankitjavalkarwork/fix1808 ... [fix][#1808] Allow configurable AR/AP ageing dates	2014-10-09 11:24:01 +05:30
ankitjavalkarwork	1b2944e871	Rearrange To/From, Recurring Type field for better UX	2014-10-08 14:24:58 +05:30
Rushabh Mehta	c2d2857540	[fixes] tests and moved reorder_item to separate module	2014-10-08 12:19:55 +05:30
Nabin Hait	adeb976a1b	Block negative stock in perpetual inventory	2014-10-08 11:02:18 +05:30
ankitjavalkarwork	6c29d8789a	[fix][#1769] Add disable option to Sales/Purchase Tax Master with validation	2014-10-07 14:44:37 +05:30
Rushabh Mehta	baef96b5a2	[item-variants] allow production order of variant #2224	2014-10-07 12:34:19 +05:30
Rushabh Mehta	ef276045c4	[item variants] make variants, bom updates	2014-10-07 11:40:47 +05:30
Rushabh Mehta	70aa8933b1	[item variant] started	2014-10-07 11:39:54 +05:30
Nabin Hait	b70712dbba	Voucher dynamic link in general ledger report	2014-10-07 11:32:54 +05:30
ankitjavalkarwork	437af5b031	[fix][#1808] Allow configurable AR/AP ageing dates	2014-10-07 11:32:21 +05:30
Nabin Hait	2dcc576f0e	Chart finalizzed for Austria and UAE	2014-10-06 13:15:21 +05:30
Nabin Hait	6f17cf93c5	Party balance	2014-10-06 13:15:21 +05:30
Nabin Hait	997a7a1d3e	Test case fixes	2014-10-06 13:15:21 +05:30
Nabin Hait	678b441082	Payment tool as per party model	2014-10-06 13:15:02 +05:30
Nabin Hait	36cf4a4708	Test case fixes	2014-10-06 13:15:02 +05:30
Nabin Hait	034ac6b00b	Payment Reconciliation based on party	2014-10-06 13:14:22 +05:30
Nabin Hait	894a1b539a	Dynamic link in general ledger and stock ledger report	2014-10-06 13:14:22 +05:30
Nabin Hait	cb8e255f0f	Dynamic link for voucher no in AR/AP report	2014-10-06 13:14:22 +05:30
Nabin Hait	bd1c8aff8e	Deleted customer/supplier account head report	2014-10-06 13:14:02 +05:30
Nabin Hait	76030540cb	Accounts Receivable/Payable report based on party	2014-10-06 13:14:02 +05:30
Nabin Hait	965a5a34b5	Party is now dynamic link in JV and GL Entry	2014-10-06 13:13:28 +05:30
Nabin Hait	62c762aac5	Sales/purchase register and item-wise sales/purchase register fixes for party ... Show Delivery Note and Purchase Receipt based on SO and PO if it not defined in SI/PI #2166	2014-10-06 13:13:27 +05:30
Nabin Hait	db030d1761	Set Receivable/Payable account based on party	2014-10-06 13:13:27 +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	3225102eb9	Update outstanding amt based on party ... Party mandatory if account is receivable/payable Fetch advance based on party Reconciliation splitting logic based on party	2014-10-06 13:09:18 +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	be8ec39678	Deleted master_type, master_name, credit_days, credit_limit fields from account ... Warehouse account is linked via Warehouse field now, instead of master_name field patch to copy warehouse value from master_name to warehouse party_type and party field added in GL Entry and Journal Voucher Detail	2014-10-06 13:02:40 +05:30
Nabin Hait	fbc3d25d13	Root type defined for uae and austria	2014-10-06 13:01:58 +05:30
Nabin Hait	9ddc002d6a	country wise chart of accounts restructured	2014-10-06 13:01:58 +05:30
Nabin Hait	712aa5809d	Minor changes in import-from-odoo	2014-10-06 13:01:57 +05:30
ankitjavalkarwork	9e5f319d80	[#2253] Rearrange To/From fields and depend on is_recurring in SI,SO,PI,PO	2014-10-06 12:58:38 +05:30
Nabin Hait	c68646c694	[merge] 4.x to 5.0	2014-10-06 12:57:48 +05:30
ankitjavalkarwork	44d42ddf63	[fix] Merge permission roles to modify frozen entries/set frozen accounts	2014-09-30 10:40:39 +05:30
Aditya Duggal	a2c9d35efb	Added the dynamic link field.	2014-09-29 17:44:28 +05:30
Aditya Duggal	4c058f4056	Added the dynamic link and removed the link column	2014-09-29 17:41:19 +05:30
Rushabh Mehta	86211cd219	Merge pull request #2203 from rmehta/mailbox ... Mailbox	2014-09-29 14:18:10 +05:30
Nabin Hait	b9e04815f8	Repost gl entries for future stock vouchers	2014-09-26 14:24:42 +05:30
Nabin Hait	b783f519ee	Fixes in sales/purchase invoice trends report	2014-09-26 14:23:00 +05:30
Anand Doshi	32a9dfd983	Merge branch 'sbkolate-develop' into develop	2014-09-22 13:19:24 +05:30
Anand Doshi	1394509343	Fixes for recurring document	2014-09-21 19:45:49 +05:30
ankitjavalkarwork	9aa11d2ad7	Add ability to fetch Non stock items in Gross Profit report	2014-09-18 19:08:04 +05:30
Nabin Hait	48f5fa69f3	Fetch and validate advance entries in sales/purchase invoice	2014-09-18 15:04:11 +05:30
Anand Doshi	8370cb3e71	Merge branch 'develop' of https://github.com/sbkolate/erpnext into sbkolate-develop	2014-09-18 12:06:05 +05:30
Nabin Hait	556fbc487d	Minor fix in gross profit report	2014-09-17 12:13:44 +05:30
Rushabh Mehta	c0bb453b88	[refactor] [frappe 5.0]	2014-09-16 15:10:54 +05:30
Nabin Hait	9d610214cf	Strip party name before checking for account	2014-09-16 12:28:40 +05:30
Anand Doshi	93c2adb2cd	Merge pull request #2193 from anandpdoshi/anand-september-15 ... Recurring fix, cherry-picked nabin's address template fix	2014-09-15 13:04:12 +05:30
Sambhaji Kolate	525ab0a925	fix build	2014-09-15 12:57:58 +05:30
Anand Doshi	a92c6886cd	Merge pull request #2173 from ankitjavalkarwork/fix2043 ... Add message on cancel in SI if C-Form exists, fix minor error, Add validation in C-Form	2014-09-15 12:56:51 +05:30
Anand Doshi	01d171756b	[fix] before_recurring, set due_date, ageing_date as None, fixed account due date validation	2014-09-15 12:50:37 +05:30
Sambhaji Kolate	930e7f5578	fix conflict	2014-09-15 12:43:48 +05:30
Sambhaji Kolate	d14e15d432	fix conflict	2014-09-15 12:31:44 +05:30
Sambhaji Kolate	4d3a18890b	fix conflict	2014-09-15 12:20:11 +05:30
81552433qqcom	c5a0ef8399	fix according to the suggestion.	2014-09-12 16:07:12 +05:30
81552433qqcom	951da0ca3d	added translations to report py file.	2014-09-12 16:07:12 +05:30
81552433qqcom	4bab0a2f54	various translation missed __()	2014-09-12 16:07:11 +05:30
Anand Doshi	61a591944b	[minor] ui/ux fixes in Payment Tool	2014-09-12 15:42:16 +05:30
Ankit Javalkar	8e7ca41817	Payment Tool #2106	2014-09-12 15:23:46 +05:30
Nabin Hait	c432270ca8	Report print format fixed for translated columns	2014-09-12 12:00:47 +05:30
ankitjavalkarwork	3df10429db	Add message on cancel in SI if C-Form exists, Add validation in C-Form, remove update_c_form	2014-09-11 16:58:18 +05:30
Sambhaji Kolate	b14401c320	change convert_to_recurring() to take recurring_id dynamicaly	2014-09-11 16:09:05 +05:30
Nabin Hait	cece0c7ffe	Opening entry should not be considered in bank reconciliation statement	2014-09-11 13:59:00 +05:30
Sambhaji Kolate	b2a3f2d386	some minor changes get fixed for PO/PI	2014-09-10 17:40:48 +05:30
Sambhaji Kolate	6b679c45df	Updated purchase_invoice.json and purchase_order.json with some missed out changes	2014-09-10 13:57:45 +05:30
Sambhaji Kolate	e3d2643f2b	Changes for Recurring PO/PI	2014-09-10 13:07:59 +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	48b3d1383f	[minor] Cheque Printing Format	2014-09-09 12:59:16 +05:30
Anand Doshi	45c9b1c065	[minor] Set in_list_view for Sales and Purchase item tables	2014-09-08 17:42:17 +05:30
Nabin Hait	91fb661d12	minor fixes	2014-09-05 14:56:24 +05:30
Nabin Hait	84f0cc6614	Dont show opening entries in Bank reconciliation	2014-09-04 15:21:46 +05:30
Anand Doshi	4228adfaa7	Merge pull request #2109 from ankitjavalkarwork/recurringorder2 ... Commonified Recurring for Sales Invoice and Sales Order	2014-09-01 16:34:12 +05:30
ankitjavalkarwork	aaac7c17b8	Fix minor errors, fix patch, call in hooks, move from account_controller to recurring_document	2014-09-01 16:22:56 +05:30
ankitjavalkarwork	28a975dd32	Add patch for field name change in SI, rename email template	2014-09-01 16:22:56 +05:30
ankitjavalkarwork	e60822b094	Add tests for Recurring Document, Sales Inv, Sales Order, fix minor errors	2014-09-01 16:20:59 +05:30
ankitjavalkarwork	ac085e0f59	Add manage_recurring_documents and path to hooks, fix minor issues	2014-09-01 16:20:59 +05:30
ankitjavalkarwork	e8331d40f3	Commonify Recurring Sales Order/Invoice	2014-09-01 16:20:59 +05:30
Neil Trini Lasrado	8331ec7482	[cosmetics] Cheque Print format 2	2014-08-29 20:27:45 +05:30
Neil Trini Lasrado	d43752fc4f	[cosmetics] Cheque Print format 1	2014-08-29 16:43:48 +05:30
Neil Trini Lasrado	f65817d4c2	[cosmetics] payment receipt Print format 1	2014-08-29 16:31:57 +05:30
Neil Trini Lasrado	45a0ea9628	Merge branch 'develop' of https://github.com/frappe/erpnext into print-templates-fix	2014-08-29 15:48:42 +05:30
Anand Doshi	98ff85dea1	Merge pull request #2108 from neilLasrado/fix-issue-448 ... [Fix] Issue #448	2014-08-29 15:46:13 +05:30
Neil Trini Lasrado	4e16e9ed89	Refactored Credit Note Print Format	2014-08-29 13:20:58 +05:30
Anand Doshi	9f0ea97d85	[fix] get future vouchers query ... [print-template] Credit Note Issue #31 2	2014-08-29 12:50:28 +05:30
Neil Trini Lasrado	7a435bb4f1	[print-template] Credit Note Issue #31 1	2014-08-29 12:50:28 +05:30
Neil Trini Lasrado	014346acba	[print-template] Credit Note	2014-08-29 12:50:28 +05:30
Neil Trini Lasrado	83ca3e5563	[Cosmetics] Print Templates Layout Improved	2014-08-28 14:48:16 +05:30
Nabin Hait	3b1733bc04	minor fix in sales invoice test records	2014-08-26 16:30:39 +05:30
Anand Doshi	43f087c99d	[hotfix] Supplier read permission for Purchase User ... [Fix] Issue #448 [Fix] Issue #448 2	2014-08-26 16:30:39 +05:30
Nabin Hait	e3f2323e14	minor fix in sales invoice test records	2014-08-26 16:20:38 +05:30
Neil Trini Lasrado	9d1e8b61fe	[Fix] Issue #980 final	2014-08-25 19:04:30 +05:30
Rushabh Mehta	e8dd4160d4	[cleanup] remove allow_attach	2014-08-25 13:04:21 +05:30
Anand Doshi	bb6b58c271	Merge pull request #2074 from neilLasrado/purchase-invoice-fix ... [fix] frappe/erpnext#1510	2014-08-25 12:51:16 +05:30
Nabin Hait	40e3d0c780	General ledger: debit/credit value rounding upto 3 decimals	2014-08-22 14:37:55 +05:30
Nabin Hait	79f91109cd	Update pricing_rule.py	2014-08-21 19:21:25 +05:30
Nabin Hait	16aba71da0	Escaped item group value in pricing rule condition	2014-08-21 19:02:02 +05:30
Nabin Hait	8058832a48	Fixex in payment reconciliation	2014-08-21 18:06:35 +05:30
Neil Trini Lasrado	bf4ceb981f	Merge https://github.com/frappe/erpnext into purchase-invoice-fix	2014-08-20 14:39:22 +05:30
Neil Trini Lasrado	84e5a4a2c2	[fix-remarks-changed-issue#110]	2014-08-20 13:44:56 +05:30
Nabin Hait	13313b5cb6	Merge pull request #2082 from nabinhait/hotfix ... Bank reconciliation statement: show amounts which has cleared in the ban...	2014-08-19 17:42:26 +05:30
Nabin Hait	432431f2e6	fix for translation	2014-08-19 16:49:44 +05:30
Nabin Hait	237f3765e5	Bank reconciliation statement: show amounts which has cleared in the bank but not registered in the system	2014-08-19 16:29:31 +05:30
Anand Doshi	cca6460e65	[fix] Error Reports	2014-08-19 16:06:09 +05:30
Nabin Hait	0a35effe49	Precision issue in tax calculation	2014-08-19 13:22:19 +05:30
Neil Trini Lasrado	95b395505f	[new fix issue No #1510]	2014-08-19 13:12:33 +05:30
Neil Trini Lasrado	67e14a48b8	[fix issue No #1510]	2014-08-19 12:35:14 +05:30
Neil Trini Lasrado	2026148dbe	[fix issue No #1510]	2014-08-19 12:22:45 +05:30
Neil Trini Lasrado	9c3535307f	[fix] frappe/erpnext#1510	2014-08-19 10:41:34 +05:30
Nabin Hait	c41a9480b8	Credit limit fixes	2014-08-18 15:40:36 +05:30
Nabin Hait	32a3a86a00	General ledger report: invalid account	2014-08-18 15:40:36 +05:30
Nabin Hait	e368091627	Fixes in Payment Reconciliation	2014-08-14 15:15:14 +05:30
Rushabh Mehta	0d0f5f6c25	[ux] fixes to timeline	2014-08-14 11:43:46 +05:30
Rushabh Mehta	ab8bde0149	[ux] added folds, show actual / projected qty in pos	2014-08-14 11:43:46 +05:30
Nabin Hait	4e6c52dd24	Test case fixes	2014-08-11 16:12:32 +05:30
nabinhait	8ca3189f07	pr and pi gl entries	2014-08-11 16:12:31 +05:30
nabinhait	cfd1b10980	Purchase receipt gl entries if there is warehouse without account	2014-08-11 16:12:31 +05:30
nabinhait	f807cda375	PR and PI gl entries fixes for landed cost	2014-08-11 16:12:31 +05:30
nabinhait	11594c7927	purchase receipt gl entries	2014-08-11 16:12:31 +05:30
nabinhait	b21b6598f1	Test case for landed cost voucher	2014-08-11 16:12:31 +05:30
nabinhait	87f2401c1e	Landed Cost on_submit and gl entries for PR	2014-08-11 16:12:31 +05:30
Anand Doshi	42335fb2cb	[minor] Allow on Submit - Actual / Projected Qty	2014-08-11 13:28:29 +05:30
Rushabh Mehta	23607f91cd	[fix] [pos] pos view only for draft docs	2014-08-08 17:29:16 +05:30
Anand Doshi	3a97739f83	Merge pull request #2042 from rmehta/pos-module ... added icon for pos	2014-08-08 16:56:45 +05:30
Rushabh Mehta	a3f76fc14d	Update sales_invoice.js	2014-08-08 16:43:21 +05:30
Rushabh Mehta	72e1719220	added icon for pos	2014-08-08 15:43:26 +05:30
Anand Doshi	6cd59537b6	Merge pull request #2037 from nabinhait/hotfix ... Fixes in 'Received Items to be Billed' report	2014-08-08 12:45:56 +05:30
Anand Doshi	03eadb74ab	Fixes to microtemplate feature	2014-08-08 11:56:32 +05:30
Rushabh Mehta	873141c1a5	more updates to lists and started sane filters	2014-08-08 11:56:32 +05:30
Rushabh Mehta	8544447b19	added more listview templates	2014-08-08 11:56:32 +05:30
Rushabh Mehta	b5e768906a	built item grids for sales, purchase, stock	2014-08-08 11:56:31 +05:30
Anand Doshi	69ccf9695c	[minor] primary action	2014-08-08 11:51:24 +05:30
Rushabh Mehta	995185d02d	[ux] fixed primary action	2014-08-08 11:51:23 +05:30
Nabin Hait	f4de6e21fa	Fixes in 'Received Items to be Billed' report	2014-08-08 11:23:59 +05:30
Nabin Hait	a6db05e18d	Fixes in 'Received Items to be Billed' report	2014-08-08 11:02:06 +05:30
Nabin Hait	849b7b172a	minor fix	2014-08-07 15:13:52 +05:30
Nabin Hait	9a0c46fda7	Get Stock Rreceived But Not Billed Difference Amount	2014-08-07 15:10:05 +05:30
Nabin Hait	fd90571d49	fiscal year validation in financial statement	2014-08-06 17:25:23 +05:30
Rushabh Mehta	a8755af0fa	Merge pull request #2022 from nabinhait/hotfix ... Fixes for customer / supplier renaming	2014-08-05 10:42:44 +05:30
Nabin Hait	1279f1d430	Fixes for customer / supplier renaming	2014-08-04 13:05:59 +05:30
Anand Doshi	e88b7fbcc4	Journal Voucher Detail: show Account Balance as Dr or Cr. Fixes #675	2014-08-01 16:56:32 +05:30
Anand Doshi	8c838061f9	[minor] Check account read permission for get_balance_on	2014-08-01 16:13:44 +05:30
Anand Doshi	6c608e04bc	Fixes #699 - Cost Center mandatory	2014-08-01 16:04:35 +05:30
Anand Doshi	29817d6d8b	[print] Moved Total Taxes and Charges to the right column	2014-07-31 16:05:19 +05:30
Anand Doshi	fbe37c9158	Labels: Use Date instead of Posting Date	2014-07-31 14:31:25 +05:30
nabinhait	4859b48c43	message fix	2014-07-31 11:40:41 +05:30
nabinhait	c34329284b	Post gl entries only if there are atleast 2 distinct account head	2014-07-31 11:40:41 +05:30
nabinhait	0ad677045a	Test record fixed for warehouse	2014-07-31 11:40:40 +05:30
nabinhait	c1f65dd863	Validation: Account must belong to the same company	2014-07-31 11:40:40 +05:30
Anand Doshi	627f13ea26	Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text	2014-07-30 13:09:01 +05:30
nabinhait	78777e141a	minor fix	2014-07-29 15:19:41 +05:30
nabinhait	0bab81aef9	minor fix in chart of accounts help message	2014-07-29 12:59:47 +05:30
nabinhait	d4b92a1d20	Set ignore pricing rule while mapping SI to DN	2014-07-29 11:35:41 +05:30
Anand Doshi	07d3261467	[hotfix] don't override default print format if specified in POS Sales Invoice	2014-07-28 19:55:13 +05:30
Anand Doshi	57f8dabf59	[minor] Show company name in General Ledger print	2014-07-28 15:28:44 +05:30
Anand Doshi	62b1cbf003	[impact] Limit available functions in jinja environment	2014-07-25 13:02:29 +05:30
Anand Doshi	a5437cdac1	Fixes for print	2014-07-25 13:02:28 +05:30
Rushabh Mehta	85ff3bcd04	updated pos invoice	2014-07-25 13:01:53 +05:30
Rushabh Mehta	5b51cc86a9	many fixes to print	2014-07-25 13:01:53 +05:30
Nabin Hait	5cf3a6bcd2	Merge pull request #1975 from anandpdoshi/anand-july-22 ... Trial Balance and Newsletter sending via Worker	2014-07-25 11:21:13 +05:30
Anand Doshi	329a8ef9a1	Merge pull request #1985 from ankitjavalkarwork/payrec ... Remove Payment To Invoice Matching Tool	2014-07-24 18:57:46 +05:30
ankitjavalkarwork	344dd3793a	Merge branch 'develop' of https://github.com/frappe/erpnext into payrec	2014-07-24 15:15:12 +05:30
ankitjavalkarwork	d93f4c99e1	Remove Payment To Invoice Matching Tool	2014-07-24 15:14:36 +05:30
nabinhait	ffd57a0565	Fix for company in chart of accounts	2014-07-24 10:40:18 +05:30
Anand Doshi	cb86d597b7	Report: Trial Balance	2014-07-22 19:49:16 +05:30
Nabin Hait	9df4196597	Merge pull request #1970 from ankitjavalkarwork/payrec ... Added Payment Reconciliation to list accounts.py	2014-07-22 18:24:58 +05:30
ankitjavalkarwork	b5ae643b6e	Payment Reconciliation Feature/Tool - minor change	2014-07-22 15:26:04 +05:30
ankitjavalkarwork	b0cffac79d	Payment Reconciliation Feature/Tool - add in module list	2014-07-22 15:02:59 +05:30
nabinhait	c772b3d86a	Purchase invoice: Copy project name from first row on addition of row	2014-07-22 11:38:14 +05:30
nabinhait	7d7123de37	Merge branch 'ankitjavalkarwork-wip_payrec' into develop	2014-07-21 19:23:20 +05:30
nabinhait	97ab902895	payment reconciliation fixes	2014-07-21 19:22:02 +05:30
Anand Doshi	67ecce695d	[fix] Show against account in General Ledger Print Format	2014-07-21 18:13:05 +05:30
Anand Doshi	5f0459c321	Fixes to Financial Statements	2014-07-21 16:13:06 +05:30
Anand Doshi	f457bce0e7	Changed localize_date to formatdate	2014-07-21 12:03:04 +05:30
Anand Doshi	6cc5babd2e	Use include directive to embed common print format	2014-07-21 11:43:19 +05:30
Anand Doshi	db4ba39824	Better handling of ignore zero values	2014-07-21 11:43:19 +05:30
Anand Doshi	825d014616	Commonfied code for Financial Statements and added Profit and Loss Statement	2014-07-21 11:43:18 +05:30
Anand Doshi	fa576a22e3	Balance Sheet	2014-07-21 11:43:18 +05:30
Anand Doshi	059f1e09a8	Balance Sheet - first cut	2014-07-21 11:43:18 +05:30
ankitjavalkarwork	5283e5a7d8	Add Payment Reconciliation Feature/Tool - JS changes1	2014-07-18 15:54:29 +05:30
ankitjavalkarwork	84fd33ea7a	Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec	2014-07-17 19:11:07 +05:30
ankitjavalkarwork	87e30f68b9	Add Payment Reconciliation Feature/Tool - Complete	2014-07-17 19:10:45 +05:30
nabinhait	5f2f955224	From date and to date in general ledger print format	2014-07-17 12:29:56 +05:30
nabinhait	e26204e61d	From date and to date in general ledger print format	2014-07-17 12:22:58 +05:30
nabinhait	96cb130263	Default letter head in general ledger and bank reco statement print	2014-07-17 10:56:07 +05:30
Anand Doshi	d93fa2f78b	Fixes in Stock Entry and test cases	2014-07-16 16:08:15 +05:30
ankitjavalkarwork	d934cd105b	Add Payment Reconciliation Feature/Tool - invoice entries table population	2014-07-15 18:01:36 +05:30
ankitjavalkarwork	ec05d7f8a1	Add Payment Reconciliation Feature/Tool - javascript validation	2014-07-14 18:28:10 +05:30
ankitjavalkarwork	345753ed19	Add Payment Reconciliation Feature/Tool - fetch unreconciled entries	2014-07-14 16:38:27 +05:30
ankitjavalkarwork	0e57b971ad	Add Payment Reconciliation Feature/Tool - minor changes	2014-07-11 16:08:55 +05:30
ankitjavalkarwork	90b79fcd1f	Add Payment Reconciliation Feature/Tool - minor changes	2014-07-11 15:23:26 +05:30
webnotes	9d31705f75	Merge https://github.com/frappe/erpnext into wip_payrec	2014-07-11 11:21:51 +05:30
webnotes	059922cef1	Add Payment Reconciliation Feature/Tool	2014-07-11 11:20:44 +05:30
Anand Doshi	9b7b9b2e93	Bank Reconciliation Statement Print Format	2014-07-10 18:45:03 +05:30
nabinhait	ee8b6f28b8	minor fix	2014-07-10 15:27:27 +05:30
nabinhait	d5fb5d91e9	overflow validation fixed	2014-07-10 15:27:27 +05:30
nabinhait	fcfa42d992	Minor fixes #1917	2014-07-09 11:31:11 +05:30
nabinhait	5e0de79c0d	Account validated in general ledger report. Fixed #1912	2014-07-09 11:10:40 +05:30
Rushabh Mehta	f31221d0d3	Changed raise Exception to frappe.throw	2014-07-09 09:13:00 +05:30
Anand Doshi	e729516af7	Minor fix	2014-07-07 15:54:11 +05:30
Anand Doshi	adfada707d	Automatic Outstanding Writeoff	2014-07-02 17:10:46 +05:30
Anand Doshi	e8533d15b3	Hotfix: Get Balance query	2014-07-01 19:46:22 +05:30
Anand Doshi	bc71f737b8	Fix JV Remarks	2014-07-01 18:12:26 +05:30
Rushabh Mehta	e9f43251ab	Update journal_voucher.py	2014-07-01 15:19:15 +05:30
Anand Doshi	8ac4643fd7	Merge pull request #1867 from nabinhait/v4-hotfix ... Multiple fixes	2014-06-30 13:20:49 +05:30
Nabin Hait	6c7cd70202	Pricing rule condition if item group missing	2014-06-30 11:50:17 +05:30
Nabin Hait	7c9652997b	Item website specification from item group	2014-06-30 11:50:17 +05:30
Anand Doshi	ebcb654649	Minor: General Ledger Report - print format improvements	2014-06-27 20:53:13 +05:30
Anand Doshi	f1af06c00d	Merge remote-tracking branch 'frappe/develop' into wip-4.1	2014-06-26 15:05:42 +05:30
Nabin Hait	3e6586f58d	minor fix	2014-06-26 14:56:47 +05:30
Nabin Hait	cf2632fe59	Fetch warehouse from pos settings	2014-06-26 13:05:10 +05:30
Nabin Hait	500e1bc9b5	Show Frozen field in account to all if Frozen Account Modifier is not specified in Accounts Settings	2014-06-26 10:53:32 +05:30
Nabin Hait	33a21ffbdc	Minor fixes in recurring invoice	2014-06-25 18:35:36 +05:30
Nabin Hait	c7c89a5927	Cost center-wise net profit in financial analytics report	2014-06-25 16:57:50 +05:30
Nabin Hait	9c2459658a	Fixes for recurring invoice	2014-06-25 16:57:50 +05:30
Nabin Hait	860b2e2bbb	Fixes in pricing rule	2014-06-25 16:57:49 +05:30
Nabin Hait	f27fa5cbf3	Fixes in pricing rule	2014-06-25 16:57:49 +05:30
Nabin Hait	98bec6f96b	Fixes in pricing rule	2014-06-25 16:57:49 +05:30
Anand Doshi	8b2dfcff29	Naming Series Property Setter Patch	2014-06-25 16:57:49 +05:30
Nabin Hait	b569930b2a	Made warehouse and selling pricing list non-mandatory in pos setting	2014-06-25 16:57:48 +05:30
Nabin Hait	838aeb149f	minor fix in sales invoice	2014-06-25 16:57:48 +05:30
Nabin Hait	80142af9b8	Minor fixes	2014-06-25 16:57:47 +05:30
Nabin Hait	1b1b3a8fd6	validate pricing rule discount with item max discount	2014-06-25 16:57:47 +05:30
Nabin Hait	4f6e31eb08	validate pricing rule discount with item max discount	2014-06-25 16:57:47 +05:30
Nabin Hait	9daca108b3	Pricing Rule fixes and improvements. Fixes #1795	2014-06-25 16:57:47 +05:30
Anand Doshi	f5ec92c79a	Validate Select field values	2014-06-25 16:57:46 +05:30
Anand Doshi	c20de7b264	Minor fix in Journal Voucher	2014-06-25 16:57:07 +05:30
Nabin Hait	3b7dd0396f	Get party details fixes	2014-06-25 16:57:07 +05:30
Anand Doshi	e0a7ff77df	Merge pull request #1838 from nabinhait/v4-hotfix ... Multiple fixes	2014-06-24 17:37:39 +05:30
Nabin Hait	0b15755441	Cost center-wise net profit in financial analytics report	2014-06-24 17:02:45 +05:30
Nabin Hait	d0bf91d639	Fixes for recurring invoice	2014-06-24 16:19:16 +05:30
Rushabh Mehta	5dfacf2615	Merge pull request #1834 from nabinhait/v4-hotfix ... Multiple fixes	2014-06-24 12:09:12 +05:30
Nabin Hait	613d784cfb	Fixes in pricing rule	2014-06-24 12:07:56 +05:30
Nabin Hait	efd426650d	Fixes in pricing rule	2014-06-24 11:11:08 +05:30
Nabin Hait	f62b75c731	Fixes in pricing rule	2014-06-24 11:00:13 +05:30
Anand Doshi	83da92fdcc	Naming Series Property Setter Patch	2014-06-23 18:04:07 +05:30
Nabin Hait	16fa6472b3	Made warehouse and selling pricing list non-mandatory in pos setting	2014-06-23 16:42:36 +05:30
Nabin Hait	e84f8b23aa	minor fix in sales invoice	2014-06-23 15:36:30 +05:30
Nabin Hait	56f6d01757	Minor fixes	2014-06-20 19:37:53 +05:30
Nabin Hait	3c946b2a72	validate pricing rule discount with item max discount	2014-06-20 19:07:44 +05:30
Nabin Hait	be50c289f8	validate pricing rule discount with item max discount	2014-06-20 16:19:55 +05:30
Nabin Hait	444f956e7b	Pricing Rule fixes and improvements. Fixes #1795	2014-06-20 16:00:45 +05:30
Anand Doshi	a5cfc59d81	Validate Select field values	2014-06-19 16:05:08 +05:30
Anand Doshi	fd05f458e1	Minor fix in Journal Voucher	2014-06-18 20:55:18 +05:30
Rushabh Mehta	151125e537	fixed for travis	2014-06-18 17:33:01 +05:30
Nabin Hait	4d7c4fc0f4	Get party details fixes	2014-06-18 16:40:59 +05:30
Rushabh Mehta	36881807ed	Merge branch 'wip-4.2' into wip-4.1	2014-06-17 17:36:22 +05:30
Rushabh Mehta	1a18b427a8	make font size smaller for erpnext powered	2014-06-17 16:54:55 +05:30
Rushabh Mehta	69ce97b80a	added print format for general ledger	2014-06-17 16:54:55 +05:30
Anand Doshi	1c5fb9495e	Merge pull request #1806 from nabinhait/v4-hotfix ... Fixes	2014-06-17 14:54:44 +05:30
Rushabh Mehta	5df521bad5	updated generators for wip-4.2	2014-06-17 14:21:26 +05:30
Anand Doshi	b20de6a3ec	Sales Invoice List: show percent paid as 100% if grand total is 0	2014-06-17 13:58:06 +05:30
Nabin Hait	4ee8704b99	Fixes in financial analytics	2014-06-17 13:52:03 +05:30
Rushabh Mehta	3b7bcf0f4f	make font size smaller for erpnext powered	2014-06-16 14:21:37 +05:30
Rushabh Mehta	03ae32d937	added print format for general ledger	2014-06-16 14:21:37 +05:30
Anand Doshi	205438669a	Removed clear_custom_buttons, pos view switch fix	2014-06-12 15:00:51 +05:30
Anand Doshi	fdfea0c17b	Fixed Recurring Sales Invoice	2014-06-10 17:54:04 +05:30
Nabin Hait	7cba72a0b7	Pricing Rule: price / discount percentage can not be negative	2014-06-10 11:09:21 +05:30
Anand Doshi	cdfa9a371d	Export perm for GL Entry and Stock Ledger Entry	2014-06-09 15:11:17 +05:30
Anand Doshi	b5cefa92fa	Improved Fiscal Year validation messages	2014-06-06 15:10:00 +05:30
Rushabh Mehta	ba83e9cfbe	removed sms control and related cleanup, fixes frappe/erpnext#462	2014-06-05 17:56:42 +05:30
Nabin Hait	c8be8ba42c	function renamed	2014-06-05 15:18:10 +05:30
Nabin Hait	4d4df03f88	Added total debit / credit row in trial balance. Fixes #1313	2014-06-04 19:00:57 +05:30
Nabin Hait	deb6e06336	minor fix	2014-06-04 19:00:56 +05:30
Nabin Hait	1055139c83	get accounts for opening entry	2014-06-04 19:00:56 +05:30
Nabin Hait	b161eea793	Account balance must be debit / credit, validate if balance already in credit / debit. Fixes #1442	2014-06-04 18:57:53 +05:30
Anand Doshi	85479bcbc0	Fixes for apply user permissions and momentjs	2014-06-04 18:15:43 +05:30
Anand Doshi	ec8240e890	Apply User Permissions optional in Script and Query Reports	2014-06-04 17:48:58 +05:30
Anand Doshi	cdc1b640d9	Fixes in user permissions patches	2014-06-04 17:48:56 +05:30
Anand Doshi	a8ce570635	Permission relogication continued	2014-06-04 17:48:53 +05:30
Anand Doshi	fab0904af7	Started permission relogication	2014-06-04 17:48:52 +05:30
Anand Doshi	ffc28faa51	Merge pull request #1744 from rmehta/develop ... added multiple item select and allow non purchase items in Material Requ...	2014-06-04 17:47:58 +05:30
Rushabh Mehta	b6843f2087	added multiple item select and allow non purchase items in Material Request of type transfer	2014-06-04 13:10:41 +05:30
Nabin Hait	67d8b91690	Fixes in bank reconciliation statement	2014-06-04 11:18:25 +05:30
Nabin Hait	bc7efa6da6	Parent account mandatory for all non-root accounts	2014-06-03 23:02:02 +05:30
Nabin Hait	b15764ef2c	Translation issue fixed in analytics/grid report	2014-06-03 13:02:39 +05:30
Rushabh Mehta	cc37cc83cd	removed section_style	2014-05-31 10:36:41 +05:30
Nabin Hait	47a8670d37	pricing rule testcase fixes	2014-05-30 11:22:12 +05:30
Nabin Hait	ccb9826afd	pricing list tets case fixes	2014-05-30 11:22:12 +05:30
Nabin Hait	ea4aa04cc4	Search query for account cleanup	2014-05-30 11:22:11 +05:30
Nabin Hait	a3dd72a759	Pricing Rule	2014-05-30 11:22:10 +05:30
Nabin Hait	62ec60188b	use build_filter_conditions from db_query. Fixes #1679	2014-05-30 11:22:10 +05:30
Rushabh Mehta	f944e819e9	fixes #1581 and added icons to grid reports	2014-05-27 15:22:04 +05:30
Rushabh Mehta	d82e85d099	fix to pos invoice	2014-05-26 16:01:01 +05:30
Nabin Hait	27b12ef1b6	update account root type patch	2014-05-21 11:53:59 +05:30
Nabin Hait	b5c552faf3	minor fix	2014-05-21 11:53:59 +05:30
Nabin Hait	0e6554edc1	Root Type field added in account and patch for existing accoutns	2014-05-21 11:53:58 +05:30
Nabin Hait	c49b7f8c63	minor fix	2014-05-20 15:07:18 +05:30
Nabin Hait	2e0620e370	Server side onload functionality in multiple docs	2014-05-19 18:15:58 +05:30
Nabin Hait	091b48168e	Journal voucher debit != credit #fraction issue	2014-05-16 19:56:43 +05:30
Pratik Vyas	fa7444ec94	fix shipping rule test cases (copy name with copy_doc)	2014-05-16 15:19:51 +05:30
Anand Doshi	54b7962eb9	Pass frm to open_mapped_doc	2014-05-14 17:38:45 +05:30
Anand Doshi	4c83e407a9	Changed Print Format files to lowercase	2014-05-13 17:58:30 +05:30
Nabin Hait	aade34b0c9	Reports and print formats modified for renamed fields	2014-05-13 16:12:37 +05:30
Nabin Hait	827480fd2b	import, export and report permission in account and pricing rule	2014-05-12 17:45:37 +05:30
Nabin Hait	0ff6e3a6bb	Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix	2014-05-11 12:11:50 +05:30
Nabin Hait	5365108ef9	Test case fixes for pos setting	2014-05-11 12:10:17 +05:30
Anand Doshi	78e9c6ef70	Deprecate Select fields with options as link:	2014-05-09 13:36:13 +05:30
Anand Doshi	f410bd9bf9	Better default permissions, ignore_restrictions for defaults, removed field trash_reason ... Additions: Account --> Material User: Read Cost Center --> Sales User, Purchase User: Read Mode of Payment --> Accounts User: Read Supplier --> Material User, Accounts User: Read Employee --> Employee: Restricted Read Leave Type --> Employee: Read Production Order --> Material User: Read Sales Order --> Material User: Read Print Heading --> All: Read Terms and Conditions --> Purchase User, Material User: Read Territory --> Material User, Maintenance User: Read Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read Price List --> Manufacturing User: Read Purchase Receipt --> Accounts User: Read Warehouse --> Manufacturing User: Read	2014-05-07 17:20:42 +05:30
Anand Doshi	dc644c37e6	Merge pull request #1597 from anandpdoshi/naming-series-by-fiscal-year ... Naming series by fiscal year	2014-05-07 11:06:36 +05:30
Anand Doshi	8c2dbab878	Changed default naming series options ... C-Form: C-FORM-.##### Purchase Invoice: PINV-.##### Sales Invoice: SINV-.##### Purchase Order: PO-.##### Quality Inspection: QI-.##### Supplier: SUPP-.##### Supplier Quotation: SQTN-.##### Attendance: ATT-.##### Production Order: PRO-.##### Installation Note: IN-.##### Lead: LEAD-.##### Opportunity: OPTY-.##### Quotation: QTN-.##### Sales Order: SO-.##### Delivery Note: DN-.##### Item: ITEM-.##### Material Request: MREQ-.##### Packing Slip: PS-.##### Purchase Receipt: PREC-.##### Stock Entry: STE-.##### Customer Issue: CI-.##### Support Ticket: SUP-.##### Customer: CUST-.##### Journal Voucher: JV-.#####	2014-05-06 19:43:11 +05:30
Nabin Hait	3190f99ebe	Option for selecting already reconciled entries in bank reconciliation #1310	2014-05-06 16:39:24 +05:30
Nabin Hait	98c2a052e5	Fixes in pricing rule testcases #565	2014-05-05 18:41:41 +05:30
Nabin Hait	0c7e28ec9f	Pricing Rule improvements #565	2014-05-05 11:13:36 +05:30
Nabin Hait	ed8a845e83	POS Make Payment dialog box fix #1441	2014-05-05 11:01:32 +05:30
Anand Doshi	69e0cb5d6f	Fixed POS and Sales Invoice paid amount display, when invoice not submitted. Fixes #1573	2014-05-04 19:37:45 +05:30
Nabin Hait	a096b2004f	Financial analytics graph fix #1542	2014-05-04 16:02:26 +05:30
Nabin Hait	6b03914731	asynchronus issue in get_party_details	2014-05-02 15:45:10 +05:30
Nabin Hait	d341254786	Purchase receipt to purchase invoice item	2014-05-01 17:42:21 +05:30
Nabin Hait	5b98340d15	payment to invoice matching	2014-05-01 15:43:22 +05:30
Rushabh Mehta	a15164750d	started client side testing using selenium and other related and unrelated fixes	2014-04-30 19:39:13 +05:30
Nabin Hait	b85a9108eb	Payment to invoice matching tool	2014-04-30 19:32:16 +05:30
Nabin Hait	498ecfc192	Merge branch 'develop' of github.com:frappe/erpnext into develop	2014-04-30 19:31:22 +05:30
Nabin Hait	576f025c84	Payment to invoice matching tool	2014-04-30 19:30:50 +05:30
Anand Doshi	04f8990c11	Fixed can freeze account check for account doc in client side	2014-04-30 15:02:17 +05:30
Rushabh Mehta	d21f55b5d2	fix in naming and feature setup on install:	2014-04-29 16:25:07 +05:30
Nabin Hait	b54307d58e	minor fixes for pos trigger	2014-04-29 13:40:54 +05:30
Anand Doshi	cd17bdffcd	Fixes in account query, fiscal year and cost center	2014-04-28 20:34:48 +05:30
Nabin Hait	6777efa7fa	Merge branch 'develop' of github.com:frappe/erpnext into develop	2014-04-28 17:09:13 +05:30
Nabin Hait	985918d42b	Minor fixes in company and account	2014-04-28 17:08:28 +05:30
Néstor Díaz Valencia	21412ddf65	Update mode_of_payment.py ... Renamed solves issue #1536	2014-04-28 11:54:31 +02:00
Anand Doshi	1872312cc6	Deprecated client side mapper: frappe.model.map. Fixes #1530	2014-04-25 18:38:08 +05:30
Anand Doshi	69a2c25ca5	Fixed set_query	2014-04-25 18:35:45 +05:30
Anand Doshi	8bde7f9b3a	Conditionally toggle Naming Series. Fixes #1526	2014-04-24 18:11:49 +05:30
Anand Doshi	f50a65294f	Fixed NameError handling	2014-04-23 13:41:28 +05:30
Anand Doshi	b054eb7a4f	Call calculate_taxes_and_totals after mapping	2014-04-22 20:35:22 +05:30
Anand Doshi	3e41fd1fd3	List route for tree browser based doctypes; Fixes to add child in tree browsers	2014-04-22 18:55:21 +05:30
Anand Doshi	424c033395	Removed controller.py	2014-04-21 15:06:56 +05:30
Anand Doshi	9365b616b8	Added an exist check for accounts.utils.get_balance_on	2014-04-21 12:42:21 +05:30
Anand Doshi	cbbf451974	Fixes throw	2014-04-21 11:33:49 +05:30
Anand Doshi	dbfcd328fb	Fixes update_after_submit validation errors	2014-04-17 12:35:04 +05:30
Rushabh Mehta	c38fc713c6	updated translations	2014-04-16 17:46:30 +05:30
Anand Doshi	652bc0784a	Ported v3 fixes to v4 ... Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe	2014-04-16 15:26:42 +05:30
Nabin Hait	a0c239db8d	perpetual inventory fix related to sub-contracting ... Cherry-picked and modified by @anandpdoshi Conflicts: accounts/doctype/purchase_invoice/purchase_invoice.py controllers/buying_controller.py controllers/stock_controller.py	2014-04-16 15:23:10 +05:30
Anand Doshi	88a869f34d	No Copy for Paid and Write Off Amount in Sales Invoice ... Ported webnotes/erpnext@f739bffedd	2014-04-16 15:23:08 +05:30
Rushabh Mehta	ff93802d58	more message fixes	2014-04-15 18:40:31 +05:30
Anand Doshi	a6e2ca9d3b	Fixes #1491	2014-04-15 17:12:15 +05:30
Rushabh Mehta	8a40c136ce	more message fixing	2014-04-15 16:31:20 +05:30
Rushabh Mehta	2c45899a02	fixed strings for translation	2014-04-15 14:41:56 +05:30
Pratik Vyas	f37d6fe32b	Merge pull request #1514 from frappe/js-translate-refactor ... JS translation refactor	2014-04-15 11:44:16 +05:30
Pratik Vyas	13c92e3ad5	fix accounts browser and cost center strings (js)	2014-04-15 10:08:53 +05:30
Pratik Vyas	ec9c448ccf	fix taxes and charges strings and labels	2014-04-15 09:49:40 +05:30
Rushabh Mehta	549977bf4f	typo fix in journal_voucher.py	2014-04-14 22:40:17 +05:30
Rushabh Mehta	9f0d625300	update translation strings #1403	2014-04-14 19:20:45 +05:30
Pratik Vyas	b0f279a34e	js translations refactor	2014-04-14 17:14:23 +05:30
Pratik Vyas	b52618c142	frappe._ to __	2014-04-14 16:25:30 +05:30
Anand Doshi	bd67e87921	Fixes saving of Sales Order and fetching Prices frappe/frappe#478	2014-04-11 16:51:27 +05:30
Anand Doshi	13ae548ff6	Fixes for model-cleanup frappe/frappe#478	2014-04-10 18:43:07 +05:30
Anand Doshi	9fd50bcfb6	Fixed rest of the test cases frappe/frapp#478	2014-04-09 19:20:01 +05:30
Anand Doshi	d29465029d	Fixed Test Cases frappe/frappe#478	2014-04-08 20:15:22 +05:30
Anand Doshi	cd71e1d8ab	Test Cases - Journal Voucher, Purchase Invoice, Period Closing Voucher frappe/frappe#478	2014-04-08 13:53:35 +05:30
Anand Doshi	2ce39cf770	Fixed Stock Entry Test Cases frappe/frappe#478	2014-04-07 18:51:58 +05:30
Rushabh Mehta	322d39f3a6	Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup	2014-04-07 15:09:25 +05:30
Rushabh Mehta	49f49ea603	started party frappe/erpnext#1503	2014-04-07 15:09:09 +05:30
Nabin Hait	dc82d4f0cd	frappe/frappe#478 fixes	2014-04-07 12:02:57 +05:30
Nabin Hait	e7885e3ee0	frappe/frappe#478 replaced doclist in testcases	2014-04-04 13:26:50 +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
Nabin Hait	312ba99e71	frappe/frappe#478 fixes	2014-04-04 11:06:10 +05:30
Nabin Hait	365ae27acf	frappe/frappe#478 fixes	2014-04-03 17:38:54 +05:30
Rushabh Mehta	f14b809ab5	frappe/frappe#478, more changes, removed bean	2014-04-03 14:30:42 +05:30
Rushabh Mehta	d36cb5c812	frappe/frappe#478 removed more instances of doclist	2014-04-03 12:38:42 +05:30
Rushabh Mehta	f191f854cd	frappe/frappe#478 erpnext install works	2014-04-02 18:09:34 +05:30
Anand Doshi	5b552b51f1	frappe/frappe#478	2014-04-02 15:03:35 +05:30
Rushabh Mehta	f2227d033c	frappe/frappe#478, removed instances of .fields	2014-03-31 23:37:40 +05:30
Rushabh Mehta	231f6a5b58	frappe/frappe#478 added test_records.json	2014-03-31 23:05:12 +05:30
Rushabh Mehta	0a0f2495a2	frappe/frappe#478, frappe tests pass, .txt renamed to .json	2014-03-31 17:27:06 +05:30
Nabin Hait	0e13cd5ac9	frappe/frappe#478	2014-03-28 17:01:32 +05:30
Nabin Hait	0d8d30e1cc	frappe/frappe#478	2014-03-28 16:57:21 +05:30
Rushabh Mehta	b385ecf65e	frappe/frappe#478	2014-03-28 16:54:45 +05:30
Anand Doshi	81ba0b29da	frappe/frappe#478	2014-03-28 15:23:26 +05:30
Anand Doshi	f78d1aee28	Replaced doc, doc.fields frappe/frappe#478	2014-03-28 13:55:00 +05:30
Anand Doshi	67d6a4e3aa	Merge remote-tracking branch 'frappe/develop' into model-cleanup ... Conflicts: erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py erpnext/accounts/doctype/sales_invoice/sales_invoice.py erpnext/controllers/stock_controller.py	2014-03-28 13:41:59 +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	e88bc8b12a	frappe/frappe#478	2014-03-27 17:51:41 +05:30
Nabin Hait	4090c78c3f	coa: payment to invoice matching tool fixes	2014-03-27 17:19:32 +05:30
Nabin Hait	becf75d791	Perpetual inventory cleanup	2014-03-27 17:18:29 +05:30
Rushabh Mehta	d2b34dc30c	frappe/frappe#478	2014-03-27 16:12:56 +05:30
Rushabh Mehta	66d52b55c0	#478	2014-03-27 14:17:33 +05:30
Rushabh Mehta	aa355af2cf	refactored client side Model and Meta - frappe/frappe#478	2014-03-26 18:24:30 +05:30
Anand Doshi	79196a9ef7	Fixed install	2014-03-25 19:32:08 +05:30
Nabin Hait	2c517e0a62	Fixes related to countrywise coa	2014-03-25 18:28:49 +05:30
Nabin Hait	06a595090d	coa: minor fix	2014-03-21 18:30:46 +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
Nabin Hait	b5e6d7e171	Account balance in debit and credit columns in trial balance and financial analytics report	2014-03-21 11:26:09 +05:30
Nabin Hait	e67202484d	Imported charts with proper report types	2014-03-21 11:26:08 +05:30
Nabin Hait	e0f98d7202	account properties file added	2014-03-21 11:26:08 +05:30
Nabin Hait	73083dc960	Fix related to user_default	2014-03-21 11:26:08 +05:30
Nabin Hait	27bb7892b3	Fixes in pos settings	2014-03-21 11:26:07 +05:30
Nabin Hait	e848914da1	consider all entries against bank account in bank reconciliation statement, even if no reference no	2014-03-21 11:25:17 +05:30
Nabin Hait	d8dcdfbf4f	Warehouse disable option	2014-03-21 11:25:17 +05:30
Nabin Hait	eb1192771f	set root type from parent or child	2014-03-21 11:25:17 +05:30
Nabin Hait	e71cf6d6a1	More country charts imported from openerp	2014-03-21 11:25:17 +05:30
Nabin Hait	037bf6b382	More country charts imported from openerp	2014-03-21 11:25:17 +05:30
Nabin Hait	3dfe854108	Rename duplicate account	2014-03-21 11:25:16 +05:30
Nabin Hait	fc37fd8b6e	Set Paid amount and write off amount for pos	2014-03-21 11:25:16 +05:30
Nabin Hait	55a03dbf69	major fixes in importing charts from openerp	2014-03-21 11:22:42 +05:30
Nabin Hait	b93ebaebe4	Added new account types and patch for existing	2014-03-21 11:22:41 +05:30
Nabin Hait	a18bf07920	updated charts json with proper account and root types	2014-03-21 11:22:41 +05:30
Nabin Hait	813a93d78d	import chart records into database frm json	2014-03-21 11:22:40 +05:30
Nabin Hait	d89f3403ac	charts of account doctype added and imported charts json from openerp	2014-03-21 11:22:39 +05:30
Nabin Hait	b77773ca07	fixes in financial statements	2014-03-21 11:22:38 +05:30
Nabin Hait	2b57ecbd6c	fixes for debit_or_credit in account tree grid report	2014-03-21 11:22:38 +05:30
Nabin Hait	53822ae9d0	Account balance must be of type debit/credit	2014-03-21 11:22:38 +05:30
Nabin Hait	49a6f0754e	Removed debit_or_credit field	2014-03-21 11:22:38 +05:30
Nabin Hait	133490a0c5	Removed max roots validation	2014-03-21 11:22:37 +05:30
Nabin Hait	4d713ac5ba	sql injection fixes	2014-03-21 11:22:37 +05:30
Anand Doshi	4b2692182a	Fixes after change in fields handling in Document	2014-03-19 16:58:42 +05:30
Rushabh Mehta	7c932003ed	rename Profile to User frappe/frappe#470	2014-03-11 16:15:59 +05:30
Anand Doshi	09a9f4c0c9	Added module to Report doctype	2014-03-07 17:20:22 +05:30
Rushabh Mehta	d8de921c40	fixed erpnext/frappe#1441 and other pos related cleanups	2014-03-06 15:40:22 +05:30
Rushabh Mehta	2e7ad8980c	fix for queries	2014-03-06 12:28:47 +05:30
Rushabh Mehta	4541875c81	removed searchfield condition from get_match_cond frappe/erpnext#1457	2014-03-06 11:19:46 +05:30
Anand Doshi	b2c2fca8a5	Added Pricing Rule to Accounts, Buying, Selling home	2014-03-05 18:25:10 +05:30
Anand Doshi	7ea8528d50	Fixed Pricing Rule Cleanup Fieldname	2014-03-05 17:27:00 +05:30
Anand Doshi	f5794f1c07	Module Home Pages using Module View	2014-03-03 15:06:34 +05:30
Nabin Hait	177b86a15b	fix in pricing rule	2014-02-28 15:47:22 +05:30
Nabin Hait	e7e615cf18	pricing rule: fixes in testcase	2014-02-28 15:21:49 +05:30
Nabin Hait	13b93ebed8	pricing rule: fixes in testcase	2014-02-28 15:04:05 +05:30
Nabin Hait	ed5f423e65	pricing rule: condition for tree-type docs	2014-02-28 13:04:19 +05:30
Nabin Hait	08222150f2	Pricing Rule fixes and reference field in all item table	2014-02-28 13:02:00 +05:30
Nabin Hait	7e8e8ba714	pricing rule	2014-02-28 13:02:00 +05:30
Nabin Hait	615d342056	Pricing Rule: first commit	2014-02-28 13:02:00 +05:30
Anand Doshi	e9baaa68e7	Changed frappe.conn to frappe.db	2014-02-26 12:35:33 +05:30
Anand Doshi	901f4434fd	Fixed Purchase Invoice test cases	2014-02-25 17:25:28 +05:30
Anand Doshi	201dbbd977	Quotation Item Table can be empty	2014-02-25 15:42:32 +05:30
Nabin Hait	74bbd24b1d	Merge github.com:frappe/erpnext into develop	2014-02-19 17:43:51 +05:30
Nabin Hait	9d1f077922	get lead details in quotation	2014-02-19 17:43:24 +05:30
Rushabh Mehta	e0e3f92019	fixed sales / accounts tree	2014-02-19 12:43:16 +05:30
Pratik Vyas	31affc0e67	bump modified dates for purchase receipt and purchase invoice	2014-02-17 11:36:10 +05:30
Rushabh Mehta	793ba6bd37	-webnotes +frappe 💥	2014-02-14 15:47:51 +05:30
Nabin Hait	8ae051cb39	fixed conflict	2014-02-14 13:42:41 +05:30
Nabin Hait	0aa71a5c41	minor fixes	2014-02-12 14:54:15 +05:30
Nabin Hait	5aecc538dd	Letter Head field added in purchase receipt and invoice	2014-02-12 14:54:15 +05:30
Nabin Hait	5f59726903	Rename fields: replaced in html and txt files	2014-02-12 14:54:15 +05:30
Nabin Hait	1eb560130a	Rename fields: amount related fields	2014-02-12 14:54:14 +05:30
Nabin Hait	7979f7ed21	Field Rename: rate field mass replacement	2014-02-12 14:54:14 +05:30
Nabin Hait	a7f757a3f4	Rename fields: initial commit	2014-02-12 14:54:13 +05:30
Nabin Hait	777397489e	Fields renamed in schema	2014-02-12 14:54:13 +05:30
Nabin Hait	436f526102	commonify get_item_details and rename fields to sync selling and purchase	2014-02-12 14:54:12 +05:30
Anand Doshi	2735733d1f	Minor fix in setup import	2014-02-11 20:28:11 +05:30
Anand Doshi	93fdc670fe	Fixes in Test Cases	2014-02-11 14:40:21 +05:30
Anand Doshi	7bb9c3f125	Nested Set Test using Test Item group	2014-02-06 17:51:18 +05:30
Nabin Hait	574c7e7c63	item related cleanup	2014-02-06 15:51:01 +05:30
Rushabh Mehta	cc008cc109	commonified get_party_details	2014-02-03 16:14:56 +05:30
Rushabh Mehta	347889b233	merge	2014-02-03 14:49:53 +05:30
Rushabh Mehta	8ed0268b9d	fix to SalesInvoice format	2014-02-03 14:40:01 +05:30
Rushabh Mehta	fa799f7d81	Merge branch '4.0.0-cleanup' of github.com:webnotes/erpnext into 4.0.0-cleanup	2014-02-03 14:38:52 +05:30
Nabin Hait	23c28704d2	Field arrangement in child table	2014-02-03 14:36:59 +05:30
Nabin Hait	7f80485070	Merge pull request #1374 from akhileshdarjee/sms-center ... SMS center character count	2014-01-31 02:57:35 -08:00
Nabin Hait	c3211ab394	Merge pull request #1368 from akhileshdarjee/default-tax ... Default tax for customer and supplier	2014-01-31 02:40:51 -08:00
Akhilesh Darjee	4e3b601990	webnotes/erpnext#1188 sms center character count	2014-01-30 19:13:25 +05:30
Nabin Hait	ec43e4dd33	Merged with develop	2014-01-30 15:22:10 +05:30
Rushabh Mehta	fcb6b01e4e	cleaned up email	2014-01-30 15:09:05 +05:30
Akhilesh Darjee	e0a1039756	merge conflict fixed	2014-01-30 14:44:35 +05:30
Nabin Hait	0ff32e73ba	Merged with 4.0.0-wip	2014-01-30 12:41:52 +05:30
Nabin Hait	fe8db590a1	Fixed conflict while merging with develop	2014-01-30 12:32:47 +05:30
Nabin Hait	b87e9f2651	Fixes in fetching party details	2014-01-29 19:51:36 +05:30
Akhilesh Darjee	4f7215662d	webnotes/erpnext#1090 set default tax type in customer and supplier	2014-01-29 16:31:38 +05:30
Rushabh Mehta	24da761a17	more updates to party	2014-01-29 15:26:04 +05:30
Akhilesh Darjee	2ced3b07d4	changed fieldname from charge to taxes	2014-01-28 19:16:05 +05:30
Rushabh Mehta	49dd7bee87	added get_supplier_details and commonified invoice functions	2014-01-28 17:43:10 +05:30
Nabin Hait	21d324c597	Merged with 4.0-wip	2014-01-28 15:52:25 +05:30
Akhilesh Darjee	ffa4769b51	Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix	2014-01-27 17:32:32 +05:30
Akhilesh Darjee	db4304914c	POS Invoice print format showing inclusive taxes and discount amount	2014-01-27 17:27:39 +05:30
Anand Doshi	cb39e0878e	Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip ... Conflicts: config.json erpnext/accounts/utils.py erpnext/patches/patch_list.py erpnext/stock/doctype/price_list/price_list.txt erpnext/stock/doctype/warehouse/warehouse.py portal/templates/sale.html portal/utils.py selling/doctype/sales_order/templates/pages/order.py selling/utils/cart.py selling/utils/product.py utilities/demo/demo_docs/Fiscal_Year.csv utilities/demo/make_demo.py	2014-01-24 21:44:36 +05:30
Nabin Hait	93eab5521c	Minor fix in path	2014-01-23 17:58:03 +05:30
Nabin Hait	5ae6a61c4d	Fixes related to appifing shopping cart	2014-01-23 15:33:30 +05:30
Rushabh Mehta	f96bcf943b	added explicit delete perimssions	2014-01-20 17:52:13 +05:30
Nabin Hait	5c6d13a0df	Fixed conflict while merging with develop branch	2014-01-20 17:18:16 +05:30
Nabin Hait	dc15b4fa8a	Fixed conflict while merging with develop brnach	2014-01-20 16:48:49 +05:30
Nabin Hait	f6cf5e0f43	Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-cleanup	2014-01-06 17:36:04 +05:30
Akhilesh Darjee	e27717261d	merge conflict fixed	2014-01-03 18:18:31 +05:30
Akhilesh Darjee	57738a0ff3	flat discount replaced to discount amount	2014-01-03 18:15:07 +05:30
Rushabh Mehta	b09d9dabc5	started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions	2014-01-02 11:47:23 +05:30
Nabin Hait	06720dfb90	Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip	2014-01-01 10:47:18 +05:30
Nabin Hait	a2e0a9b05f	Fliend rearrangemet in tables	2014-01-01 10:45:42 +05:30
Nabin Hait	6260b58a0a	Merge pull request #1253 from nabinhait/4.0.0-wip ... 4.0.0 wip	2013-12-31 21:13:45 -08:00
Anand Doshi	9a4a13cb73	Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes	2013-12-31 17:38:21 +05:30
Nabin Hait	139aa71666	Fixed conflict while merging with master	2013-12-31 16:09:22 +05:30
Nabin Hait	d3f04d754a	General ledger path fixed	2013-12-31 16:04:48 +05:30
Nabin Hait	432b86344e	Validate account with reference voucher if against voucher mentioned	2013-12-31 15:07:58 +05:30
Akhilesh Darjee	d203aea7c2	[flat discount] flat discount implemented on sales cycle	2013-12-27 17:49:57 +05:30
Anand Doshi	8e332ffd16	Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions ... Conflicts: erpnext/accounts/page/accounts_browser/accounts_browser.css erpnext/controllers/buying_controller.py erpnext/manufacturing/doctype/production_order/production_order.py erpnext/patches/patch_list.py erpnext/selling/doctype/customer/customer.txt erpnext/selling/doctype/sales_order/sales_order.py erpnext/selling/doctype/sales_order/test_sales_order.py erpnext/setup/doctype/features_setup/features_setup.txt erpnext/stock/doctype/stock_entry/test_stock_entry.py erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py startup/query_handlers.py	2013-12-26 19:12:51 +05:30
Rushabh Mehta	caa4380d49	Merge with 3.3.8	2013-12-26 11:07:58 +05:30
Rushabh Mehta	54047780fc	Merge with 3.3.8	2013-12-26 11:07:46 +05:30
Rushabh Mehta	df200f305b	Redesigned templates. Now all templates must be inside templates/pages templates/generators	2013-12-25 15:19:22 +05:30
Rushabh Mehta	2b08985e16	Translations redesigned webnotes/wnframework#351	2013-12-19 18:27:48 +05:30
Rushabh Mehta	c652a6254f	Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351	2013-12-16 12:48:38 +05:30
Rushabh Mehta	6de403f2be	added manifest, hooks and fixed requires webnotes/wnframework#351	2013-12-13 14:10:14 +05:30
Rushabh Mehta	1f84799f2d	install, web serving, session booting webnotes/wnframework#351	2013-12-12 19:12:19 +05:30
Rushabh Mehta	d2dd83c3a3	fixed template loader webnotes/wnframework#351	2013-12-12 13:57:58 +05:30
Rushabh Mehta	afea58b7a1	moved modules inside erpnext folder	2013-12-11 10:43:52 +05:30
Rushabh Mehta	2fa2f7178d	moved directory structure	2012-09-24 19:13:42 +05:30
Rushabh Mehta	09d84b6575	Stock Ageing & release of Analytics	2012-09-21 19:46:24 +05:30
Rushabh Mehta	f200c5296d	added sales analytics	2012-09-21 15:19:40 +05:30
Rushabh Mehta	6ca8054d55	added stock analytics	2012-09-20 19:03:14 +05:30
Rushabh Mehta	b803cbab3d	Merge branch 'master' of github.com:webnotes/erpnext	2012-09-19 16:48:30 +05:30
Rushabh Mehta	4573515899	added graphs in stock ledger and general ledger	2012-09-19 16:41:19 +05:30
Nabin Hait	2d52bf6a4b	Merge branch 'master' of github.com:webnotes/erpnext	2012-09-19 16:06:21 +05:30
Nabin Hait	757a785872	sales/ pur invoice listview fix	2012-09-19 16:06:03 +05:30
Anand Doshi	8bdfaa3438	msgprint fix, company abbreviation length validation	2012-09-19 12:41:06 +05:30
Nabin Hait	684de08120	Merge branch 'master' of github.com:webnotes/erpnext	2012-09-19 12:22:24 +05:30
Nabin Hait	6a1e40bb46	Date validation in bank reco	2012-09-19 12:21:59 +05:30
Rushabh Mehta	6a6b1de7cd	Merge branch 'master' of github.com:webnotes/erpnext into unicode	2012-09-19 12:01:54 +05:30
Rushabh Mehta	823c021e9c	added index patch and updated general_ledger	2012-09-19 12:01:01 +05:30
Nabin Hait	27ec8f1e26	pull all entry of bank where clearance date not mentioned in bank reconciliation	2012-09-19 12:00:11 +05:30
Nabin Hait	6e9f1469d9	pull all entry of bank where clearance date not mentioned in bank reconciliation	2012-09-19 11:55:44 +05:30
Nabin Hait	52c595dbf1	pull all entry of bank where clearance date not mentioned in bank reconciliation	2012-09-19 11:45:59 +05:30
Rushabh Mehta	eb8673ecc6	Merge branch 'master' of github.com:webnotes/erpnext into unicode	2012-09-18 18:52:38 +05:30
Rushabh Mehta	2ad0d424a9	Stock Ledger Report	2012-09-18 18:52:05 +05:30
Nabin Hait	9a90c89b3f	removed duplicate function from sales invoice	2012-09-18 13:37:27 +05:30
Anand Doshi	6b52d77c76	Merge branch 'unicode' of github.com:webnotes/erpnext into unicode	2012-09-17 21:24:39 +05:30
Rushabh Mehta	4156523175	added flot for graphs in report_grid	2012-09-17 19:10:36 +05:30
Anand Doshi	6450b12881	fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form	2012-09-17 11:34:24 +05:30
Rushabh Mehta	f16b28b92b	moved chart_of_accounts as GridReport	2012-09-17 11:05:59 +05:30
Rushabh Mehta	4ce6b60fce	updates to general ledger, todo	2012-09-17 10:04:07 +05:30
Rushabh Mehta	cfb5466d30	added export to reports using downloadify	2012-09-14 18:12:17 +05:30
Rushabh Mehta	c6369046a1	merge	2012-09-14 11:09:46 +05:30
Nabin Hait	9d3f8b9f59	Merge branch 'master' of github.com:webnotes/erpnext	2012-09-14 10:18:09 +05:30
Nabin Hait	266ee64dc7	rebuild account tree before reposting acocunt balance	2012-09-14 10:17:46 +05:30
Rushabh Mehta	95e4e1418d	created grid report, report dump and general ledger report	2012-09-13 19:40:56 +05:30
Rushabh Mehta	93e9fdfe48	Merge branch 'master' of github.com:webnotes/erpnext into unicode	2012-09-13 12:00:54 +05:30
Rushabh Mehta	4a91f29d0f	updates to gzip, chart of accounts	2012-09-13 11:59:32 +05:30
Rushabh Mehta	fd1c166f5b	late loading js (require) files in localStorage, brought back versions (simpler)	2012-09-13 10:21:29 +05:30
Rushabh Mehta	24ebe3ffdd	merge with master	2012-09-12 19:07:07 +05:30
Rushabh Mehta	588a98a10f	fixes to chart_of_accounts, added opening + pl condition	2012-09-12 19:00:14 +05:30
Rushabh Mehta	aeb5c0fe70	Merge branch 'master' of github.com:webnotes/erpnext	2012-09-12 18:15:26 +05:30
Rushabh Mehta	0fa8e33835	chart of accounts: balances calculation	2012-09-12 18:14:12 +05:30
Rushabh Mehta	ad37f276da	Created Chart of Accounts using Slick Grid and Tree	2012-09-12 17:13:36 +05:30
Nabin Hait	b146353db2	Merge branch 'unicode' of github.com:webnotes/erpnext into unicode	2012-09-12 16:15:09 +05:30
Nabin Hait	5337ce8d02	period closing voucher issue fixed	2012-09-12 16:14:23 +05:30
Anand Doshi	d29e06852d	Merge branch 'master' of github.com:webnotes/erpnext into unicode	2012-09-12 15:33:50 +05:30
Nabin Hait	6a6cf5e573	parent account mandatory validation	2012-09-12 15:26:56 +05:30
Nabin Hait	8fdaa4dd66	Merge branch 'unicode' of github.com:webnotes/erpnext into unicode	2012-09-12 14:43:09 +05:30
Nabin Hait	eff2907911	error fixed in period closing entry	2012-09-12 14:42:25 +05:30
Anand Doshi	ce946afb67	Merge branch 'master' of github.com:webnotes/erpnext into unicode ... Conflicts: public/js/all-app.js	2012-09-10 14:18:17 +05:30
Anand Doshi	bf8f343da7	check match conditions for companies list in chart of accounts/cost center	2012-09-10 14:13:01 +05:30
Anand Doshi	0dab087be1	Merge branch 'master' of github.com:webnotes/erpnext into unicode ... Conflicts: erpnext/accounts/doctype/sales_invoice/sales_invoice.txt public/js/all-app.js	2012-09-10 11:31:18 +05:30
Nabin Hait	f28f4c7a89	section hide_unhide issue fixed	2012-09-07 11:59:05 +05:30
Anand Doshi	f03e3bb06b	Merge branch 'master' of github.com:webnotes/erpnext into unicode	2012-09-06 07:55:19 +05:30
Anand Doshi	e642805882	changed date displayed in transaction listing from modified date to transaction/posting date	2012-09-03 13:32:25 +05:30
Anand Doshi	fa97e8c783	Merge branch 'master' of github.com:webnotes/erpnext into unicode ... Conflicts: erpnext/accounts/search_criteria/cash_flow_statement/__init__.py erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.py public/js/all-app.js	2012-08-31 12:09:02 +05:30
Nabin Hait	245f920772	removed cash flow statement	2012-08-31 11:01:21 +05:30
Anand Doshi	d0fcdf6ec1	Merge branch 'master' of github.com:webnotes/erpnext into unicode	2012-08-23 18:34:46 +05:30
Anand Doshi	763e4c93bc	added permission checking to show add child, edit and view ledger links ... in chart of accounts	2012-08-23 18:34:04 +05:30
Anand Doshi	297f37da03	Merge branch 'master' of github.com:webnotes/erpnext into unicode	2012-08-22 14:59:14 +05:30
Nabin Hait	fd3f24f4be	customer name should come in recurring invoice print format instead of customer id	2012-08-20 11:43:55 +05:30
Anand Doshi	5fc48f566f	Merge branch 'master' of github.com:webnotes/erpnext into unicode ... Conflicts: erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt	2012-08-17 11:48:34 +05:30
Nabin Hait	0170b2b4bc	default purchase taxes and charges master will be automatically fetched in pur transactions	2012-08-17 11:00:15 +05:30
Nabin Hait	7e555e9f78	Update erpnext/accounts/doctype/cost_center/cost_center.py	2012-08-14 16:42:30 +05:30
Nabin Hait	f039c8b58f	get_query for invoice in c-form	2012-08-14 15:38:17 +05:30
Anand Doshi	241437995f	Merge branch 'master' of github.com:webnotes/erpnext into unicode ... Conflicts: erpnext/setup/doctype/company/company.txt	2012-08-10 12:58:48 +05:30
Nabin Hait	4d0cba8249	Merge branch 'master' of github.com:webnotes/erpnext	2012-08-09 16:24:47 +05:30
Nabin Hait	cd4918736a	error fixed in account browser	2012-08-09 16:24:20 +05:30
Anand Doshi	63fee973d7	Merge branch 'master' of github.com:webnotes/erpnext into unicode	2012-08-09 11:34:47 +05:30
Anand Doshi	c4df355edc	removed msgprint in get_pos_details of sales invoice	2012-08-09 11:33:56 +05:30
Rushabh Mehta	49dc5da0dc	refactor unicode changes and merge with master with refactored email	2012-08-03 16:02:24 +05:30
Nabin Hait	8292691470	stock repost patch	2012-08-03 08:39:17 +05:30
Anand Doshi	396628e7ea	Merge branch 'master' of github.com:webnotes/erpnext into unicode ... Conflicts: erpnext/accounts/doctype/sales_invoice/sales_invoice.py erpnext/patches/patch_list.py	2012-07-27 14:45:24 +05:30
Nabin Hait	4572182939	Merge branch 'master' of github.com:webnotes/erpnext	2012-07-27 10:54:43 +05:30
Nabin Hait	3d72da568d	SO and DN mandatory only for stock item if made mandatory in global defaults	2012-07-27 10:51:51 +05:30
Rushabh Mehta	0fa628bf86	Merge branch 'master' of github.com:webnotes/erpnext into unicode ... Conflicts: erpnext/accounts/doctype/sales_invoice/sales_invoice.py erpnext/patches/patch_list.py public/js/report-legacy.js	2012-07-26 15:46:13 +02:00
Anand Doshi	80b8393338	fixes in email validation for recurring invoice	2012-07-26 19:01:16 +05:30
Nabin Hait	e8ff96565c	validate notification_email_ids in recurring invoice and if user is administrator set email id from profile	2012-07-24 10:59:31 +05:30
Nabin Hait	e9a62d1236	reload trial balance report	2012-07-23 11:46:37 +05:30
Anand Doshi	7118086658	Merge branch 'master' of github.com:webnotes/erpnext into unicode	2012-07-23 11:28:10 +05:30
Nabin Hait	454e268109	Recurring Invoice repititive mail sending issue fixed	2012-07-20 17:17:32 +05:30
Anand Doshi	486f9dfcec	added unicode_literals import at start of each file	2012-07-19 13:40:31 +05:30
Anand Doshi	5756630efb	Merge branch 'master' of github.com:webnotes/erpnext into dev ... Conflicts: erpnext/stock/doctype/delivery_note/delivery_note.py public/js/all-app.js	2012-07-18 20:31:37 +05:30
Anand Doshi	249659d673	Changed file names from listview.js to doctype_name_list.js	2012-07-18 20:25:58 +05:30
Anand Doshi	f2f5c94c41	Default Currency specification for Customer and Supplier ... This will get fetched in sales and purchase transactions respectively. Fix in sales order list view	2012-07-18 20:13:52 +05:30
Nabin Hait	a25ebe3dbf	Conversion rate fieldtype set as float (from currency)	2012-07-16 16:34:28 +05:30
Rushabh Mehta	2eef40bf1e	get_field > wn.meta.get_docfield	2012-07-16 14:16:57 +05:30
Rushabh Mehta	8cbbab2e75	Merge branch 'dev' of github.com:webnotes/erpnext into dev	2012-07-12 18:01:31 +05:30
Rushabh Mehta	4feae61b62	fixes to taxes and charges master and naming_series	2012-07-12 16:01:20 +05:30
Nabin Hait	70db682a9a	fixed conflict in setup control	2012-07-12 11:47:40 +05:30
Rushabh Mehta	5faf37f312	item group cleanup	2012-07-12 11:33:00 +05:30
Rushabh Mehta	cda9732f51	price list cleanup	2012-07-11 17:29:46 +05:30
Rushabh Mehta	3a0f191658	cleaned up fiscal_year, currency and added select-all + help in doclistview	2012-07-11 16:35:39 +05:30
Nabin Hait	3b0f5dddea	fiscal_year_closed and abbr removed from code	2012-07-11 15:14:06 +05:30
Rushabh Mehta	9acf463427	budget distribution cleanup and formatting of markdown	2012-07-11 14:39:33 +05:30
Rushabh Mehta	e3dd54c220	Merge branch 'dev' of github.com:webnotes/erpnext into dev	2012-07-11 13:19:36 +05:30
Rushabh Mehta	e57267f79a	added patch for account and cleanups to breadcrumbs and msgprint	2012-07-11 13:18:58 +05:30
Nabin Hait	21fdff01e2	Merge branch 'dev' of github.com:webnotes/erpnext into dev	2012-07-11 13:16:38 +05:30
Nabin Hait	9e5059f6b9	packing list introduced in pos invoice	2012-07-11 13:15:57 +05:30
Anand Doshi	e2cddd4e78	Merge branch 'dev' of github.com:webnotes/erpnext into dev	2012-07-11 12:09:41 +05:30
Nabin Hait	e4e78b469a	Merge branch 'dev' of github.com:webnotes/erpnext into dev	2012-07-11 11:54:08 +05:30
Rushabh Mehta	bf96499c0e	account cleanup, added toggle_fields in cur_frm	2012-07-11 09:51:18 +05:30
Rushabh Mehta	d6814dde29	account cleanup started	2012-07-10 18:38:59 +05:30
Nabin Hait	c296764cfe	repost button removed from closing entry voucher	2012-07-10 18:25:59 +05:30
Nabin Hait	04aa191869	freezed account allowed in closing entry	2012-07-10 18:18:03 +05:30
Rushabh Mehta	5281e350fb	cost center cleanup	2012-07-10 18:16:09 +05:30
Nabin Hait	29d7641206	fixed issue in period closing voucher: consider freezed account for closing	2012-07-10 18:12:00 +05:30
Rushabh Mehta	1ee2a5ac12	cost center cleanup + grid css	2012-07-10 17:22:20 +05:30
Nabin Hait	0aec0e1a63	repost balance button removed from period closing voucher	2012-07-10 14:24:45 +05:30
Nabin Hait	7c0b893b1f	mandatory validation in cost center	2012-07-10 14:18:35 +05:30
Nabin Hait	969622dcef	mandatory validation in cost center	2012-07-10 14:11:01 +05:30
Anand Doshi	95a822c701	Fetch Customer's Item Code in Sales Transaction	2012-07-09 11:09:07 +05:30
Anand Doshi	8c90f12967	changed label of included in print rate to Is this Tax included in Basic Rate?	2012-07-04 13:30:13 +05:30
Anand Doshi	c4cae8d561	Merge branch 'master' into dev	2012-06-29 19:07:29 +05:30
Anand Doshi	54b7235705	formatted money in chart of accounts tree	2012-06-29 19:07:20 +05:30
Anand Doshi	365e0c5f13	Merge branch 'master' into dev	2012-06-29 19:04:10 +05:30
Anand Doshi	351352670e	formatted money in chart of accounts tree	2012-06-29 19:03:59 +05:30
Anand Doshi	d4425cc57d	Merge branch 'master' into dev ... Conflicts: erpnext/support/doctype/maintenance_visit/maintenance_visit.py	2012-06-27 14:13:34 +05:30
Nabin Hait	b81aa88091	Lease agreement link removed from account home page	2012-06-27 12:00:24 +05:30
Anand Doshi	81fa802e09	Merge branch 'master' into dev	2012-06-25 20:06:54 +05:30
Anand Doshi	8ae5ba9abf	fixes related to --> clear locals and then sync locals when whole doclist is passed	2012-06-25 20:05:35 +05:30
Nabin Hait	8b14617dce	run view ledger report through set_route	2012-06-25 13:15:59 +05:30
Nabin Hait	33dcbc096a	error fixed in cost center wise expense report	2012-06-22 14:34:46 +05:30
Nabin Hait	bceec1cbef	error fixed in cost center wise expense report	2012-06-22 14:32:56 +05:30
Nabin Hait	1f5a58eed7	listview of sales invoice	2012-06-22 14:19:06 +05:30
Nabin Hait	486718250e	listview of purchase invoice and deletion of supplier	2012-06-22 14:14:04 +05:30
Nabin Hait	318eab813c	delete customer account on deletion of customer record	2012-06-22 13:35:13 +05:30
Nabin Hait	0480153042	error fixed in sales register	2012-06-19 18:07:03 +05:30
Nabin Hait	11de3ec952	fixed error in purchase register	2012-06-19 18:03:31 +05:30
Nabin Hait	28447e84c2	Update master	2012-06-18 11:03:51 +05:30
Nabin Hait	8eadf09e99	recurring invoice : quarterly, half-yearly and yearly	2012-06-17 21:48:33 +05:30
Rushabh Mehta	4c56275d26	appframe is now heading	2012-06-14 11:05:09 +05:30
Nabin Hait	8afa88b906	fixed utf8 error in multi ledger export	2012-06-11 17:48:40 +05:30
Nabin Hait	856442e33b	taxes query changes	2012-06-08 12:13:00 +05:30
Nabin Hait	2e3579a4eb	Item Barcode implemented	2012-06-07 19:09:17 +05:30
Nabin Hait	91034af0dc	Get Query changes for tax account: allowed account type income/expense	2012-06-07 12:12:08 +05:30
Nabin Hait	252a7a189b	Account type=Income/Expense allowed in income/expense account searching in sales/pur invoice	2012-06-05 15:27:12 +05:30
Nabin Hait	6c34e1411f	Flexible invoice period in recurring invoice	2012-06-04 16:21:25 +05:30
Nabin Hait	bc8e9d7a34	Flexible invoice period in recurring invoice	2012-06-04 16:18:38 +05:30
Nabin Hait	6ea87a42a8	convert to group/ledger button hide/unhide issue fixed	2012-06-04 14:04:36 +05:30
Nabin Hait	aaab084a12	uom field added in pur invoice item table	2012-06-04 12:10:43 +05:30
Nabin Hait	d2301f9569	uom field added in pur invoice item table	2012-06-04 12:07:45 +05:30
Nabin Hait	765298bc63	uom field added in pur invoice item table	2012-06-04 12:02:56 +05:30
Nabin Hait	e44ebb1ec7	removed available qty validation in pos	2012-05-31 15:22:05 +05:30
Nabin Hait	fe678fd638	balance area only for accounts not for cost center	2012-05-31 13:32:45 +05:30
Nabin Hait	0908b2709b	fixed conflict	2012-05-31 11:49:37 +05:30
Nabin Hait	5c1de3a639	fixed conflict	2012-05-31 11:47:09 +05:30
Nabin Hait	353bc313a6	Link to Sales/accounts browser fixed	2012-05-31 11:43:14 +05:30
Anand Doshi	3b091418ec	allow zero payment in POS Invoice, when cash/bank account is not specified	2012-05-28 18:08:02 +05:30
Anand Doshi	9327bb9585	fix in tag viewing in doclistview	2012-05-23 15:12:22 +05:30
Nabin Hait	86df78aabc	fixed conflict	2012-05-23 11:33:28 +05:30
Nabin Hait	df9f8a363e	Balance on chart of accounts	2012-05-22 16:54:46 +05:30
Nabin Hait	b695f73293	Maintain same rate throughout pur cycle: in global defaults, by default set true	2012-05-22 14:53:40 +05:30
Nabin Hait	86375f089a	Merge branch 'shf_rename' ... Conflicts: erpnext/patches/patch_list.py	2012-05-21 15:48:21 +05:30
Nabin Hait	ee2201cc68	forced export limit increased to 2000	2012-05-21 15:13:57 +05:30
Anand Doshi	1aae261490	delete button in doclistview	2012-05-21 14:31:03 +05:30
Nabin Hait	d9742a6a58	on_trash modified for item group, territory, customer group, and sales person	2012-05-21 13:33:09 +05:30
Nabin Hait	c68635d70a	Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename	2012-05-18 18:37:28 +05:30
Nabin Hait	3b8d4776a2	company validation	2012-05-18 18:36:56 +05:30
Anand Doshi	00175612ac	Merge branch 'shf_rename' ... Conflicts: erpnext/stock/doctype/item/listview.js	2012-05-18 16:50:35 +05:30
Anand Doshi	d49da9bff1	new listviews	2012-05-18 16:49:36 +05:30
Anand Doshi	d643d367ca	Merge branch 'shf_rename' ... Conflicts: public/js/all-app.js public/js/all-web.js	2012-05-18 11:52:31 +05:30
Anand Doshi	fc9145425d	Fixes in Print Formats - discount in description	2012-05-17 18:11:54 +05:30
Anand Doshi	c7e26873c0	Merge branch 'shf_rename'	2012-05-17 15:28:54 +05:30
Anand Doshi	dad93ce8a3	fix in payment reconciliation	2012-05-17 15:28:38 +05:30
Anand Doshi	ae4fc41e61	Merge branch 'shf_rename'	2012-05-16 14:35:15 +05:30
Nabin Hait	7b87a7ec74	fixed pos settings	2012-05-16 14:07:02 +05:30
Anand Doshi	c51c0d38d7	Merge branch 'shf_rename'	2012-05-16 12:28:14 +05:30
Nabin Hait	86dec8da7a	naming series issue fixed in pos settings	2012-05-16 12:20:21 +05:30
Anand Doshi	f295591168	Merge branch 'shf_rename'	2012-05-14 18:03:45 +05:30
Rushabh Mehta	deeae62b18	merge js/css	2012-05-14 15:03:17 +05:30
Nabin Hait	a13b435163	invoice period in print format if recurring invoice	2012-05-14 14:11:56 +05:30
Anand Doshi	07af8f6247	fix in last purchase rate	2012-05-14 13:02:31 +05:30
Anand Doshi	4a3d3d75de	Merge branch 'shf_rename' ... Conflicts: erpnext/patches/patch_list.py	2012-05-14 12:53:29 +05:30
Anand Doshi	cec150b487	fixes in last purchase rate	2012-05-11 18:13:53 +05:30
Rushabh Mehta	0eb790a0ae	cleaned up imports, doc	2012-05-11 15:53:37 +05:30
Nabin Hait	956eeb1361	fetch defaults after mapping from prev document	2012-05-11 14:45:02 +05:30
Anand Doshi	df74d30cf1	fix in listview of journal voucher	2012-05-10 19:19:31 +05:30
Anand Doshi	02c0eaf99a	don't show currency in journal voucher's listview	2012-05-10 18:48:15 +05:30
Nabin Hait	6fb498ebcd	changed field position of net total(import)	2012-05-10 14:03:39 +05:30
Anand Doshi	df8b4ab9b1	Merge branch 'cms'	2012-05-10 10:21:29 +05:30
Rushabh Mehta	078867c411	fixes to listview	2012-05-09 16:15:51 +05:30
Nabin Hait	68f9ad31ae	serialized inventory fixes : serial no for sales bom child item and rejected qty	2012-05-09 15:26:27 +05:30
Rushabh Mehta	e45042e011	merge	2012-05-09 12:22:50 +05:30
Nabin Hait	a6b8e84f09	removed whong depends on value	2012-05-08 17:18:40 +05:30
Rushabh Mehta	c22d9e03e7	Merge branch 'shf_rename' of github.com:webnotes/erpnext into cms	2012-05-08 11:02:58 +05:30
Rushabh Mehta	a920943e43	new cms with public folder	2012-05-07 18:00:57 +05:30
Nabin Hait	5f4ca56fd1	Fixes related to renamedt	2012-05-07 11:59:23 +05:30
Nabin Hait	8cf9934b93	Trend analyzer issue fixed	2012-05-04 12:52:56 +05:30
Nabin Hait	978a1e0e46	field rearranged in sales invoice	2012-05-04 11:57:55 +05:30
Rushabh Mehta	7f5791ba1e	jv, search fix	2012-05-04 10:10:30 +05:30
Nabin Hait	32826a8cf1	fixes in customerwise price list	2012-05-03 13:10:34 +05:30
Rushabh Mehta	acd0769098	list in listview and sales order fix	2012-05-03 10:20:38 +05:30
Rushabh Mehta	d5e1031f42	floating logo on left	2012-05-02 17:44:59 +05:30
Nabin Hait	ab96d12086	fixes in customerwise price list	2012-05-02 12:19:33 +05:30
Nabin Hait	07c3b399f6	field arrngement fix	2012-05-02 10:00:03 +05:30
Nabin Hait	722bbd8ef0	JV fix	2012-05-01 16:36:51 +05:30
Nabin Hait	796505a83e	field arrangement in purchase and stock cycle	2012-05-01 16:26:16 +05:30
Nabin Hait	57d7c815d2	field arrangement in sales cycle	2012-05-01 12:35:12 +05:30
Nabin Hait	926f46f04a	Fixed conflict while merging with master	2012-05-01 11:51:08 +05:30
Nabin Hait	d58da50f50	Merge branch 'master' of github.com:webnotes/erpnext	2012-05-01 11:37:45 +05:30
Nabin Hait	1e335f3272	fixes in validattion of debit to account with customer in sales invoice	2012-05-01 10:53:50 +05:30
Nabin Hait	41c62727c7	fixes in validattion of debit to account with customer in sales invoice	2012-05-01 10:45:47 +05:30
Rushabh Mehta	79a664b4dc	cleaned up lead, opportunity, jv	2012-04-30 16:12:03 +05:30
Nabin Hait	0d1daa8875	fld order change	2012-04-27 13:56:58 +05:30
Nabin Hait	a6b7886175	resolved conflict while merging with master	2012-04-26 13:02:36 +05:30
Nabin Hait	50c799880a	Merge branch 'master' of github.com:webnotes/erpnext	2012-04-26 12:47:30 +05:30
Nabin Hait	04a276c934	Error fixed in gl netry when negative entry and cancel event	2012-04-25 16:08:45 +05:30
Nabin Hait	8f9a953931	Update erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.py	2012-04-23 19:00:39 +05:30
Nabin Hait	e848300958	patch list modified	2012-04-23 18:24:22 +05:30
Nabin Hait	2bbb086b10	Update erpnext/accounts/doctype/rv_detail/rv_detail.txt	2012-04-23 17:57:18 +05:30
Nabin Hait	b743bb6c10	ledger bal export format changed	2012-04-23 14:03:07 +05:30
Nabin Hait	51834a45a7	purchase invoice with write off feature	2012-04-23 12:47:12 +05:30
Nabin Hait	f7c506d69e	fixed conflict while merging with master branch	2012-04-20 13:58:43 +05:30
Nabin Hait	e72ae2a19b	fixed conflict	2012-04-20 13:41:09 +05:30
Nabin Hait	0788570ce7	automatically write off feature in sales invoice	2012-04-20 13:31:05 +05:30
Nabin Hait	239e79038f	Customer/customer group wise price list	2012-04-20 10:25:03 +05:30
Anand Doshi	f642168a26	hr home: changed Allocate Leaves --> Leave Allocation Tool	2012-04-18 18:35:30 +05:30
Anand Doshi	385380125b	fixes in customize form, naming series form loading	2012-04-18 16:04:02 +05:30
Nabin Hait	5da9d56047	removed voucher date filter	2012-04-17 18:05:58 +05:30
Anand Doshi	44f16eaefa	Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename	2012-04-17 13:00:01 +05:30
Anand Doshi	b9e9197e5f	fix in doclistview - check if _user_tags exists before rendering	2012-04-17 12:59:18 +05:30
Rushabh Mehta	38bdf6c5e7	Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename	2012-04-17 12:41:04 +05:30
Rushabh Mehta	2146fd17e7	new sales_browser	2012-04-17 12:40:37 +05:30
Anand Doshi	24e18569d9	fixes in install docs for roles	2012-04-17 11:45:35 +05:30
Anand Doshi	45a4edc9c9	Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename ... Conflicts: css/all-app.css version.num	2012-04-17 11:19:15 +05:30
Rushabh Mehta	71085592a4	fixed account_browser	2012-04-16 18:36:46 +05:30
Rushabh Mehta	6820dbf72d	framework build	2012-04-16 13:33:14 +05:30
Rushabh Mehta	f465b4fa76	merge	2012-04-13 19:06:05 +05:30
Rushabh Mehta	850c928a02	started rewrite of accounts browser	2012-04-13 19:04:55 +05:30
Anand Doshi	a202f00dc0	fixes in accounts	2012-04-13 16:03:27 +05:30
Nabin Hait	1c9061eff6	fixed conflict using theirs	2012-04-13 14:24:35 +05:30
Nabin Hait	6c615d9527	Merge branch 'master' of github.com:webnotes/erpnext	2012-04-13 14:14:39 +05:30
Anand Doshi	3abe9bd018	fixes in fieldnames and hide unnecessary fields in jv	2012-04-13 12:36:44 +05:30
Anand Doshi	b641ed2a1e	Added doc_type to JV Print Formats	2012-04-13 12:27:56 +05:30
Rushabh Mehta	d76146372e	merge	2012-04-13 12:01:23 +05:30
Rushabh Mehta	97ae17eaf7	merge	2012-04-13 11:42:56 +05:30
Rushabh Mehta	f1264a7f76	listing, module pages in appframe	2012-04-13 11:41:43 +05:30
Anand Doshi	83808267d5	Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename	2012-04-13 11:40:38 +05:30
Anand Doshi	1c2ac00a82	fixes in sales cycle	2012-04-13 11:38:01 +05:30
Anand Doshi	f31fc22ef0	fixes in doctype	2012-04-13 11:37:19 +05:30
Nabin Hait	a73b2965aa	cleanup and fixes	2012-04-13 11:02:26 +05:30
Anand Doshi	25bc68c7b2	fix in field names	2012-04-12 14:08:43 +05:30
Anand Doshi	654f6bfa85	fixes	2012-04-12 12:15:35 +05:30
Anand Doshi	9e6af24269	fixes in button function calling	2012-04-11 19:07:02 +05:30
Anand Doshi	2424387651	fixes after sync testing	2012-04-10 19:14:37 +05:30
Nabin Hait	af094b9daf	ledger balance export report in new format	2012-04-10 18:07:36 +05:30
Anand Doshi	9afb57ffb2	Syntax error fix in c_form.txt	2012-04-09 12:23:36 +05:30
Anand Doshi	87a2c5cc69	Merge branch 'master' of github.com:webnotes/erpnext into shf_rename ... Conflicts: erpnext/accounts/doctype/c_form/c_form.txt erpnext/patches/patch_list.py erpnext/setup/doctype/permission_control/permission_control.py	2012-04-09 12:14:53 +05:30
Anand Doshi	82042f1cff	fixes after sync	2012-04-06 17:54:17 +05:30
Nabin Hait	7da6ebc9af	Attachment option and total invoiced amt added in c-form	2012-04-06 17:30:53 +05:30
Nabin Hait	05e4fc6eb6	Chart of account/cc link only for accounts user and account manager role in account home page	2012-04-06 15:19:02 +05:30
Anand Doshi	7e0479bc4c	cleanup of search criteria	2012-04-05 18:27:56 +05:30
Anand Doshi	fa0cd89a7c	change from labels to fieldname in cur_frm.cscript	2012-04-05 13:03:35 +05:30
Anand Doshi	5112b5b6b8	rerun of rename_dt	2012-04-02 19:12:29 +05:30
Rushabh Mehta	c7f1e5a54a	patch fixes	2012-04-02 14:24:35 +05:30
Rushabh Mehta	5475a3ca66	patch fixes	2012-04-02 14:06:46 +05:30
Anand Doshi	0442bc5d63	fix in patch list	2012-04-02 13:09:20 +05:30
Anand Doshi	c88ae2be4d	rename dt second cut	2012-03-30 18:18:36 +05:30
Anand Doshi	fedfd89e4a	rename dt first cut	2012-03-30 12:29:06 +05:30
Anand Doshi	37fb9c8f27	Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename ... Conflicts: version.num	2012-03-29 15:35:08 +05:30
Anand Doshi	7ff696fb12	Merge branch 'renamedt' into shf_rename ... Conflicts: erpnext/patches/patch_list.py	2012-03-29 15:31:17 +05:30
Anand Doshi	fddb782a82	Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt	2012-03-29 15:28:16 +05:30
Nabin Hait	dc8ce0190d	Merge branch 'master' into renamedt	2012-03-29 11:53:02 +05:30
Anand Doshi	9767f79845	fix in Sales Order-Receivable Voucher Mapper	2012-03-28 19:25:29 +05:30
Rushabh Mehta	635f359a71	Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate	2012-03-28 15:18:28 +02:00
Rushabh Mehta	43d64c6116	Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate	2012-03-28 15:17:59 +02:00
Anand Doshi	2f74d2e7bd	Merge branch 'master' of github.com:webnotes/erpnext	2012-03-28 18:34:50 +05:30
Anand Doshi	779a365420	fix in print hide of amount in words	2012-03-28 18:31:26 +05:30
Anand Doshi	18ffd2a1b8	Merge branch 'master' into handlerupdate	2012-03-28 17:56:33 +05:30
Anand Doshi	c9456c18dc	listviews	2012-03-28 17:48:30 +05:30
Rushabh Mehta	0dfa140b7d	Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate	2012-03-28 10:42:20 +02:00
Nabin Hait	e6340f26c2	mapper fix in DN_RV	2012-03-28 14:11:31 +05:30
Rushabh Mehta	bb769c5461	Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate	2012-03-28 08:04:17 +02:00
Nabin Hait	6ed0450dba	reload mapper for checking ref value	2012-03-28 11:32:44 +05:30
Anand Doshi	2513e50dc4	Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge ... Conflicts: erpnext/website/doctype/style_settings/style_settings.txt version.num	2012-03-27 19:37:10 +05:30
Anand Doshi	a30fbd004e	merge of sync handler and sync_file_db - first cut	2012-03-27 19:31:38 +05:30
Nabin Hait	a0a3ca3178	Merge branch 'master' of github.com:webnotes/erpnext	2012-03-27 17:09:03 +05:30
Anand Doshi	3107096890	Merge branch 'master' of github.com:webnotes/erpnext into shf_merge	2012-03-27 15:02:38 +05:30
Rushabh Mehta	91c79305e8	Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate	2012-03-26 12:11:22 +02:00
Nabin Hait	854935f12c	added docstatus in item get_query in PV	2012-03-26 15:40:56 +05:30
Anand Doshi	c009450ef0	fix in item addition - details fetching	2012-03-26 14:17:30 +05:30
Anand Doshi	5f9501d4d8	Merge branch 'sync_file_db' into shf_merge ... Conflicts: erpnext/projects/doctype/project/project.txt	2012-03-23 14:51:35 +05:30
Nabin Hait	f88326ba3f	sync ref db	2012-03-22 15:07:05 +05:30
Rushabh Mehta	27cf13b541	merge	2012-03-22 11:37:56 +05:30
Rushabh Mehta	3f46696db2	removed slider ui	2012-03-22 11:37:08 +05:30
Nabin Hait	f676824791	Merge branch 'master' of github.com:webnotes/erpnext	2012-03-21 17:08:35 +05:30
Rushabh Mehta	2d229b423e	Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate	2012-03-21 12:28:42 +01:00
Nabin Hait	d551281cbe	cdt not defined fixed	2012-03-21 16:57:08 +05:30
Nabin Hait	0ad2ef2111	sync with respect to file	2012-03-21 15:02:39 +05:30
Nabin Hait	e8da15cb5b	sync ref file	2012-03-21 12:45:14 +05:30
Rushabh Mehta	f74ef4c64b	Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate	2012-03-21 07:18:41 +01:00
Rushabh Mehta	a665c1f60d	stylefixes and listviews	2012-03-21 11:47:58 +05:30
Rushabh Mehta	dad4e3ebac	Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate	2012-03-21 07:17:28 +01:00
Nabin Hait	5f04061291	changes in recurring invoice print format	2012-03-21 11:47:00 +05:30
Rushabh Mehta	454c6ac716	Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate	2012-03-21 05:42:31 +01:00
Rushabh Mehta	437c1b512c	listview update and form fix	2012-03-20 18:45:28 +05:30
Nabin Hait	ba62cf3b5a	Merge branch 'master' of github.com:webnotes/erpnext	2012-03-20 17:40:16 +05:30
Nabin Hait	39c26f4580	billing period in recurring sales invoice mail	2012-03-20 17:39:48 +05:30
Nabin Hait	ceb9f41f15	lead organization fld added in quotation for printing: patch	2012-03-20 17:04:32 +05:30
Anand Doshi	d05aad6474	fix in POS invoice	2012-03-20 12:33:02 +05:30
Anand Doshi	4f5e92a06c	Merge branch 'master' of github.com:webnotes/erpnext	2012-03-20 12:17:50 +05:30
Anand Doshi	3401086d66	POS Invoice fix	2012-03-20 12:07:18 +05:30
Rushabh Mehta	d48417c93b	slide navigation fixes	2012-03-19 18:42:13 +05:30
Rushabh Mehta	ffe9d358e8	Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate	2012-03-19 12:40:07 +01:00
Nabin Hait	65ad3b1a0f	Update erpnext/accounts/search_criteria/trial_balance/trial_balance.py	2012-03-19 17:09:14 +05:30
Rushabh Mehta	6498cee998	fixed conflict	2012-03-19 09:01:16 +01:00
Nabin Hait	b6cd3316c4	error fixed in lease receipts client wise	2012-03-19 13:27:06 +05:30
Anand Doshi	f02c9e7b6c	fix in due_date fetching for receivable voucher	2012-03-19 11:43:24 +05:30
Rushabh Mehta	7afaa8665d	major reworking of page navigation	2012-03-16 18:28:09 +05:30
Rushabh Mehta	2438de4c9b	fixed tags in list2	2012-03-15 16:43:46 +05:30
Rushabh Mehta	08b670bddd	listing with stats	2012-03-14 19:06:20 +05:30
Rushabh Mehta	9a1bdf7224	Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate	2012-03-07 18:20:33 +05:30
Nabin Hait	00260870d1	fixes in rv	2012-03-07 12:50:55 +05:30
Rushabh Mehta	0dd5da2299	Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate	2012-03-06 18:41:52 +05:30
Rushabh Mehta	15da133de9	removed	2012-03-06 18:41:11 +05:30
Nabin Hait	b659457b4d	Removed def value from invoice naming series	2012-03-06 11:07:24 +05:30
Nabin Hait	cf9c4c45a5	export /import fld hide issue, discount issue	2012-03-05 15:21:35 +05:30
Nabin Hait	9cee59cd05	field order changed	2012-03-05 10:54:54 +05:30
Nabin Hait	89a30ff7dc	Company 'all' removed from financial statements	2012-03-02 17:15:01 +05:30
Nabin Hait	0d155a9135	print hide issue	2012-03-02 14:57:44 +05:30
Nabin Hait	88986ca007	column break print hide issue	2012-03-02 12:29:08 +05:30
Nabin Hait	db4af96388	issue fixed in pos	2012-03-01 18:47:51 +05:30
Nabin Hait	e3ce5b4e0c	voucher date removal issue fixed	2012-03-01 17:37:36 +05:30
Nabin Hait	be0b090d27	voucher date removal issue fixed	2012-03-01 17:31:51 +05:30
Anand Doshi	496d9a0980	Merge branch 'master' into navupdate	2012-03-01 14:55:22 +05:30
Nabin Hait	b95ad21208	Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate	2012-03-01 14:48:13 +05:30
Nabin Hait	cf907f98bd	error fixed in posting balance	2012-03-01 14:47:56 +05:30
Anand Doshi	552093c3fd	Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate ... Conflicts: version.num	2012-03-01 13:51:23 +05:30
Anand Doshi	1f4efc77ac	fix in print formats and file rename	2012-03-01 13:50:33 +05:30
Nabin Hait	eaf144a545	form cleanup in pur cycle	2012-03-01 13:05:04 +05:30
Nabin Hait	6d517ff005	form cleanup: fixed callback issues	2012-03-01 10:57:23 +05:30
Nabin Hait	63b275c97f	allowed debit and credit against same acc head	2012-03-01 10:35:35 +05:30
Nabin Hait	6c75cce4b9	fixed confilct	2012-02-28 11:46:43 +05:30
Anand Doshi	f9e4b16731	fix in scheduler related import issue	2012-02-28 11:31:46 +05:30
Nabin Hait	5bdd20c46b	dynamic label change, form cleanup, hide/unhide in purchase cycle	2012-02-27 18:46:51 +05:30
Nabin Hait	0959341130	Form Cleanup: Dynamic label change, smart hide/unhide and dependencies	2012-02-27 12:47:40 +05:30
Nabin Hait	0cde984dc5	Update future year balances at the time of tranaction and acc bal reposting patch	2012-02-27 12:34:14 +05:30
Rushabh Mehta	3966f1dc5d	added license files	2012-02-23 12:35:32 +05:30
Rushabh Mehta	c5471ddb8d	added setup and removed multi-col layout in body	2012-02-22 12:07:42 +05:30
Rushabh Mehta	35fabf76a6	updated module pages	2012-02-21 19:03:50 +05:30
Rushabh Mehta	d025133b39	added module pages and other css updates	2012-02-21 17:26:50 +05:30
Nabin Hait	6ac0be5fb2	delete all cancelled gl entry on account deletion	2012-02-20 13:04:36 +05:30
Nabin Hait	2d8ac7f3f9	fixed asynchronus issue	2012-02-15 17:31:23 +05:30
Nabin Hait	ab90ee04f5	callback issues and item default get most priority	2012-02-15 14:28:02 +05:30
Nabin Hait	84d73103f8	sales team mapping issue in SO-DN and SO-RV	2012-02-14 15:13:21 +05:30
Anand Doshi	ce0c65f173	Merge branch 'stable' into latest	2012-02-13 18:01:23 +05:30
Rushabh Mehta	f17ce7bc67	added whitelist check	2012-02-13 16:50:52 +05:30
Anand Doshi	702f174265	call update item details in post render	2012-02-13 15:29:41 +05:30
Anand Doshi	15d2d45b36	Merge branch 'stable' into latest	2012-02-10 10:57:26 +05:30
Anand Doshi	110047ea5b	Debit/Credit note creation on purchase/sales return	2012-02-10 10:48:35 +05:30
Anand Doshi	cf5f0232a9	Merge branch 'stable' into latest	2012-02-08 16:23:35 +05:30
Anand Doshi	df3f452a14	Fix in Purchase Invoice creation due to item tax stringify issue	2012-02-08 16:22:59 +05:30
Anand Doshi	9908d6e4be	Merge branch 'stable' into latest	2012-02-08 11:05:47 +05:30
Anand Doshi	c9fcc05792	Allow IS POS to be set as default from customize form view	2012-02-08 10:46:27 +05:30
Anand Doshi	4e47c48707	Merge branch 'stable' into latest	2012-02-07 13:33:10 +05:30
Anand Doshi	7e8082e193	Fixed mapping of conversion rate for PO-PR and PO-PV	2012-02-07 13:32:20 +05:30
Anand Doshi	67d2c8396c	Merge branch 'latest' of github.com:webnotes/erpnext into latest ... Conflicts: version.num	2012-02-07 10:59:29 +05:30
Anand Doshi	e00e70841c	Merge branch 'stable' into latest ... Conflicts: erpnext/accounts/doctype/journal_voucher/journal_voucher.js erpnext/accounts/doctype/payable_voucher/payable_voucher.js index.html version.num	2012-02-07 10:58:45 +05:30
Anand Doshi	d008964fd6	Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues	2012-02-07 10:48:11 +05:30
Rushabh Mehta	e651648b1b	added missing icons	2012-02-06 16:28:06 +05:30
Anand Doshi	6d5cd01e03	Merge branch 'stable' into latest	2012-02-02 15:36:58 +05:30
Anand Doshi	2cb047d5a4	Added search field 'account_type' in account doctype	2012-02-02 15:36:34 +05:30
Anand Doshi	62427a6024	Merge branch 'stable' into latest	2012-02-02 15:23:33 +05:30
Anand Doshi	962c2aa80d	Auto fetch default bank account for jv of type Bank Voucher	2012-02-02 15:22:11 +05:30
Rushabh Mehta	bc5ec4f19e	version	2012-01-30 14:02:41 +05:30
Rushabh Mehta	d6840b202a	added products + cleanups	2012-01-30 14:00:46 +05:30
Anand Doshi	e72de12993	Merge branch 'master' into latest ... Conflicts: index.html version.num	2012-01-30 11:59:05 +05:30
Anand Doshi	76a4caeada	fix in send notification part of recurring invoices	2012-01-27 14:34:26 +05:30
Anand Doshi	f5738817db	fix in recurring invoice	2012-01-27 14:18:09 +05:30
Anand Doshi	707cd06606	Merge branch 'latest' of github.com:webnotes/erpnext into latest ... Conflicts: erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py	2012-01-27 12:30:35 +05:30
Anand Doshi	02c662936f	Merge branch 'master' into latest	2012-01-27 12:28:21 +05:30
Anand Doshi	74d1b65105	changed sql to webnotes.conn.sql to avoid errors due to closing of connections in scheduler/push patch	2012-01-27 12:25:09 +05:30
Rushabh Mehta	51e51da63f	added about_us	2012-01-27 12:17:09 +05:30
Rushabh Mehta	865c00a79a	started website	2012-01-24 14:33:21 +05:30
Anand Doshi	26814e7bad	Remove Get TDS button, which appears twice in JV	2012-01-19 14:26:25 +05:30
Anand Doshi	890aa0f51d	fix: interface error due to use of sql instead of webnotes.conn.sql	2012-01-18 12:25:20 +05:30
Anand Doshi	a318235a1f	Fix: Paid amount + Write Off Amount and grand total difference calculation with 2 decimal precision	2012-01-13 15:53:46 +05:30
Anand Doshi	266829f024	Merge branch 'master' into stable	2012-01-10 13:59:14 +05:30
Anand Doshi	a0aa3d5605	Merge branch 'master' of github.com:webnotes/erpnext	2012-01-10 13:59:04 +05:30
Anand Doshi	a9df960494	On Print Hide, hide net_total, rounded_total_export and grand_total_export	2012-01-09 16:55:30 +05:30
Anand Doshi	58455c9d8e	Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed	2012-01-06 14:33:57 +05:30
Anand Doshi	5e57a39bb1	Merge branch 'master' into stable	2012-01-04 19:32:01 +05:30
Anand Doshi	f80f20f480	Changes in Notifications	2012-01-04 19:31:32 +05:30
Anand Doshi	6ac1d4bb44	Merge branch 'stable' of github.com:webnotes/erpnext into stable ... Conflicts: erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt	2012-01-03 11:45:11 +05:30
Anand Doshi	d56d57d205	Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login	2012-01-02 16:25:05 +05:30
Anand Doshi	10748d6bdb	Merge pull request #190 from anandpdoshi/master ... Changed link for customer master and supplier master in accounts browser	2011-12-28 03:49:13 -08:00
Anand Doshi	eaa6d21691	Changed link for customer master and supplier master in accounts browser	2011-12-28 17:18:09 +05:30
Nabin Hait	9e08c12a10	Default price list currency issue in delivery note fixed	2011-12-28 16:30:48 +05:30
Nabin Hait	3029474b0e	Fixes in recurring invoice	2011-12-27 16:42:03 +05:30
Nabin Hait	382dc6e819	GL Mapper changes for JV	2011-12-23 18:25:11 +05:30
Nabin Hait	d0a892ffe7	print hide price list flds	2011-12-22 19:04:49 +05:30
Nijil Y	9e6f00abab	fixes for notification	2011-12-21 14:54:14 +05:30
Nabin Hait	60fc54a9ba	Price List redesign: Maintain PL in any currency and convert it into base currency in the particular form	2011-12-20 18:59:26 +05:30
Nabin Hait	b2150de64b	Freezing Error fixed in purchase invoice	2011-12-15 16:29:04 +05:30
Nabin Hait	9e4d5b9649	Merge branch 'master' of github.com:webnotes/erpnext	2011-12-14 11:27:50 +05:30
Nabin Hait	f21ceb283c	Arranged field order in item table	2011-12-14 11:26:05 +05:30
Nabin Hait	dcac0e7565	Merge pull request #156 from anandpdoshi/master ... Email Digest and patch to remove duplicate entries created in Table Mapper Detail	2011-12-13 05:37:41 -08:00
Nabin Hait	08d803791d	Merge branch 'master' of git://github.com/nijil/erpnext	2011-12-13 18:49:59 +05:30
Nabin Hait	85e8e01fd6	notification email for recurring invoice	2011-12-13 18:48:24 +05:30
Nijil Y	8fb260504a	purchase discount	2011-12-13 18:14:15 +05:30
Anand Doshi	206df20f36	Changes in print formats to include selected print heading and discount ... appended in description	2011-12-13 15:57:09 +05:30
Anand Doshi	5245e6547b	Change path of images in accounts browser and sales browser	2011-12-12 19:18:23 +05:30
Nabin Hait	8a6b3b8713	Validation added in c-form	2011-12-12 14:16:16 +05:30
Nijil Y	fdc7fc62a5	payable voucher.js	2011-12-12 10:50:18 +05:30
Nijil Y	b54d7282a7	pvdetail	2011-12-12 10:31:23 +05:30
Nijil Y	38821f6104	txt order update	2011-12-08 18:32:58 +05:30
Nabin Hait	fd20340576	Introduced C-form for Indian customer	2011-12-08 17:49:40 +05:30
Nijil Y	edf8bc2a3e	Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext ... Conflicts: erpnext/accounts/doctype/pv_detail/pv_detail.txt erpnext/buying/doctype/po_detail/po_detail.txt erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt	2011-12-08 17:29:24 +05:30
Nijil Y	add0c85648	Discount in purchase cycle	2011-12-08 16:53:12 +05:30
Nijil Y	d8e5bed9e5	Discount in purchase cycle	2011-12-08 16:09:18 +05:30
Nabin Hait	38d24534d7	Recurring invoice checkbox added in features setup	2011-12-06 19:04:21 +05:30
Nabin Hait	a4fdc84fda	Introduced recurring invoices	2011-12-06 15:04:47 +05:30
Nijil	2f82c29348	..	2011-11-24 15:18:17 +05:30
Nijil	ba40bc93fe	payable voucher txt	2011-11-24 15:14:09 +05:30
Nijil	c37dad26d9	txt files	2011-11-24 15:07:54 +05:30
Nabin Hait	e92066fa80	modified fld prop in gl entry and index patch	2011-11-24 15:04:47 +05:30
Anand Doshi	956d665738	Merge pull request #148 from anandpdoshi/master ... Modified GLEntry doctype to be not in create	2011-11-24 00:29:53 -08:00
Anand Doshi	96e5343519	Marked GLEntry as Not In Create	2011-11-24 13:51:09 +05:30
Nabin Hait	04176e62d8	fixed error in internal reco	2011-11-23 12:15:42 +05:30
Nijil	54eb735a47	Added Discount in Purchase Cycle	2011-11-22 15:12:00 +05:30
Nabin Hait	f164b269db	Merge branch 'master' of github.com:webnotes/erpnext	2011-11-16 16:39:16 +05:30
Nabin Hait	b0fa2af45b	Rewritten landed cost wizard	2011-11-16 16:20:37 +05:30
Anand Doshi	bf41aef7f0	Merge pull request #144 from anandpdoshi/master ... Changes in spartan print formats to show border in chrome	2011-11-16 01:20:33 -08:00
Anand Doshi	19a2767b77	Changes in spartan print formats to show border in chrome	2011-11-16 14:49:37 +05:30
Anand Doshi	0900756510	Merge pull request #143 from anandpdoshi/master ... Changes in Sales Invoice Print Formats	2011-11-16 00:34:36 -08:00
Anand Doshi	9fe4331862	Changes in Sales Invoice Print Format	2011-11-16 14:03:52 +05:30
Anand Doshi	ded71563c8	Merge pull request #142 from anandpdoshi/master ... New Print Formats as part of erpnext repository	2011-11-16 00:02:43 -08:00
Anand Doshi	e3559853bd	Added new Print Formats as part of repository	2011-11-16 13:18:45 +05:30
Nabin Hait	0c92493c81	Fixed check_for_acc_of_supplier validation	2011-11-16 10:12:32 +05:30
Nabin Hait	5b7badaf20	supplier account head validated with supplier	2011-11-11 12:37:53 +05:30
Nabin Hait	cc02fd445c	Repair button only visible after submit	2011-11-07 12:14:28 +05:30
Nabin Hait	612efe843b	POS Setting js code restored from history	2011-10-21 16:19:58 +05:30
Nabin Hait	57dd62d790	project column moved to item table in pur cycle	2011-10-20 19:19:07 +05:30
Nabin Hait	69554511da	fixes in patch	2011-10-19 16:35:39 +05:30
Nabin Hait	7762bdaf77	Letter head issue fixed in print format	2011-10-19 15:05:26 +05:30
Nabin Hait	1a1ce709e0	Changes regarding POS fields	2011-10-13 14:08:33 +05:30
Nabin Hait	ee9efb568b	flds added in mapper	2011-10-12 12:42:07 +05:30
Nabin Hait	685564f71d	Resolved conflict after merging with master	2011-10-11 14:42:34 +05:30
Nabin Hait	fb37157163	packing slip related changes and test case for item	2011-10-11 13:57:48 +05:30
Nabin Hait	2810691979	field hide/unhide for pos	2011-10-10 12:33:43 +05:30
Nabin Hait	6a0561612f	cost center groupto ledger and vice versa	2011-10-10 12:23:10 +05:30
Nabin Hait	1971942db8	purchase tax mapping while pulling	2011-10-05 14:56:16 +05:30
Nabin Hait	c8d5625763	removed trashed profile from user search result	2011-09-27 15:26:29 +05:30
Nabin Hait	d9a16a282c	deleted gl_entry.js file	2011-09-27 15:10:07 +05:30
Nabin Hait	ec451da2f4	Re-written update_against_document_in_jv function in RV and PV	2011-09-27 12:47:59 +05:30
Nabin Hait	e2df68bb5b	reload internal reconciliation	2011-09-27 12:47:09 +05:30
Nabin Hait	80ed6b25e8	deleted gl_control.js file	2011-09-27 11:53:23 +05:30
Nabin Hait	3c8a50c257	Trial balance opening issue fixed if there is no prev year	2011-09-27 11:16:30 +05:30
Nabin Hait	a77cea2b90	Dont add opening entries in account balance debit, credit column	2011-09-27 11:14:54 +05:30
Nabin Hait	c752d075e6	fixed issue in reseting in opening balance, clear bal only that company	2011-09-27 11:04:24 +05:30
Nabin Hait	c034e3d531	Merge branch 'master' of github.com:webnotes/erpnext	2011-09-27 10:55:24 +05:30
Nabin Hait	39297e5775	update_nsm_model in cost center on_trash()	2011-09-27 10:36:17 +05:30
Nabin Hait	d223d12308	Rewritten update_against_document function	2011-09-26 18:57:43 +05:30
Nabin Hait	5f2046496b	Internal Reconciliation: for knock out booking and payment entries	2011-09-26 18:56:02 +05:30
Nabin Hait	2736fd59ca	fixed cancelled gl entry issue in period closing voucher	2011-09-26 12:55:52 +05:30
Nabin Hait	f060d0cd16	contact address will be fetched in sales invoice onload when come through mapper	2011-09-16 17:28:49 +05:30
Rushabh Mehta	2adbd89ada	Merge branch 'master' of github.com:webnotes/erpnext	2011-09-15 15:09:14 +05:30
Rushabh Mehta	53ba83158c	fixes to startup	2011-09-15 15:06:23 +05:30
Nabin Hait	3b19f6b7c8	opening balance fixes in general ledger	2011-09-15 14:38:54 +05:30
Rushabh Mehta	0aed26d83d	moved report to folder	2011-09-15 13:00:46 +05:30
Rushabh Mehta	2773940db1	merged from master	2011-09-15 12:55:25 +05:30
Rushabh Mehta	1e11cb486d	merging from master and usability fixes to setup	2011-09-14 13:25:10 +05:30
Rushabh Mehta	5f50617121	removed readme	2011-09-13 15:48:51 +05:30
Rushabh Mehta	8cf45175a7	Merge branch 'master' of github.com:webnotes/erpnext	2011-09-08 14:17:41 +05:30
Rushabh Mehta	aa7b05aaeb	Merge branch 'master' of github.com:webnotes/erpnext	2011-09-06 12:47:51 +05:30
Rushabh Mehta	66ac2b018a	first cut for lazy loading framework	2011-09-05 18:43:09 +05:30