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

Commit Graph

  • 16f3f378f6 Update patches.txt Nabin Hait 2016-10-07 12:54:27 +05:30
  • 1885207eca Update and rename update_timesheet_modified_created to update_timesheet_communications Nabin Hait 2016-10-07 12:54:04 +05:30
  • e0a636c081 [fix] update timestamps and relink communication for timesheet RobertSchouten 2016-10-07 11:03:04 +08:00
  • ef4e41380b [fix] update timestamps and relink communication for timesheet RobertSchouten 2016-10-07 11:01:12 +08:00
  • a2a25abfa5 [fix] warehouse account rename fix #6526 Saurabh 2016-10-06 18:20:53 +05:30
  • 77ede941b0 Merge pull request #6550 from rohitwaghchaure/make_payment_using_journal_entry Nabin Hait 2016-10-06 17:07:11 +05:30
  • 7d5298997b Documentation for payments Rohit Waghchaure 2016-10-06 14:35:04 +05:30
  • 60a099cd85 Merge pull request #6557 from vrms/patch-3 Nabin Hait 2016-10-06 15:34:42 +05:30
  • 1397159bc1 Merge pull request #6561 from rohitwaghchaure/remove_sales_invoice_from_scheduler_log Nabin Hait 2016-10-06 15:32:55 +05:30
  • ec08a50af1 Merge pull request #6564 from rohitwaghchaure/expense_claim_issue Nabin Hait 2016-10-06 15:32:37 +05:30
  • 4eb196905b Merge pull request #6562 from saurabh6790/hotfix Nabin Hait 2016-10-06 15:28:41 +05:30
  • 370e711f48 [Fix] Expense Claim, sanctioned amount not auto-populated from claim amount Rohit Waghchaure 2016-10-06 15:19:36 +05:30
  • 3ae5672e27 [fix] sales order translation for language code: fr Saurabh 2016-10-06 12:57:21 +05:30
  • 297fbcd388 removed sales invoice from scheduler log Rohit Waghchaure 2016-10-06 12:40:09 +05:30
  • b7a5502b97 [Enhancement] Option to make payment via Journal Entry Rohit Waghchaure 2016-10-05 16:24:41 +05:30
  • bbe7a1062e Update product-bundle.md vrms 2016-10-06 07:40:21 +08:00
  • 4dacaa103c [minor] do not submit after accpeting payment Rushabh Mehta 2016-10-05 19:20:37 +05:30
  • a47652624a [minor] student applicant fixes Rushabh Mehta 2016-10-05 18:04:19 +05:30
  • 558f526a68 Fixed version conflict Nabin Hait 2016-10-05 17:18:36 +05:30
  • 7dcab89321 Merge branch 'hotfix' Nabin Hait 2016-10-05 17:18:11 +05:30
  • a162b3f0cd bumped to version 7.0.55 Nabin Hait 2016-10-05 17:48:11 +06:00
  • 2f163ef360 Merge pull request #6552 from nabinhait/hotfix Nabin Hait 2016-10-05 17:17:05 +05:30
  • cccc45edc5 Don't throw expense account validation on fetching item details Nabin Hait 2016-10-05 17:15:43 +05:30
  • 7b9638c93a Merge pull request #6551 from nabinhait/hotfix Nabin Hait 2016-10-05 16:45:25 +05:30
  • 33fafb7728 Set warranty claim resolution date as today only if it is not set Nabin Hait 2016-10-05 16:43:13 +05:30
  • 2704a4a8fc Update production_order.py Nabin Hait 2016-10-05 16:14:42 +05:30
  • 7c0fe7d9d3 Merge pull request #6534 from rohitwaghchaure/rfq_added_links_of_quotations Nabin Hait 2016-10-05 15:44:51 +05:30
  • 55c328348f Merge pull request #6547 from rohitwaghchaure/pos_issue_for_wildcard_seacrh Nabin Hait 2016-10-05 15:43:45 +05:30
  • a26f685b9f [Enhancement] Added supplier quotation link on rfq Rohit Waghchaure 2016-10-03 19:05:18 +05:30
  • e86eaf543c removed sync master data onload of the pos page Rohit Waghchaure 2016-10-05 14:45:15 +05:30
  • 163e3598c7 [Fix] POS wildcard search for customers, items Rohit Waghchaure 2016-10-05 13:38:02 +05:30
  • babafb8d01 Merge pull request #6531 from saurabh6790/je_currency_symbol_fix Nabin Hait 2016-10-05 13:12:59 +05:30
  • 7229b64128 Merge pull request #6516 from bcornwellmott/patch-6 Nabin Hait 2016-10-05 13:12:10 +05:30
  • 8db8a91d2e Minor fixes Nabin Hait 2016-10-05 13:10:38 +05:30
  • f6f8ec68ad Total and difference added for amount and qty Kanchan Chauhan 2016-09-24 20:48:29 +05:30
  • 712b871f06 Change project location in sales invoice Rohit Waghchaure 2016-09-24 15:56:23 +05:30
  • 4784495db2 Merge pull request #6545 from neilLasrado/develop Nabin Hait 2016-10-05 12:38:04 +05:30
  • d5035e05b3 Field rearrange in student applicant Neil Trini Lasrado 2016-10-05 12:35:55 +05:30
  • 9501b38e8b Update remove_doctypes_and_reports.py Nabin Hait 2016-10-05 12:35:11 +05:30
  • 09adc10543 Merge pull request #6544 from nabinhait/hotfix Nabin Hait 2016-10-05 12:27:21 +05:30
  • 219148d23d Sales Personwise transaction summary - total row Nabin Hait 2016-10-05 12:24:26 +05:30
  • 9ac2fc932d Validate dates, fixes #6542 Nabin Hait 2016-10-05 12:20:25 +05:30
  • 86da020dcd Merge pull request #6543 from nabinhait/rate_precision Nabin Hait 2016-10-05 11:59:20 +05:30
  • 6c49fa20b5 Fixed precision of rate field Nabin Hait 2016-10-05 11:27:52 +05:30
  • bb89f6e151 [minor] student applications to be submitted after payment Rushabh Mehta 2016-10-05 09:20:28 +05:30
  • efa68fb6b8 Fixed version conflict Nabin Hait 2016-10-04 17:27:02 +05:30
  • 9e64f07540 Merge branch 'hotfix' Nabin Hait 2016-10-04 17:26:33 +05:30
  • d5cebd7bb4 bumped to version 7.0.54 Nabin Hait 2016-10-04 17:56:33 +06:00
  • 6a1742abc8 [minor] status for student applicant Rushabh Mehta 2016-10-04 16:26:09 +05:30
  • 80de91776d Merge pull request #6539 from rohitwaghchaure/stock_entry_grid_issue Nabin Hait 2016-10-04 16:20:47 +05:30
  • cf87027422 Merge pull request #6537 from rohitwaghchaure/pos_multi_company_issue Nabin Hait 2016-10-04 16:20:24 +05:30
  • 661db8ba71 [Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record Rohit Waghchaure 2016-10-04 14:46:34 +05:30
  • 82be020ae9 sync offline sales invoices from the POS Rohit Waghchaure 2016-10-04 12:46:37 +05:30
  • 66d49565d2 Merge pull request #6536 from frappe/umairsy-patch-4 Nabin Hait 2016-10-04 12:25:45 +05:30
  • 3af3d7abe3 [fixes] admission-applicant link and student applicant fixes Rushabh Mehta 2016-10-04 12:20:47 +05:30
  • 6f1d012b65 [Fix] Multi company issue for POS Rohit Waghchaure 2016-10-04 12:18:59 +05:30
  • 06b88a464d Update supplier.md Umair Sayed 2016-10-04 12:10:08 +05:30
  • aedad64445 [minor] fixes Rushabh Mehta 2016-10-04 11:40:22 +05:30
  • f24d523fc9 [fix] currency symbol for total amount in JE Saurabh 2016-10-03 17:14:31 +05:30
  • 7fb79d175f Fixed version conflict Nabin Hait 2016-10-03 18:05:34 +05:30
  • 112827ee86 Merge branch 'hotfix' Nabin Hait 2016-10-03 18:05:11 +05:30
  • e2b8ae56e1 bumped to version 7.0.53 Nabin Hait 2016-10-03 18:35:10 +06:00
  • a65c223428 Merge pull request #6533 from nabinhait/hotfix Nabin Hait 2016-10-03 18:03:33 +05:30
  • d114aca20d GL Entries for Purchase Invoices with Update Stock option checked and having non-stock items Nabin Hait 2016-10-03 17:36:17 +05:30
  • 5a431127c5 Merge pull request #6532 from netchampfaris/hotfix Nabin Hait 2016-10-03 17:32:55 +05:30
  • 69ca382529 [fix] image size fix in print format Faris Ansari 2016-10-03 17:15:42 +05:30
  • 93d314c573 Merged introduction and eligibility into a single text field in Student Admission. (#6529) Neil Trini Lasrado 2016-10-03 15:50:47 +05:30
  • 5fd5a77750 Fixed version conflict Nabin Hait 2016-10-03 14:13:50 +05:30
  • c9fc091289 Merge branch 'hotfix' Nabin Hait 2016-10-03 14:12:54 +05:30
  • e7e920b487 bumped to version 7.0.52 Nabin Hait 2016-10-03 14:42:53 +06:00
  • e8519938e0 Merge pull request #6525 from rohitwaghchaure/minor_pos Nabin Hait 2016-10-03 14:10:44 +05:30
  • 10a48ea5e9 Merge pull request #6527 from rohitwaghchaure/budget_issue Nabin Hait 2016-10-03 14:05:10 +05:30
  • 0b7b109c0b Merge pull request #6528 from saurabh6790/hotfix Nabin Hait 2016-10-03 14:04:50 +05:30
  • 4f62c4cf2d [minor][fix] for condition maker Saurabh 2016-10-03 12:48:25 +05:30
  • b1391ca635 [Fix] company key error during cancellation of stock entry Rohit Waghchaure 2016-10-03 12:25:04 +05:30
  • 6f3d04caf7 [Fix] Disable apply discount on Rohit Waghchaure 2016-10-03 11:46:04 +05:30
  • c158ccd884 Merge pull request #6518 from nabinhait/ar_ap_fix Nabin Hait 2016-10-01 17:03:09 +05:30
  • b498eb5f9e Minor fix AR/AP Nabin Hait 2016-10-01 15:51:59 +05:30
  • 47863a3049 Update request_for_quotation.html bcornwellmott 2016-09-30 15:45:20 -07:00
  • e1aee56e85 Merge pull request #6515 from rohitwaghchaure/purchase_receipt_title_issue Nabin Hait 2016-09-30 21:24:03 +05:30
  • a7b0ffca1c Merge pull request #6508 from rohitwaghchaure/account_payble_issue Nabin Hait 2016-09-30 21:13:54 +05:30
  • 74bf022273 [Fix] Purchase receipt title issue Rohit Waghchaure 2016-09-30 18:35:48 +05:30
  • c1a3e379d8 [Fixed] Accounts receivable concat issue Rohit Waghchaure 2016-09-30 13:18:06 +05:30
  • 6870e45276 Merge pull request #6495 from frappe/umairsy-patch-2 Nabin Hait 2016-09-29 20:44:59 +05:30
  • 25e62fc4bb Merge pull request #6497 from frappe/umairsy-patch-3 Nabin Hait 2016-09-29 20:44:36 +05:30
  • 7652d5db93 Merge pull request #6501 from rohitwaghchaure/minor_fix_warranty_claim Nabin Hait 2016-09-29 20:44:03 +05:30
  • 1d0b18661e [Fix] Minor changes in warranty claim Rohit Waghchaure 2016-09-29 18:55:45 +05:30
  • 6c1c03efe7 Update data-import-tool.md Umair Sayed 2016-09-29 16:34:39 +05:30
  • 29a0b31ca6 Update sales_partner.js Umair Sayed 2016-09-29 16:25:04 +05:30
  • 2ad07f4912 Merge pull request #6491 from neilLasrado/develop Nabin Hait 2016-09-29 15:39:15 +05:30
  • 80499bb657 Fixed merge conflict Nabin Hait 2016-09-29 14:18:53 +05:30
  • 773d93b628 Merge branch 'hotfix' Nabin Hait 2016-09-29 14:16:43 +05:30
  • 626fcd5199 bumped to version 7.0.51 Nabin Hait 2016-09-29 14:46:42 +06:00
  • 2c452a6881 Merge pull request #6485 from rohitwaghchaure/enhancement_payment_entry Nabin Hait 2016-09-29 13:57:48 +05:30
  • d0a25f72c7 Merge pull request #6488 from rohitwaghchaure/timesheet_delete_transaction_issue Nabin Hait 2016-09-29 13:55:38 +05:30
  • 424bffc98b Merge pull request #6486 from nabinhait/stock_trans_repost Nabin Hait 2016-09-29 13:51:51 +05:30
  • 473ccc410b Merge pull request #6489 from nabinhait/leave_application_fix Nabin Hait 2016-09-29 13:49:31 +05:30
  • b81a7538b9 Merge pull request #6492 from rohitwaghchaure/patch_for_change_amount_account Nabin Hait 2016-09-29 13:41:50 +05:30
  • a3ffe530f0 Merge pull request #6493 from nabinhait/ar_issue Nabin Hait 2016-09-29 13:39:16 +05:30
  • f1d2fd2436 [fix] Accounts Receivable report if negative write off in invoice Nabin Hait 2016-09-29 13:03:10 +05:30