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

Commit Graph

  • 5f90f7096d Merge pull request #3976 from nabinhait/fixes1 Anand Doshi 2015-09-03 11:15:53 +05:30
  • 59c4ae5a46 [patch] Re-run the 'default_title' patch Nabin Hait 2015-09-03 10:46:48 +05:30
  • 85abdc4fad [minor] added stock settings for serial no. #3967. Merge with https://github.com/frappe/frappe/pull/1291 Rushabh Mehta 2015-09-03 10:29:38 +05:30
  • 98096771c2 [multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that Nabin Hait 2015-09-03 10:28:08 +05:30
  • ba51ebd1b7 Merge branch 'develop' Anand Doshi 2015-09-02 18:58:14 +05:30
  • be090fa512 bumped to version 6.0.1 Anand Doshi 2015-09-02 19:28:14 +06:00
  • c2283ca304 [hot] [fix] remove test options in Opportunity Rushabh Mehta 2015-09-02 18:56:19 +05:30
  • deb38f7a68 [enhancement] document management system Rushabh Mehta 2015-09-02 18:34:24 +05:30
  • 283850ce47 Merge pull request #3971 from anandpdoshi/fix-item-variant-attributes Anand Doshi 2015-09-02 16:09:09 +05:30
  • caa839003b Merge branch 'develop' Anand Doshi 2015-09-02 16:02:45 +05:30
  • a6130dc918 bumped to version 6.0.0 Anand Doshi 2015-09-02 16:32:45 +06:00
  • 099bbbded0 Attributes in the variant should be in the same order as in the Template Anand Doshi 2015-09-02 11:18:32 +05:30
  • c3796d273c [change-log] Anand Doshi 2015-09-02 15:54:53 +05:30
  • 28700d6404 Merge pull request #3973 from nabinhait/fix14 Anand Doshi 2015-09-02 14:59:44 +05:30
  • 38f400ea87 Merge pull request #3972 from nabinhait/fix Anand Doshi 2015-09-02 14:57:26 +05:30
  • f5793fff3c Merge pull request #3966 from rmehta/calendar-for-sales-order Anand Doshi 2015-09-02 14:52:21 +05:30
  • e1d2bef389 [fix] Dont delete Employee while deleting company transactions Nabin Hait 2015-09-02 14:07:46 +05:30
  • 0ca3e3d89e [fix] Clear notification count while deleting company transactions Nabin Hait 2015-09-02 13:09:48 +05:30
  • a1fa659475 [fix] Delete Time Logs while deleting company transactions Nabin Hait 2015-09-02 12:56:29 +05:30
  • 906bf64f04 [fix] Insert Item Price automatically based on Rate in Stock UOM Nabin Hait 2015-09-02 11:32:07 +05:30
  • e52ee553c0 Removed debug flag Nabin Hait 2015-09-02 10:55:32 +05:30
  • 409c1e494b Updated CONTRIBUTING.md Anand Doshi 2015-09-02 10:55:25 +05:30
  • 19e560e73f [fix] dropbox backup check not working Rushabh Mehta 2015-09-01 09:57:25 +05:30
  • bac9b8eef6 Payment Tool changes due to multi currency Nabin Hait 2015-08-31 19:01:11 +05:30
  • 76bb927337 Fixed conflict Nabin Hait 2015-08-31 17:28:05 +05:30
  • 699751c531 [report] Accounts Receivable / Payable in multi currency Nabin Hait 2015-08-31 17:02:04 +05:30
  • 06b15bfd63 [report] General Ledger in multi currency Nabin Hait 2015-08-31 15:39:03 +05:30
  • 8f1391dc96 [enhancement] calendar for sales order and other related fixes #3542 Rushabh Mehta 2015-08-31 12:42:05 +05:30
  • 0161b40aa9 Merge pull request #3965 from nabinhait/gross_profit Anand Doshi 2015-08-31 12:26:11 +05:30
  • 1901ca5a45 [fix] Fixed gross profit report due to removal of designation field from Sales Team table Nabin Hait 2015-08-31 12:02:43 +05:30
  • c68f68d6cc [fix] Patch fixed for account_currency field rename Nabin Hait 2015-08-28 19:26:28 +05:30
  • 6e439a5e53 Multi currency: test case and fixes Nabin Hait 2015-08-28 19:24:22 +05:30
  • 610ad47676 [hotfix] reload Delivery Note, Sales Invoice and Purchase Receipt in return entry patch Anand Doshi 2015-08-28 11:40:14 +05:30
  • 42701b2160 Merge branch 'nabinhait-notifications' into develop Anand Doshi 2015-08-27 17:05:32 +05:30
  • 3d9d2d1dd1 Exported all doctypes Anand Doshi 2015-08-27 16:45:52 +05:30
  • 3ea7ce84ed [fix] print hide additional discount, reload doctypes in sales return patch Anand Doshi 2015-08-27 16:03:29 +05:30
  • 002049eb85 [minor] show Inventory section for new Item if Maintain Stock is checked Anand Doshi 2015-08-27 13:21:43 +05:30
  • 57a51351d3 [fix] Changed more section label to 'More Information' Anand Doshi 2015-08-27 13:11:46 +05:30
  • 77a2107973 [minor] In Sales Order, changed label from PO No. to Customer's Purchase Order Anand Doshi 2015-08-27 12:21:17 +05:30
  • c5346c99de [enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699 Rushabh Mehta 2015-08-25 14:26:42 +05:30
  • 8b66f2a691 Exported all doctypes Anand Doshi 2015-08-27 16:45:52 +05:30
  • 78be566428 minor fix Nabin Hait 2015-08-27 16:27:44 +05:30
  • f6f38f2f2d [new fields] Exchange Rate in Journal Entry and some properties changes in Journal Entry Account Nabin Hait 2015-08-27 16:27:33 +05:30
  • 9a9a4293b3 [new fields] Party Account Currency, Paid Amount and Write Off Amount in Acompany Currency Nabin Hait 2015-08-27 16:26:38 +05:30
  • f370b0c6a4 [fix] print hide additional discount, reload doctypes in sales return patch Anand Doshi 2015-08-27 16:03:29 +05:30
  • 09c68c9ad0 Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency Nabin Hait 2015-08-27 14:55:55 +05:30
  • 13d8835b75 Fixed merge conflict Nabin Hait 2015-08-27 14:55:34 +05:30
  • b8610e1079 [fix] removed update_stock_ledger from delivery note Anand Doshi 2015-08-27 14:46:47 +05:30
  • 41e948b00a [hotfix] update reserved quantity in delivery note Anand Doshi 2015-08-27 14:42:25 +05:30
  • 2091f0c97e Checked out json files from upstream Nabin Hait 2015-08-27 14:35:17 +05:30
  • c6802ca6d0 [minor] show Inventory section for new Item if Maintain Stock is checked Anand Doshi 2015-08-27 13:21:43 +05:30
  • 282e4947fa [fix] Changed more section label to 'More Information' Anand Doshi 2015-08-27 13:11:46 +05:30
  • 54fe26dcfb [patch] Multi currency Nabin Hait 2015-08-27 12:55:24 +05:30
  • 4ffd7f3d05 Outstanding, paid and write-off amount in Invoice Nabin Hait 2015-08-27 12:28:36 +05:30
  • a12d959729 GL Entries for Sales/Purchase Invoice in multi currency Nabin Hait 2015-08-27 12:27:24 +05:30
  • b99c180466 Merge branch 'rmehta-validation-settings' into develop Anand Doshi 2015-08-27 12:22:06 +05:30
  • 6cf193d432 [minor] In Sales Order, changed label from PO No. to Customer's Purchase Order Anand Doshi 2015-08-27 12:21:17 +05:30
  • 35a5c87cbf [fix] Clear notifications for Sales / Purchase Order on stop/unstop Nabin Hait 2015-08-27 12:06:11 +05:30
  • 740db53b86 [fix] returned_qty reapply and change-log Rushabh Mehta 2015-08-27 12:00:16 +05:30
  • 69b6195d3b Merge branch 'validation-settings' of https://github.com/rmehta/erpnext into rmehta-validation-settings Anand Doshi 2015-08-27 11:39:20 +05:30
  • cd2d8a0410 [merge] re-applied changes to sales invoice & delivery note Rushabh Mehta 2015-08-27 11:05:26 +05:30
  • 5bec301929 Merge branch 'layout-cleanup' into develop Rushabh Mehta 2015-08-27 11:01:39 +05:30
  • 491df14426 [minor] catch invalid item code in pricing list (via support ticket) Rushabh Mehta 2015-08-27 10:31:28 +05:30
  • 00eba4d7f6 [minor] show price list in sales order (via support ticket) Rushabh Mehta 2015-08-27 10:25:07 +05:30
  • 17679c6902 [layout cleanup] purchase, stock, journal entry Rushabh Mehta 2015-08-26 22:19:41 +05:30
  • fa65c7bf29 [minor] stopped or cancelled message Anand Doshi 2015-08-26 19:14:16 +05:30
  • f7800c053b [layout cleanup] in Quotation, Sales Order, Delivery Note Rushabh Mehta 2015-08-26 18:53:37 +05:30
  • 10fc83d369 Merge branch 'develop' Anand Doshi 2015-08-26 17:57:24 +05:30
  • eed8906a1e bumped to version 5.8.2 Anand Doshi 2015-08-26 18:27:24 +06:00
  • 414248b792 [fix] event creation on Contact Date Anand Doshi 2015-08-26 17:56:40 +05:30
  • e91b3ea407 Merge branch 'develop' Anand Doshi 2015-08-26 17:43:27 +05:30
  • 28d53be50c bumped to version 5.8.1 Anand Doshi 2015-08-26 18:13:26 +06:00
  • cb2f9a863d [hotfix] reload Sales and Purchase Order Item Anand Doshi 2015-08-26 17:42:31 +05:30
  • 2b6bdc1edb [fix] filter and validation of Debit To and Credit To accounts Anand Doshi 2015-08-26 17:40:55 +05:30
  • f326c63588 Merge branch 'develop' Anand Doshi 2015-08-26 16:55:08 +05:30
  • 8ca72d8883 bumped to version 5.8.0 Anand Doshi 2015-08-26 17:25:08 +06:00
  • ab9f03d557 Merge pull request #3952 from neilLasrado/variant-duplication Anand Doshi 2015-08-26 16:52:25 +05:30
  • 7fa8fb984e [fix] Show write off account Anand Doshi 2015-08-26 16:48:41 +05:30
  • f29628072f [change-log] Anand Doshi 2015-08-26 14:49:14 +05:30
  • cb3a4caa44 [fix] removed validate due date in Journal Entry Anand Doshi 2015-08-26 14:48:58 +05:30
  • 755f1f6841 Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes Neil Trini Lasrado 2015-08-26 12:59:29 +05:30
  • 80a784fdc5 Merge pull request #3943 from nabinhait/fix4 Anand Doshi 2015-08-26 12:29:24 +05:30
  • 678a4e24ff [cleanup] Opportunity Rushabh Mehta 2015-08-26 12:27:25 +05:30
  • b8a6f40370 [cleanup] layouts of item, customer, supplier, lead Rushabh Mehta 2015-08-25 18:03:31 +05:30
  • f24f6044bd [layout] cleaned up Sales Invoice Rushabh Mehta 2015-08-20 18:01:40 +05:30
  • b6398be232 [minor] [fix] project query Rushabh Mehta 2015-08-26 10:50:16 +05:30
  • 007e2d0015 Merge branch 'nabinhait-return_improvements' into develop Anand Doshi 2015-08-25 19:11:29 +05:30
  • fe13bfed44 Fixes to Return Improvements pull request Anand Doshi 2015-08-25 12:49:40 +05:30
  • 3c107cdbf8 [enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699 Rushabh Mehta 2015-08-25 14:26:42 +05:30
  • b719c469c8 Allow different rate in Return Entry Nabin Hait 2015-08-24 16:46:00 +05:30
  • 3f321ebfde utilities/repost_stock file renamed to stock/stock_balance Nabin Hait 2015-08-24 16:16:29 +05:30
  • 047ecd1eb9 Update order reference in return entries and repost reserved / ordered qty Nabin Hait 2015-08-24 16:10:43 +05:30
  • 1f94fa25a8 Update delivered / ordered qty in sales/purchase order from return entry Reserved Qty logic cleaned up Nabin Hait 2015-08-24 14:32:38 +05:30
  • ddd79f43d2 [fix] [hot] erpnext contact page Rushabh Mehta 2015-08-25 14:03:43 +05:30
  • a7c013c030 [fix] Print Delivery Note without amount Nabin Hait 2015-08-24 18:43:09 +05:30
  • f7cfaf58b5 Merge pull request #3927 from neilLasrado/default-warehouse Anand Doshi 2015-08-24 18:17:30 +05:30
  • 82366e4b3f Merge pull request #3941 from nabinhait/fix2 Anand Doshi 2015-08-24 17:49:47 +05:30
  • b0d4162ca6 Merge pull request #3942 from nabinhait/fix3 Anand Doshi 2015-08-24 17:42:51 +05:30
  • b968772e97 Merge pull request #3939 from neilLasrado/variant Anand Doshi 2015-08-24 17:42:23 +05:30
  • 3a990d946d [fix] In general ledger report, consider cost center in group by voucher Nabin Hait 2015-08-24 17:21:01 +05:30