12984 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nabin Hait	95d025f9aa	Show Close button in Delivery Note and Purchase Receipt, only if it is returned and user has submit permission	2015-11-13 14:22:32 +05:30
Nabin Hait	59ba9e3d56	Merge pull request #4314 from anandpdoshi/fix/po-non-stock-receive ... [fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights	2015-11-13 13:59:04 +05:30
Rushabh Mehta	c1531e7008	[minor] catch SSL error on make_thumbnail, via support	2015-11-13 11:39:38 +05:30
Rushabh Mehta	26c54bb4fb	[minor] new quote	2015-11-13 10:42:20 +05:30
Anand Doshi	2c93d67463	Merge branch 'develop' v6.8.4	2015-11-12 20:37:12 +05:30
Anand Doshi	d4b05fbd51	bumped to version 6.8.4	2015-11-12 21:07:12 +06:00
Anand Doshi	d65a03d437	[fix] material request type in reorder	2015-11-12 20:36:44 +05:30
Anand Doshi	fd288d4211	Merge branch 'develop' v6.8.3	2015-11-12 20:35:48 +05:30
Anand Doshi	f774f75c63	bumped to version 6.8.3	2015-11-12 21:05:48 +06:00
Anand Doshi	e34a1b5fa2	Merge branch 'develop' v6.8.2	2015-11-12 20:01:53 +05:30
Anand Doshi	5f6546c8a5	bumped to version 6.8.2	2015-11-12 20:31:53 +06:00
Anand Doshi	ca5b593e38	[hotfix] setup wizard tax rate	2015-11-12 20:00:50 +05:30
Anand Doshi	cea5479f4d	[fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights	2015-11-12 18:39:57 +05:30
Anand Doshi	6303f84d45	[minor] fix test case	2015-11-12 18:11:58 +05:30
Anand Doshi	5dd00a7e89	Merge branch 'develop' v6.8.1	2015-11-12 17:42:41 +05:30
Anand Doshi	87c0e9f03a	bumped to version 6.8.1	2015-11-12 18:12:41 +06:00
Anand Doshi	d40d1e9a59	[optimize] Payment Reconciliation and Payment Tool	2015-11-12 17:42:05 +05:30
Anand Doshi	e19abfbe70	Merge branch 'develop' v6.8.0	2015-11-12 17:10:49 +05:30
Anand Doshi	3fc1c44334	bumped to version 6.8.0	2015-11-12 17:40:48 +06:00
Anand Doshi	bb347f5afa	[translations]	2015-11-12 16:39:58 +05:30
Anand Doshi	938b530ebf	[change-log]	2015-11-12 15:44:09 +05:30
Anand Doshi	28962f26d4	Merge pull request #4307 from frappe/v5.x.x ... [fix] Stock Entry additional costs patch fix for v4 accounts	2015-11-12 15:30:59 +05:30
Anand Doshi	0b5489ca88	Merge pull request #4312 from nabinhait/delete_uom_replace_utility ... Deleted Stock UOM Replace Utility	2015-11-12 15:26:41 +05:30
Anand Doshi	adebf31041	Merge pull request #4313 from saurabh6790/doc ... [help-page] drop-shipping documentation	2015-11-12 15:25:50 +05:30
Anand Doshi	7fbab12c5d	Merge branch 'rmehta-setup-wizard-in-frappe' into develop	2015-11-12 12:48:31 +05:30
Saurabh	11cc43a5a6	[help-page] drop-shipping documentation	2015-11-12 12:39:21 +05:30
Nabin Hait	61fb7ee5b8	Deleted Stock UOM Replace Utility	2015-11-12 12:06:47 +05:30
Rushabh Mehta	37b4d75e4a	[re-org] setup wizard in frappe	2015-11-12 11:45:47 +05:30
Anand Doshi	f71ecbba2c	Merge pull request #4311 from rmehta/auth-rule-cleanup ... Auth rule cleanup	2015-11-12 11:40:55 +05:30
Anand Doshi	c5c6c0669f	[fix] gross profit	2015-11-12 11:07:32 +05:30
Anand Doshi	fe85b2ea17	Merge branch 'nabinhait-erpnext_docs' into develop	2015-11-10 18:59:55 +05:30
Anand Doshi	1c1eb7018c	[docs] fixed Linked With and title	2015-11-10 18:58:56 +05:30
Anand Doshi	8df5b5e3a1	Merge branch 'develop' v6.7.8	2015-11-10 11:31:29 +05:30
Anand Doshi	39982a5f02	bumped to version 6.7.8	2015-11-10 12:01:29 +06:00
Rushabh Mehta	8f228dd7f9	[fix] [minor] closed not in notifications	2015-11-10 11:28:35 +05:30
Rushabh Mehta	739aa4d51a	[minor] allow pricing rule to have negative discount	2015-11-09 17:05:12 +05:30
Nabin Hait	f9ef0e4e15	[docs] Fixed ref docs, image and video links	2015-11-09 15:41:45 +05:30
Nabin Hait	fc51ec7f58	[docs] Added existing erpnext manual	2015-11-09 14:40:34 +05:30
Nabin Hait	7ba4d02444	[docs] First commit for docs	2015-11-09 14:40:29 +05:30
Anand Doshi	87b5fcb3b5	Merge branch 'develop' v6.7.7	2015-11-09 13:17:49 +05:30
Anand Doshi	7489d29813	bumped to version 6.7.7	2015-11-09 13:47:49 +06:00
Anand Doshi	268d300030	Merge pull request #4297 from frappe/revert-4294-develop ... Revert b28573ab03	2015-11-09 13:17:04 +05:30
Anand Doshi	7f77002015	Revert b28573ab03	2015-11-09 13:16:24 +05:30
Anand Doshi	b28573ab03	Merge pull request #4294 from neilLasrado/develop ... [Minor fix] Allowed maintenance schedule to be imported via data import tool	2015-11-09 13:13:41 +05:30
Anand Doshi	c756ff67b0	Merge pull request #4296 from anandpdoshi/sales-order-allow-delivery ... [fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox	2015-11-09 13:13:14 +05:30
Anand Doshi	4e72ef1421	[fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox	2015-11-09 13:01:49 +05:30
Neil Trini Lasrado	6b173f3a67	Allowed maintenance schedule to be imported via data import tool	2015-11-09 11:38:06 +05:30
Rushabh Mehta	bbcce8cca0	[minor] [cleanup] cosmetic cleanup and fix to start auth rule, did not do big cleanup	2015-11-09 11:28:51 +05:30
Rushabh Mehta	c438c1dec7	[minor] allow pricing rule to have negative discount	2015-11-07 20:28:43 +05:30
Anand Doshi	fcfced624a	Merge branch 'develop' v6.7.6	2015-11-07 15:40:22 +05:30