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

Commit Graph

  • 79fe1fad5d Merge pull request #6374 from RobertSchouten/salary_register Nabin Hait 2016-09-20 10:58:53 +05:30
  • 33ea19d616 Merge pull request #6395 from RobertSchouten/payroll_date Nabin Hait 2016-09-20 10:57:32 +05:30
  • af03de3d00 Merge pull request #6399 from rohitwaghchaure/pos_payment_mode_type_missing_issue Nabin Hait 2016-09-20 10:56:54 +05:30
  • 5c41c77c7e added posting date to process payroll and salary slip robert schouten 2016-09-19 15:25:00 +08:00
  • 414199a5db [Fix] Mode of payment issue Rohit Waghchaure 2016-09-19 13:59:18 +05:30
  • 383cb43135 Merge pull request #6393 from KanchanChauhan/gl-fix Nabin Hait 2016-09-19 19:35:55 +05:30
  • b20c83de46 Merge pull request #6397 from neilLasrado/develop Nabin Hait 2016-09-19 19:25:41 +05:30
  • fe15fd622d Merge pull request #6398 from mainul94/Issue#6370 Nabin Hait 2016-09-19 19:25:24 +05:30
  • 902bcc07b5 Merge pull request #6401 from rmehta/fix-lead-link Nabin Hait 2016-09-19 19:22:34 +05:30
  • acc3f43666 Merge pull request #6406 from rohitwaghchaure/add_sq_in_opportunity Nabin Hait 2016-09-19 19:14:39 +05:30
  • 93424e95f4 Added ability to Import Data via Data Import Tool in Instructor Doctype Neil Trini Lasrado 2016-09-19 13:21:55 +05:30
  • 5b5f3743dd Opportunity, added supplier quotation in the dashboard Rohit Waghchaure 2016-09-19 18:36:21 +05:30
  • 9aacf46c51 [fix] minor fix to accomodate custom fields in tree popup Saurabh 2016-09-19 16:42:25 +05:30
  • 559aa3ab7c [enhance] show customer, supplier billing and outstanding, fixes #6078 Rushabh Mehta 2016-09-19 16:04:58 +05:30
  • 5a58d8a11e [minor] production order link in material request, fixes #6197 Rushabh Mehta 2016-09-19 15:33:46 +05:30
  • bd15e31ea1 [minor] [enhance] fixes #6222 Rushabh Mehta 2016-09-19 15:27:09 +05:30
  • e35dbca01b [fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051 Rushabh Mehta 2016-09-19 15:03:57 +05:30
  • 006a0e68bf Against Voucher Type and Against Voucher added to GL Kanchan Chauhan 2016-09-19 00:44:37 +05:30
  • 17c43cd799 Merge pull request #6392 from KanchanChauhan/actual-qty-in-mri Nabin Hait 2016-09-19 13:32:31 +05:30
  • 284cc200b7 Merge pull request #6396 from strixaluco/patch-4 Nabin Hait 2016-09-19 13:27:07 +05:30
  • 71073e1730 Update stock-entry.md strixaluco 2016-09-19 15:38:38 +08:00
  • 79a3e632ed Merge pull request #6391 from rohitwaghchaure/pos_print_format_new_changes Nabin Hait 2016-09-19 12:31:15 +05:30
  • dbf2ce67a6 Fixed Issue#6370 Mainul Islam 2016-09-19 12:49:01 +06:00
  • 256ec170d0 Corrections properly distinguish between transaction_date and posting_date as the basis for determining translation date that is passed to get_exchange_rate Chude Osiegbu 2016-09-19 03:53:37 +01:00
  • 375a3c003d Update to erpnext/public/js/controllers/transaction.js in order to enable it detect when the doctype for which exchange rate is to be determined is a Sales Order or Purchase order. If it is either, then use transaction_date instead of posting_date as the argument to get_exchange_rate method Chude Osiegbu 2016-09-19 02:35:32 +01:00
  • 1f64f9897c Additional corrections for cases where get_exchange_rate was not called with the correct number of arguments. Chude Osiegbu 2016-09-19 01:34:49 +01:00
  • 7e74fb4357 Modification to set_price_list_currency in accounts_controller.py to allow for specification of date in get_exchange_rate call Chude Osiegbu 2016-09-19 00:59:25 +01:00
  • 3c6a937a7c Merge branch 'develop' into exchange_rate_modifications Chude Osiegbu 2016-09-18 21:47:55 +01:00
  • d1d129edf0 Actual Qty added to Material Request Item Kanchan Chauhan 2016-09-19 00:22:37 +05:30
  • 3c4cdd2a94 [Fix] Added base_url, print_css in pos Rohit Waghchaure 2016-09-19 00:17:32 +05:30
  • cf7a36ac26 [fix] fix patch to clear lead customization Rushabh Mehta 2016-09-16 23:01:41 +05:30
  • 5bab04fead Merge pull request #6381 from rmehta/lead-source Nabin Hait 2016-09-16 16:58:40 +05:30
  • c4bf8c5493 Merge pull request #6383 from nabinhait/article_max_cols Nabin Hait 2016-09-16 16:58:15 +05:30
  • b1bb1727ff Merge pull request #6384 from saurabh6790/v7.1_Journal_Entry_Opening_Entry Nabin Hait 2016-09-16 16:58:05 +05:30
  • 9919a0a9db [fix] #5992 Saurabh 2016-09-16 16:21:36 +05:30
  • 39b5d39df6 [fix] remove campaign depends on Rushabh Mehta 2016-09-16 15:55:34 +05:30
  • 86e660f6c3 Article on maximum number of fields Nabin Hait 2016-09-16 14:51:28 +05:30
  • 59dc0ece9f [enhance] added Lead Source master, fixes #6231 Rushabh Mehta 2016-09-16 11:37:38 +05:30
  • 56700ae148 Merge pull request #6356 from KanchanChauhan/job-application-webform Nabin Hait 2016-09-15 17:20:43 +05:30
  • f3fd2ce382 Merge pull request #6366 from rohitwaghchaure/opportunity_enhancement Nabin Hait 2016-09-15 17:18:51 +05:30
  • f79adfddf1 Merge pull request #6351 from RobertSchouten/patch-29 Nabin Hait 2016-09-15 17:01:20 +05:30
  • 3cef7d5ae9 Update production_planning_tool.py Nabin Hait 2016-09-15 17:01:00 +05:30
  • bb5eb7d6f4 Added title to Student Admission (#6379) Neil Trini Lasrado 2016-09-15 16:44:25 +05:30
  • b267673b8e Merge pull request #6373 from vrms/patch-2 Nabin Hait 2016-09-15 16:11:56 +05:30
  • 756467c872 Merge pull request #6372 from vrms/patch-1 Nabin Hait 2016-09-15 16:11:45 +05:30
  • 7e1b516103 fixes for student admission (#6377) Neil Trini Lasrado 2016-09-15 15:36:14 +05:30
  • 769dda0874 [translation] [fixes] #5860 Rushabh Mehta 2016-09-15 15:15:45 +05:30
  • 83d81203b2 Added Student Admissions (#6359) Neil Trini Lasrado 2016-09-15 14:48:13 +05:30
  • 33d18dbc9a [docs] for auto email Rushabh Mehta 2016-09-15 13:57:25 +05:30
  • 759ef4c00d Allowed past dates in next depreciation date Nabin Hait 2016-09-15 12:24:19 +05:30
  • 32c366508a add print format and id to monthly salary register robert schouten 2016-09-15 14:21:15 +08:00
  • 05e33789aa Update index.md vrms 2016-09-15 14:11:06 +08:00
  • 6d34033c3f Update item-variants.md vrms 2016-09-15 14:05:13 +08:00
  • d5ebd79ad7 Fixed version conflict Nabin Hait 2016-09-14 15:50:22 +05:30
  • 4a121d60db Merge branch 'hotfix' Nabin Hait 2016-09-14 15:44:25 +05:30
  • 72801043f1 bumped to version 7.0.43 Nabin Hait 2016-09-14 16:14:25 +06:00
  • 00295f2b8d make supplier quotation from opportunity Rohit Waghchaure 2016-09-14 15:36:40 +05:30
  • e9fa81c286 Merge pull request #6327 from rohitwaghchaure/timesheet_enhancement Nabin Hait 2016-09-14 15:31:54 +05:30
  • 2e8eff3456 Merge pull request #6352 from superlack/patch-1 Nabin Hait 2016-09-14 15:27:02 +05:30
  • 9c32baa1f4 Merge pull request #6355 from rohitwaghchaure/timesheet_calendar_permission_issue Nabin Hait 2016-09-14 15:26:30 +05:30
  • 9d095dcec2 Merge pull request #6364 from rohitwaghchaure/financial_statements_report_issue Nabin Hait 2016-09-14 15:25:26 +05:30
  • b78eb2b6f2 [Fix] Financial Statements reports are running very slow Rohit Waghchaure 2016-09-14 12:50:36 +05:30
  • 7157b2f286 warnings for prevent stock entries after sales invoice robert schouten 2016-09-12 11:17:14 +08:00
  • b6bca567ce [fixes] [style] for web-form Rushabh Mehta 2016-09-13 14:37:09 +05:30
  • 122d0791a3 Job Application web form Kanchan Chauhan 2016-09-13 14:29:02 +05:30
  • 4bd08182ac [Fix] Timesheet calendar permission issue Rohit Waghchaure 2016-09-13 13:35:53 +05:30
  • ae9990cb81 Merge pull request #6353 from rohitwaghchaure/patch_fix_for_timesheet Nabin Hait 2016-09-13 13:31:11 +05:30
  • a5de83351e [Fix] Timesheet patch Rohit Waghchaure 2016-09-13 12:36:37 +05:30
  • 1579565e52 Activity Summary to not show cancelled timesheets on click superlack 2016-09-12 21:18:41 -07:00
  • 4ca64c33eb Update production_planning_tool.json RobertSchouten 2016-09-13 08:36:05 +08:00
  • 5414725fd6 PPT material request non-stock items RobertSchouten 2016-09-13 08:27:51 +08:00
  • 0568238786 rename total_billing_hours to total_billable_hours in timesheet doctype Rohit Waghchaure 2016-09-12 23:00:24 +05:30
  • 7b6fdb77d0 rename total_billing_amount to total_billable_amount in timesheet doctype Rohit Waghchaure 2016-09-12 19:06:41 +05:30
  • fcbb7692fa Merge pull request #6322 from RobertSchouten/patch-23 Nabin Hait 2016-09-12 18:53:16 +05:30
  • b7c5b76ed1 Merge pull request #6321 from RobertSchouten/patch-22 Nabin Hait 2016-09-12 18:52:45 +05:30
  • 9d9d1dceeb Merge pull request #6314 from bcornwellmott/bom_desription Nabin Hait 2016-09-12 18:45:21 +05:30
  • cd23530d24 Merge pull request #6324 from RobertSchouten/patch-24 Nabin Hait 2016-09-12 18:35:13 +05:30
  • 6c08f5caf9 Update stock_entry.py Nabin Hait 2016-09-12 18:34:46 +05:30
  • d7b95267b3 Update production_planning_tool.py Nabin Hait 2016-09-12 18:33:17 +05:30
  • ee3be536cb Merge pull request #6349 from rohitwaghchaure/so_dn_required_issue Nabin Hait 2016-09-12 18:31:30 +05:30
  • 97a82714de [Fix] so_dn_required for pos and stock update invoice Rohit Waghchaure 2016-09-12 18:03:48 +05:30
  • 0a2c7a9a66 Merge pull request #6329 from bcornwellmott/quotecomp_add_supplier Nabin Hait 2016-09-12 17:55:19 +05:30
  • 97b661f995 Merge pull request #6334 from RobertSchouten/patch-27 Nabin Hait 2016-09-12 17:53:10 +05:30
  • 1d8d93d9ad Update balance_sheet.py Nabin Hait 2016-09-12 17:43:14 +05:30
  • 9821816e6c Merge pull request #6337 from RobertSchouten/patch-28 Nabin Hait 2016-09-12 17:37:48 +05:30
  • 0a7c0f4418 Merge pull request #6338 from RobertSchouten/report_names Nabin Hait 2016-09-12 17:36:46 +05:30
  • 014c30c90d Merge pull request #6339 from rohitwaghchaure/pos_enhancement Nabin Hait 2016-09-12 17:35:40 +05:30
  • 33a20bdb13 Merge pull request #6340 from nabinhait/se_difference_account Nabin Hait 2016-09-12 17:34:59 +05:30
  • d220298e69 Merge pull request #6343 from PawanMeh/fixes_6195 Nabin Hait 2016-09-12 17:34:40 +05:30
  • f314494555 Merge pull request #6345 from rohitwaghchaure/employee_name_missing Nabin Hait 2016-09-12 17:34:13 +05:30
  • 6594c841a7 Added color coding to timesheet calendars (#6269) bcornwellmott 2016-09-12 04:13:23 -07:00
  • daee449063 [fix] for print format draft (#6346) Rushabh Mehta 2016-09-12 16:42:36 +05:30
  • 03e5e68a7a [Fix] Employee name is missing in timesheet Rohit Waghchaure 2016-09-12 16:14:06 +05:30
  • af111e9c43 [fix] #6195 pawan 2016-09-12 15:15:32 +05:30
  • 4eb908fc76 Doc updated for timesheet Rohit Waghchaure 2016-09-09 19:10:45 +05:30
  • e1d59d6dde test cases and minor changes Rohit Waghchaure 2016-09-09 16:53:11 +05:30
  • 1d0e8ea9c6 minor changes Rohit Waghchaure 2016-09-09 15:05:17 +05:30
  • c940440fbe patch and rearrangement of fields Rohit Waghchaure 2016-09-09 13:08:23 +05:30
  • 3815ebff8a Added %billed in timesheet Rohit Waghchaure 2016-09-08 18:17:43 +05:30
  • a6927e05ba set project wise timesheet data Rohit Waghchaure 2016-09-07 14:39:17 +05:30