Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,762 Commits 3 Branches 0 Tags 1 GiB
23649c6852
Commit Graph

8762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
23649c6852 fixe in query.py 2014-05-07 19:18:15 +05:30
Nabin Hait
706eb7f2c7 fixed conflict 2014-05-07 15:13:52 +05:30
Nabin Hait
90f2d8d9fc minor fix 2014-05-07 14:55:09 +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
4b438eee6d Revert "Autocreate naming series options based on Fiscal Year" 
This reverts commit 8a6febbaa5.
 2014-05-07 10:58:39 +05:30
Anand Doshi
8a6febbaa5 Autocreate naming series options based on Fiscal Year 2014-05-06 19:44:22 +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
cc6b20b614 Merge pull request #1596 from nabinhait/v4-hotfix 
V4 fixes and updates
 2014-05-06 19:17:13 +05:30
Nabin Hait
3fcec56f7b Bulk rename tool fixes #1594 2014-05-06 19:13:46 +05:30
Nabin Hait
a521343063 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-06 18:53:02 +05:30
Nabin Hait
ce4a87ce83 Maintenance schedule: get no of visits and period validation. Fixes #1591 2014-05-06 18:52:36 +05:30
Anand Doshi
7fc9b63dc7 Merge pull request #1590 from anandpdoshi/remove-india-specific-fields 
Remove India specific fields
 2014-05-06 16:48:18 +05:30
Nabin Hait
50e962b279 Special characters allowed in company name. Fixes #1259 2014-05-06 16:46:32 +05:30
Anand Doshi
4b7a6b13ec Additions to remove India specific fields 2014-05-06 16:41:31 +05:30
Nabin Hait
3190f99ebe Option for selecting already reconciled entries in bank reconciliation #1310 2014-05-06 16:39:24 +05:30
Anand Doshi
37909b292f Remove India specific fields 2014-05-06 16:15:56 +05:30
Nabin Hait
8b22fab2f7 Merge pull request #1589 from nabinhait/v4-hotfix 
V4 hotfix
 2014-05-06 14:20:19 +05:30
Nabin Hait
5c82014ba9 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-06 14:01:30 +05:30
Nabin Hait
c82e967e97 Cannada translation 2014-05-06 14:01:04 +05:30
Nabin Hait
b63384b3d4 Merge pull request #1588 from nabinhait/v4-hotfix 
Allow Rename option added in multiple docs. Fixes #1521
 2014-05-06 12:34:50 +05:30
Nabin Hait
02d37bbb5a Allow Rename option added in multiple docs. Fixes #1521 2014-05-06 12:18:50 +05:30
Anand Doshi
728be8c4d4 Merge pull request #1587 from anandpdoshi/bugfix-v4 
Enable frequently used currencies. Fixes #1561
 2014-05-06 12:18:37 +05:30
Nabin Hait
07a31d2975 Merge pull request #1586 from nabinhait/v4-hotfix 
V4 hotfix
 2014-05-06 12:03:06 +05:30
Anand Doshi
de560aa094 Enable frequently used currencies. Fixes #1561 2014-05-06 12:02:23 +05:30
Nabin Hait
b1285f9fce Time Log Batch creation from time log list 2014-05-06 11:58:00 +05:30
Nabin Hait
cea4cd4e5f Pull stock entry difference account from company 2014-05-06 11:57:33 +05:30
Pratik Vyas
4d911db902 Release 4.0.0 2014-05-05 19:14:45 +05:30
Nabin Hait
b99a3517c3 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-05 18:42:07 +05:30
Nabin Hait
98c2a052e5 Fixes in pricing rule testcases #565 2014-05-05 18:41:41 +05:30
Nabin Hait
ac1bc212ea Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-05 18:27:31 +05:30
Anand Doshi
91b451b8ce Updated validate v3 patch 2014-05-05 18:25:37 +05:30
Anand Doshi
648062d071 Fixes in test cases 2014-05-05 16:46:38 +05:30
Rushabh Mehta
45a3226645 minor 2014-05-05 15:16:11 +05:30
Nabin Hait
f2db87a766 Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565 2014-05-05 15:04:55 +05:30
Nabin Hait
53dab55703 Pricing Rule: if multiple rules, ask to resolve conflict #565 2014-05-05 14:49:40 +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
Nabin Hait
d5886f36af Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-05 10:28:20 +05:30
Nabin Hait
f57f0a661a Stock Entry: pulling items from BOM fixed #1579 2014-05-05 10:27:53 +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
Anand Doshi
2af558598c Fixed travis 2014-05-04 16:13:33 +05:30
Nabin Hait
6dad4e9e89 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-04 16:02:44 +05:30
Nabin Hait
a096b2004f Financial analytics graph fix #1542 2014-05-04 16:02:26 +05:30
Anand Doshi
4ab5382d3f Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564 2014-05-04 11:50:10 +05:30
Rushabh Mehta
24a3ec57e3 update to tests 2014-05-03 16:22:46 +05:30
Anand Doshi
75042fd502 Show Activity entries based on permissions. Completely fixes #1481 2014-05-02 19:44:28 +05:30
Anand Doshi
2b0e4266cf Go to home page on clicking left arrow in note list 2014-05-02 19:43:11 +05:30
Anand Doshi
ef5407479a Show Chart of Accounts in Accounts > Documents. Fixes #1559 2014-05-02 19:42:27 +05:30
Anand Doshi
56f29cbb27 Fixed contact page response. Fixes #1557 2014-05-02 18:17:39 +05:30
Nabin Hait
232954d4b9 Fixed updating cost on BOM after submission #1563 2014-05-02 17:51:24 +05:30