Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 4c83e407a9 Changed Print Format files to lowercase Anand Doshi 2014-05-13 17:37:56 +05:30
  • b1f212d653 Merge pull request #1638 from anandpdoshi/hotfix Pratik Vyas 2014-05-13 17:38:30 +05:30
  • 0e2cf69345 Merge pull request #1636 from nabinhait/v4-hotfix Anand Doshi 2014-05-13 17:31:14 +05:30
  • 8fe0208fb6 Improved Item maker in Setup Wizard. Fixes #1501 and #1601 Anand Doshi 2014-05-13 16:52:26 +05:30
  • 03f3a8a2ef Get taxes and charges records from matser. Fixes #1634 Nabin Hait 2014-05-13 16:38:31 +05:30
  • aade34b0c9 Reports and print formats modified for renamed fields Nabin Hait 2014-05-13 16:12:03 +05:30
  • 10f97d2e9e Merge pull request #1631 from nabinhait/v4-hotfix Nabin Hait 2014-05-13 11:41:12 +05:30
  • 54f0d24d80 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix Nabin Hait 2014-05-13 11:33:09 +05:30
  • b76061530e Daily time log fixes #1614 Nabin Hait 2014-05-13 11:32:39 +05:30
  • d711209dde Fixed patches.txt Anand Doshi 2014-05-12 19:42:38 +05:30
  • 3b5f107a11 Merge pull request #1630 from nabinhait/v4-hotfix Nabin Hait 2014-05-12 17:50:03 +05:30
  • b3bead2f06 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix Nabin Hait 2014-05-12 17:46:02 +05:30
  • 827480fd2b import, export and report permission in account and pricing rule Nabin Hait 2014-05-12 17:45:37 +05:30
  • 0c54e2d0d0 4_0 patch dir renamed to v4_0 Nabin Hait 2014-05-12 17:44:55 +05:30
  • 2fdb51f85e fixes frappe/erpnext#1627 Rushabh Mehta 2014-05-12 17:32:36 +05:30
  • 37f54f9a35 added description to letter head in setup wizard Rushabh Mehta 2014-05-12 16:45:12 +05:30
  • b2ce9c5487 Merge pull request #1625 from anandpdoshi/hotfix Pratik Vyas 2014-05-12 12:53:38 +05:30
  • 02edae8fac Added hook: setup_wizard_exception Anand Doshi 2014-05-12 12:37:32 +05:30
  • fb7fb73ba3 Merge pull request #1621 from nabinhait/v4-hotfix Nabin Hait 2014-05-11 18:30:41 +05:30
  • bbfe2517ea BOM validation message fixed Nabin Hait 2014-05-11 18:27:07 +05:30
  • 0baf1479a3 Merge pull request #1618 from nabinhait/v4-hotfix Nabin Hait 2014-05-11 13:11:02 +05:30
  • 2f50b85f99 Test case fixes for serial no Nabin Hait 2014-05-11 13:03:53 +05:30
  • 8ae4bcac58 Merge pull request #1617 from nabinhait/v4-hotfix Nabin Hait 2014-05-11 12:13:16 +05:30
  • 0ff6e3a6bb Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix Nabin Hait 2014-05-11 12:11:50 +05:30
  • 75e50ee082 Fixes for subcontracting Nabin Hait 2014-05-11 12:11:15 +05:30
  • 6d5c248402 Test case fixes for serial no Nabin Hait 2014-05-11 12:10:57 +05:30
  • 5365108ef9 Test case fixes for pos setting Nabin Hait 2014-05-11 12:10:17 +05:30
  • 7e373010d7 Test case fixes in time log batch Nabin Hait 2014-05-11 12:08:39 +05:30
  • 409c8e9732 removed confirmation date validations (wtf) Rushabh Mehta 2014-05-11 10:01:16 +05:30
  • 75e11a7270 Merge pull request #1616 from pdvyas/migrate-3to4 Rushabh Mehta 2014-05-10 22:19:07 +05:30
  • 6e686224eb fix patches Pratik Vyas 2014-05-10 22:17:04 +05:30
  • 95f558e7bc fix update user properties patch Pratik Vyas 2014-05-10 22:16:39 +05:30
  • 2667a50334 clear cache before running setup wizard Rushabh Mehta 2014-05-09 19:20:31 +05:30
  • 9591b8ec93 Merge pull request #1613 from anandpdoshi/deprecate-link-selects Rushabh Mehta 2014-05-09 14:09:51 +05:30
  • 78e9c6ef70 Deprecate Select fields with options as link: Anand Doshi 2014-05-09 13:36:13 +05:30
  • a5ac0149af Merge pull request #1612 from pdvyas/migrate-3to4 Nabin Hait 2014-05-09 12:07:11 +05:30
  • 34e36a233c Patch changes for 3 to 4 migration Pratik Vyas 2014-05-09 12:01:25 +05:30
  • d64a952b5d Stock reco: item and warehouse validation and translation fixes Nabin Hait 2014-05-09 11:50:24 +05:30
  • 7dada72085 Merge pull request #1610 from nabinhait/v4-hotfix Nabin Hait 2014-05-09 10:54:53 +05:30
  • 966edff222 minor fix Nabin Hait 2014-05-09 10:54:12 +05:30
  • b52c6e866f Merge pull request #1609 from nabinhait/v4-hotfix Nabin Hait 2014-05-08 19:10:55 +05:30
  • 344f4436f1 Create / update raw materials supplied table for sub-contracting Nabin Hait 2014-05-08 19:08:20 +05:30
  • 5d070753fd Item managed batch-wise, can not be reconciled through stock reconciliation Nabin Hait 2014-05-08 19:08:06 +05:30
  • 844dd36ff9 PP tool: get items from SO based on item filter Nabin Hait 2014-05-08 19:07:34 +05:30
  • 3c5bc544ea Serial no and batch no field added in purchase receipt item supplied table Nabin Hait 2014-05-08 19:07:02 +05:30
  • 227db769a0 Item valuation rate on material transfer based on fifo Nabin Hait 2014-05-08 19:06:01 +05:30
  • 713e453126 Merge pull request #1607 from anandpdoshi/hotfix Anand Doshi 2014-05-08 17:46:30 +05:30
  • 0c85169539 Fixed clear cache for item page Anand Doshi 2014-05-08 17:40:12 +05:30
  • 3415cdb208 Merge pull request #1604 from anandpdoshi/bugfix-v4 Anand Doshi 2014-05-08 12:09:29 +05:30
  • 08ef467fc6 Fixed moduleview language issue Anand Doshi 2014-05-08 11:43:18 +05:30
  • 5da2f21aed Merge pull request #1603 from nabinhait/v4-hotfix Nabin Hait 2014-05-07 19:22:02 +05:30
  • e37b8e6682 fixed conflict Nabin Hait 2014-05-07 19:20:56 +05:30
  • 23649c6852 fixe in query.py Nabin Hait 2014-05-07 19:18:15 +05:30
  • 7e1b75a705 Newsletter status display. Fixes #1593 Anand Doshi 2014-05-07 18:44:02 +05:30
  • 17425a24c6 Merge pull request #1602 from anandpdoshi/better-default-permissions Nabin Hait 2014-05-07 17:51:08 +05:30
  • f410bd9bf9 Better default permissions, ignore_restrictions for defaults, removed field trash_reason Anand Doshi 2014-05-07 17:11:04 +05:30
  • 706eb7f2c7 fixed conflict Nabin Hait 2014-05-07 15:13:52 +05:30
  • 90f2d8d9fc minor fix Nabin Hait 2014-05-07 14:55:09 +05:30
  • dc644c37e6 Merge pull request #1597 from anandpdoshi/naming-series-by-fiscal-year Anand Doshi 2014-05-07 11:06:36 +05:30
  • 4b438eee6d Revert "Autocreate naming series options based on Fiscal Year" Anand Doshi 2014-05-07 10:58:39 +05:30
  • 8a6febbaa5 Autocreate naming series options based on Fiscal Year Anand Doshi 2014-05-06 19:44:22 +05:30
  • 8c2dbab878 Changed default naming series options Anand Doshi 2014-05-06 19:43:11 +05:30
  • cc6b20b614 Merge pull request #1596 from nabinhait/v4-hotfix Nabin Hait 2014-05-06 19:17:13 +05:30
  • 3fcec56f7b Bulk rename tool fixes #1594 Nabin Hait 2014-05-06 19:13:46 +05:30
  • a521343063 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix Nabin Hait 2014-05-06 18:53:02 +05:30
  • ce4a87ce83 Maintenance schedule: get no of visits and period validation. Fixes #1591 Nabin Hait 2014-05-06 18:52:36 +05:30
  • 7fc9b63dc7 Merge pull request #1590 from anandpdoshi/remove-india-specific-fields Anand Doshi 2014-05-06 16:48:18 +05:30
  • 50e962b279 Special characters allowed in company name. Fixes #1259 Nabin Hait 2014-05-06 16:45:41 +05:30
  • 4b7a6b13ec Additions to remove India specific fields Anand Doshi 2014-05-06 16:41:31 +05:30
  • 3190f99ebe Option for selecting already reconciled entries in bank reconciliation #1310 Nabin Hait 2014-05-06 16:38:14 +05:30
  • 37909b292f Remove India specific fields Anand Doshi 2014-05-06 16:15:56 +05:30
  • 8b22fab2f7 Merge pull request #1589 from nabinhait/v4-hotfix Nabin Hait 2014-05-06 14:20:19 +05:30
  • 5c82014ba9 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix Nabin Hait 2014-05-06 14:01:30 +05:30
  • c82e967e97 Cannada translation Nabin Hait 2014-05-06 14:01:04 +05:30
  • b63384b3d4 Merge pull request #1588 from nabinhait/v4-hotfix Nabin Hait 2014-05-06 12:34:50 +05:30
  • 02d37bbb5a Allow Rename option added in multiple docs. Fixes #1521 Nabin Hait 2014-05-06 12:18:50 +05:30
  • 728be8c4d4 Merge pull request #1587 from anandpdoshi/bugfix-v4 Anand Doshi 2014-05-06 12:18:37 +05:30
  • 07a31d2975 Merge pull request #1586 from nabinhait/v4-hotfix Nabin Hait 2014-05-06 12:03:06 +05:30
  • de560aa094 Enable frequently used currencies. Fixes #1561 Anand Doshi 2014-05-06 12:02:23 +05:30
  • b1285f9fce Time Log Batch creation from time log list Nabin Hait 2014-05-06 11:58:00 +05:30
  • cea4cd4e5f Pull stock entry difference account from company Nabin Hait 2014-05-06 11:57:33 +05:30
  • 4d911db902 Release 4.0.0 Pratik Vyas 2014-05-05 19:14:45 +05:30
  • b99a3517c3 Merge branch 'develop' of github.com:frappe/erpnext into develop Nabin Hait 2014-05-05 18:42:07 +05:30
  • 98c2a052e5 Fixes in pricing rule testcases #565 Nabin Hait 2014-05-05 18:41:41 +05:30
  • ac1bc212ea Merge branch 'develop' of github.com:frappe/erpnext into develop Nabin Hait 2014-05-05 18:27:31 +05:30
  • 91b451b8ce Updated validate v3 patch Anand Doshi 2014-05-05 18:25:37 +05:30
  • 648062d071 Fixes in test cases Anand Doshi 2014-05-05 16:46:14 +05:30
  • 45a3226645 minor Rushabh Mehta 2014-05-05 10:34:19 +05:30
  • f2db87a766 Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565 Nabin Hait 2014-05-05 15:04:55 +05:30
  • 53dab55703 Pricing Rule: if multiple rules, ask to resolve conflict #565 Nabin Hait 2014-05-05 14:49:40 +05:30
  • 0c7e28ec9f Pricing Rule improvements #565 Nabin Hait 2014-05-05 11:13:36 +05:30
  • ed8a845e83 POS Make Payment dialog box fix #1441 Nabin Hait 2014-05-05 11:01:32 +05:30
  • d5886f36af Merge branch 'develop' of github.com:frappe/erpnext into develop Nabin Hait 2014-05-05 10:28:20 +05:30
  • f57f0a661a Stock Entry: pulling items from BOM fixed #1579 Nabin Hait 2014-05-05 10:27:53 +05:30
  • 69e0cb5d6f Fixed POS and Sales Invoice paid amount display, when invoice not submitted. Fixes #1573 Anand Doshi 2014-05-04 19:37:45 +05:30
  • 2af558598c Fixed travis Anand Doshi 2014-05-04 16:12:59 +05:30
  • 6dad4e9e89 Merge branch 'develop' of github.com:frappe/erpnext into develop Nabin Hait 2014-05-04 16:02:44 +05:30
  • a096b2004f Financial analytics graph fix #1542 Nabin Hait 2014-05-04 16:02:26 +05:30
  • 4ab5382d3f Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564 Anand Doshi 2014-05-04 11:50:10 +05:30
  • 24a3ec57e3 update to tests Rushabh Mehta 2014-05-03 16:22:25 +05:30