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

Commit Graph

  • 79c94426f7 Merge pull request #4277 from nabinhait/gross_profit_fix Rushabh Mehta 2015-11-05 14:04:30 +05:30
  • c3ced9a0b5 [fix][report] Buying amount for product bundle in Gross Profit report Nabin Hait 2015-11-05 13:13:02 +05:30
  • c825575940 Merge branch 'develop' Rushabh Mehta 2015-11-05 10:51:31 +05:30
  • afd3209017 bumped to version 6.7.1 Rushabh Mehta 2015-11-05 11:21:31 +06:00
  • c541b87bb9 [thumbnail] remove attachment if fails Rushabh Mehta 2015-11-05 10:49:42 +05:30
  • b42f3e34ef Merge branch 'develop' Rushabh Mehta 2015-11-04 18:18:08 +05:30
  • 6a7edd32aa bumped to version 6.7.0 Rushabh Mehta 2015-11-04 18:48:07 +06:00
  • fc307970aa [translations] Rushabh Mehta 2015-11-04 18:02:45 +05:30
  • b9e7cb02f4 [change-log] Rushabh Mehta 2015-11-04 17:00:02 +05:30
  • a20a419cb8 Merge pull request #4274 from saurabh6790/drop-shipping Rushabh Mehta 2015-11-04 16:41:22 +05:30
  • d805bd7daf [fixes] update delivery status Saurabh 2015-11-04 16:29:46 +05:30
  • ac53f2dbb1 [test] [fix] Rushabh Mehta 2015-11-04 15:47:08 +05:30
  • 20a7d820ab [fix] shot ledger buttons for closed DN / PR Rushabh Mehta 2015-11-04 15:31:41 +05:30
  • d48c2394e8 [cleanup] drop ship testing & cleanup Rushabh Mehta 2015-11-04 15:20:50 +05:30
  • 58101e9e6c Merge pull request #4272 from nabinhait/report-fix1 Rushabh Mehta 2015-11-04 13:18:42 +05:30
  • 666131d2fe Merge pull request #4271 from saurabh6790/drop-shipping Rushabh Mehta 2015-11-04 13:18:20 +05:30
  • 118f043335 Merge pull request #4270 from rmehta/email-digest-fix Rushabh Mehta 2015-11-04 13:18:08 +05:30
  • b4a51ec80b [report] Added delay in payment column Nabin Hait 2015-11-04 13:09:37 +05:30
  • 6197860643 [fixes] test case update Saurabh 2015-11-04 12:43:40 +05:30
  • 95fbfa4928 [fixes] typo fixes Saurabh 2015-11-04 12:10:01 +05:30
  • b7f0a4961e - no delivery / reserve warehouse in drop ship - “Re-open” in DN / PR after “Stop” / “Close" - check for closed status in reports Saurabh 2015-11-04 12:03:54 +05:30
  • 9c044eefff [cleanup] re-arrange drop ship field Rushabh Mehta 2015-11-03 18:28:37 +05:30
  • 5951692db0 [fix] cleanup stop-resume code Rushabh Mehta 2015-11-03 18:20:39 +05:30
  • bd4814fbb7 [fix] email digest periods for weekly and monthly Rushabh Mehta 2015-11-02 17:47:10 +05:30
  • 7d23e4286e [minor] move item to top in stock module page Rushabh Mehta 2015-11-02 10:45:18 +05:30
  • 15ea751f3c Merge pull request #4268 from saurabh6790/drop-shipping Rushabh Mehta 2015-11-03 10:43:27 +05:30
  • c40148e0da [fixes] missing delivered by supplier field Saurabh 2015-11-03 10:32:46 +05:30
  • a9dda232b2 [minor] move item to top in stock module page Rushabh Mehta 2015-11-02 10:45:18 +05:30
  • 1f25c45ad7 Merge pull request #4266 from saurabh6790/fixes1 Rushabh Mehta 2015-11-02 16:26:40 +05:30
  • 12ffd914ee [fixes] args fixes Saurabh 2015-11-02 16:10:09 +05:30
  • b1d8979a59 Merge pull request #4179 from saurabh6790/drop-shipping Rushabh Mehta 2015-11-02 15:43:48 +05:30
  • ec2d0030b7 Merge pull request #4265 from nabinhait/jv_fix Rushabh Mehta 2015-11-02 15:23:01 +05:30
  • 55d0506155 Merge pull request #4264 from superlack/patch-3 Rushabh Mehta 2015-11-02 15:21:59 +05:30
  • 5e9b52c273 Merge pull request #4263 from superlack/patch-2 Rushabh Mehta 2015-11-02 15:21:54 +05:30
  • 00b4663e12 Merge pull request #4262 from saurabh6790/close_pr_dn Rushabh Mehta 2015-11-02 15:21:19 +05:30
  • e54a4004ec Merge pull request #4258 from anandpdoshi/fixes-3to6 Rushabh Mehta 2015-11-02 15:20:25 +05:30
  • d0b086ca54 Merge pull request #4255 from anandpdoshi/slovene-language Rushabh Mehta 2015-11-02 15:20:17 +05:30
  • 8d1191ac8f Merge pull request #4252 from anandpdoshi/edge-case-website-variant-selection Rushabh Mehta 2015-11-02 15:20:10 +05:30
  • a938b81e1c Merge pull request #4251 from saurabh6790/hr Rushabh Mehta 2015-11-02 15:19:55 +05:30
  • 7cd0ba70d9 [fixes] typo error Saurabh 2015-11-02 15:18:23 +05:30
  • 66340f9894 [cleanup] Make Payment Entry from Order/Invoice Nabin Hait 2015-11-02 14:40:42 +05:30
  • 41f7f7442b Update time_log_batch.py superlack 2015-11-02 00:39:36 -08:00
  • 126fb31f9a Update time_log_batch_detail.json superlack 2015-11-02 00:38:17 -08:00
  • a8a91cca16 [feature] Close feature for Purchase Receipt and Delivery Note Saurabh 2015-11-02 12:57:08 +05:30
  • 381385d19a [fixes] add status 'Closed' in filter creating PR, PI from PO and SI, DN from SO Saurabh 2015-11-02 11:30:51 +05:30
  • aba8fdd18d [fix] issues encountered migrating from v3/4 to 6 Anand Doshi 2015-10-31 22:49:42 +05:30
  • 915778fb69 [fix] Clear addressed and contacts on a new form Nabin Hait 2015-10-30 14:43:13 +05:30
  • bacc679df5 [language] added Slovene and updated translations Anand Doshi 2015-10-30 12:54:27 +05:30
  • b0388d971a [minor] reduced size of video placeholder Anand Doshi 2015-10-30 12:54:10 +05:30
  • 61c9ea938d [Change Log] change log entry for drop shipment Saurabh 2015-10-30 12:02:24 +05:30
  • 6956eee790 [fixes] test case and code rewrite Saurabh 2015-10-29 19:43:13 +05:30
  • 2e65aadb1e [fixes] reload doc after status update and supplier address fetching Saurabh 2015-10-28 11:40:14 +05:30
  • 653cffec1e [change_log and fixes] set print hide, add change_log Saurabh 2015-10-27 17:07:56 +05:30
  • cc8f1afa56 [fixes] test case fixes for drop shipping Saurabh 2015-10-26 19:12:05 +05:30
  • 2f702dcb32 [fixes] bulk close facility, rename Drop Ship to Delivered By Supplier Saurabh 2015-10-26 17:28:17 +05:30
  • f857d81f35 [fixes]test case to check updated delivered qty Saurabh 2015-10-26 13:59:12 +05:30
  • 6d64fe378d [fixes] remover per_ordered field and update delivered qty from perchase order via delivered by supplier -1 Saurabh 2015-10-23 10:40:32 +05:30
  • b0ab93f779 [fixes] typo error Saurabh 2015-10-22 14:41:52 +05:30
  • df1c1a573f [fixes] test case for per_ordered Saurabh 2015-10-22 12:44:23 +05:30
  • a1f2aec918 [fixes] check ordered and reserved qrt, check closed status for so and po Saurabh 2015-10-22 12:17:54 +05:30
  • d8930a776d [fixes] test case import fix Saurabh 2015-10-22 10:43:29 +05:30
  • 8a8ef85174 [fixes] reviwe fixes Saurabh 2015-10-21 19:28:53 +05:30
  • edba048c14 [fixes] set is_stock_item for test items Saurabh 2015-10-20 18:20:16 +05:30
  • b705798ccb [enhance & fixes] Print Format on PO for Drop Shipping Saurabh 2015-10-20 17:53:50 +05:30
  • 5e0b0b4b97 [enhance] make PO from SO if supplier is specified Saurabh 2015-10-20 16:27:16 +05:30
  • a4efbf0db7 [fixes] check for close status Saurabh 2015-10-20 14:24:33 +05:30
  • e930f0f74e [fixes] filter on supplier list for DropShip, checking closed status Saurabh 2015-10-20 13:34:21 +05:30
  • 99543f72d8 [fixes] test case for drop shipping and minor fixes for test_reserved_qty_for_partial_delivery & test_reserved_qty_for_partial_delivery_with_packing_list Saurabh 2015-10-19 17:12:21 +05:30
  • 1a9646739a [fixes][rename-field-name] drop_ship to is_drop_ship Saurabh 2015-10-19 16:45:46 +05:30
  • bd65cb8817 [fixes] field rename and test case for drop ship Saurabh 2015-10-19 16:29:16 +05:30
  • 98b287565a [enhance] close purchase order Saurabh 2015-10-19 15:16:17 +05:30
  • c6dbe70256 [Fixes] Drop Shipping Saurabh 2015-10-19 14:17:52 +05:30
  • 556536615e [minor fix] Status fix in listview Saurabh 2015-10-15 18:08:56 +05:30
  • 8bd96f1c08 [Test Case] Test case to check drop shipping Saurabh 2015-10-15 17:58:05 +05:30
  • 5b7e9a1c94 [minor fixes] Saurabh 2015-10-15 17:27:46 +05:30
  • c306b21415 [merge fixes] Saurabh 2015-10-19 16:32:24 +05:30
  • c39cef363c [fix] stop welcome video if user moves to another page Anand Doshi 2015-10-29 18:37:17 +05:30
  • baefec4498 Merge branch 'develop' Nabin Hait 2015-10-29 16:35:06 +05:30
  • 02a56b4e1a bumped to version 6.6.7 Nabin Hait 2015-10-29 17:05:06 +06:00
  • 9a6df0341f Merge pull request #4246 from anandpdoshi/welcome-to-erpnext Nabin Hait 2015-10-29 16:29:10 +05:30
  • 5a90e3b2e9 Merge pull request #4254 from nabinhait/pr_qty Nabin Hait 2015-10-29 16:27:02 +05:30
  • 7dab3c1f85 Show Welcome to ERPNext after completing Setup Wizard Anand Doshi 2015-10-28 18:31:21 +05:30
  • f9a974385a [fix] Consider Rejected Qty for Qty validation in Purchase Receipt Nabin Hait 2015-10-29 14:54:22 +05:30
  • 20a653e829 [fixes] Test case fixes for leave application Saurabh 2015-10-29 14:27:37 +05:30
  • a2c668cb77 [fixes] patch, test cases and validations Saurabh 2015-10-29 13:00:30 +05:30
  • d0b0a80be3 [enhacement] remove fiscal year from leave allocation Saurabh 2015-10-28 17:15:00 +05:30
  • 532b9e8bfb [fix] Edge case in variant selection in website - when variant has less number of attributes than template Anand Doshi 2015-10-29 13:20:07 +05:30
  • 32e48bb568 Merge pull request #4250 from anandpdoshi/disable-item Anand Doshi 2015-10-29 13:12:20 +05:30
  • 21e09a2bd8 [enhancement] Ability to disable an Item Anand Doshi 2015-10-29 12:21:41 +05:30
  • 1aa6e98136 Merge pull request #4249 from nabinhait/cc_fix Nabin Hait 2015-10-29 12:28:20 +05:30
  • 023c036afa Merge pull request #4248 from anandpdoshi/item-variant-expired Nabin Hait 2015-10-29 12:28:03 +05:30
  • 8372c44262 [fix] Default cost center as per company Nabin Hait 2015-10-29 11:50:36 +05:30
  • 6d69ca6bac [fix] don't show expired items in website item list. Fixes #4210. Anand Doshi 2015-10-29 11:35:16 +05:30
  • 283b55f88c Merge branch 'develop' Nabin Hait 2015-10-28 16:07:13 +05:30
  • 4757d0634a bumped to version 6.6.6 Nabin Hait 2015-10-28 16:37:13 +06:00
  • dc8ce7f7e9 Merge pull request #4245 from nabinhait/sr_no Nabin Hait 2015-10-28 15:51:32 +05:30
  • d02375e89d Merge branch 'anandpdoshi-file-fix' into develop Nabin Hait 2015-10-28 15:50:41 +05:30
  • a90a0528aa Fixed conflict Nabin Hait 2015-10-28 15:50:26 +05:30
  • 350f9592d3 Merge pull request #4237 from sbkolate/develop Nabin Hait 2015-10-28 15:44:39 +05:30
  • 43e50de6ef Merge pull request #4243 from nabinhait/last_pur_rate Nabin Hait 2015-10-28 15:42:35 +05:30