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

8857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
3b5f107a11 Merge pull request #1630 from nabinhait/v4-hotfix 
fixes
 2014-05-12 17:50:03 +05:30
Nabin Hait
b3bead2f06 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-12 17:46:02 +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
0c54e2d0d0 4_0 patch dir renamed to v4_0 2014-05-12 17:44:55 +05:30
Rushabh Mehta
2fdb51f85e fixes frappe/erpnext#1627 2014-05-12 17:32:36 +05:30
Rushabh Mehta
37f54f9a35 added description to letter head in setup wizard 2014-05-12 16:45:49 +05:30
Pratik Vyas
b2ce9c5487 Merge pull request #1625 from anandpdoshi/hotfix 
Added hook: setup_wizard_exception
 2014-05-12 12:53:38 +05:30
Anand Doshi
02edae8fac Added hook: setup_wizard_exception 2014-05-12 12:37:32 +05:30
Nabin Hait
fb7fb73ba3 Merge pull request #1621 from nabinhait/v4-hotfix 
BOM validation message fixed
 2014-05-11 18:30:41 +05:30
Nabin Hait
bbfe2517ea BOM validation message fixed 2014-05-11 18:27:07 +05:30
Nabin Hait
0baf1479a3 Merge pull request #1618 from nabinhait/v4-hotfix 
Test case fixes for serial no
 2014-05-11 13:11:02 +05:30
Nabin Hait
2f50b85f99 Test case fixes for serial no 2014-05-11 13:03:53 +05:30
Nabin Hait
8ae4bcac58 Merge pull request #1617 from nabinhait/v4-hotfix 
test case fixes
 2014-05-11 12:13:16 +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
75e50ee082 Fixes for subcontracting 2014-05-11 12:11:15 +05:30
Nabin Hait
6d5c248402 Test case fixes for serial no 2014-05-11 12:10:57 +05:30
Nabin Hait
5365108ef9 Test case fixes for pos setting 2014-05-11 12:10:17 +05:30
Nabin Hait
7e373010d7 Test case fixes in time log batch 2014-05-11 12:08:39 +05:30
Rushabh Mehta
409c8e9732 removed confirmation date validations (wtf) 2014-05-11 10:01:16 +05:30
Rushabh Mehta
75e11a7270 Merge pull request #1616 from pdvyas/migrate-3to4 
3 to 4 migration fixes
 2014-05-10 22:19:07 +05:30
Pratik Vyas
6e686224eb fix patches 2014-05-10 22:17:04 +05:30
Pratik Vyas
95f558e7bc fix update user properties patch 2014-05-10 22:16:39 +05:30
Rushabh Mehta
2667a50334 clear cache before running setup wizard 2014-05-09 19:20:31 +05:30
Rushabh Mehta
9591b8ec93 Merge pull request #1613 from anandpdoshi/deprecate-link-selects 
Deprecate Select fields with options as link:
 2014-05-09 14:09:51 +05:30
Anand Doshi
78e9c6ef70 Deprecate Select fields with options as link: 2014-05-09 13:36:13 +05:30
Nabin Hait
a5ac0149af Merge pull request #1612 from pdvyas/migrate-3to4 
3 to 4 migration
 2014-05-09 12:07:11 +05:30
Pratik Vyas
34e36a233c Patch changes for 3 to 4 migration 2014-05-09 12:01:25 +05:30
Nabin Hait
d64a952b5d Stock reco: item and warehouse validation and translation fixes 2014-05-09 11:50:24 +05:30
Nabin Hait
7dada72085 Merge pull request #1610 from nabinhait/v4-hotfix 
minor fix
 2014-05-09 10:54:53 +05:30
Nabin Hait
966edff222 minor fix 2014-05-09 10:54:12 +05:30
Nabin Hait
b52c6e866f Merge pull request #1609 from nabinhait/v4-hotfix 
V4 hotfix
 2014-05-08 19:10:55 +05:30
Nabin Hait
344f4436f1 Create / update raw materials supplied table for sub-contracting 2014-05-08 19:08:20 +05:30
Nabin Hait
5d070753fd Item managed batch-wise, can not be reconciled through stock reconciliation 2014-05-08 19:08:06 +05:30
Nabin Hait
844dd36ff9 PP tool: get items from SO based on item filter 2014-05-08 19:07:34 +05:30
Nabin Hait
3c5bc544ea Serial no and batch no field added in purchase receipt item supplied table 2014-05-08 19:07:02 +05:30
Nabin Hait
227db769a0 Item valuation rate on material transfer based on fifo 2014-05-08 19:06:01 +05:30
Anand Doshi
713e453126 Merge pull request #1607 from anandpdoshi/hotfix 
Fixed clear cache for item page
 2014-05-08 17:46:30 +05:30
Anand Doshi
0c85169539 Fixed clear cache for item page 2014-05-08 17:46:00 +05:30
Anand Doshi
3415cdb208 Merge pull request #1604 from anandpdoshi/bugfix-v4 
Newsletter status display. Fixes #1593
 2014-05-08 12:09:29 +05:30
Anand Doshi
08ef467fc6 Fixed moduleview language issue 2014-05-08 11:43:18 +05:30
Nabin Hait
5da2f21aed Merge pull request #1603 from nabinhait/v4-hotfix 
fixes
 2014-05-07 19:22:02 +05:30
Nabin Hait
e37b8e6682 fixed conflict 2014-05-07 19:20:56 +05:30
Nabin Hait
23649c6852 fixe in query.py 2014-05-07 19:18:15 +05:30
Anand Doshi
7e1b75a705 Newsletter status display. Fixes #1593 2014-05-07 18:44:02 +05:30
Nabin Hait
17425a24c6 Merge pull request #1602 from anandpdoshi/better-default-permissions 
Better default permissions, ignore_restrictions for defaults, removed fi...
 2014-05-07 17:51:08 +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
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