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

Commit Graph

  • cc8644f86e [Timesheet] Field rearrange Rohit Waghchaure 2016-09-07 12:28:44 +05:30
  • a36a88b6de Remove Difference Account field from Stock Entry parent form Nabin Hait 2016-09-12 13:15:44 +05:30
  • 60a05324ce POS changes and fixes Rohit Waghchaure 2016-09-12 01:37:46 +05:30
  • 294664b24c Merge pull request #6267 from PawanMeh/fixes_6254 Nabin Hait 2016-09-12 13:03:14 +05:30
  • 9c82dd9157 Merge pull request #6332 from rmehta/item-group-paging Nabin Hait 2016-09-12 13:01:54 +05:30
  • 4fc70d962b add customer and supplier names to some reports robert schouten 2016-09-12 15:23:51 +08:00
  • db33ebb0ff [fix] status updater percent when qty is minus value RobertSchouten 2016-09-12 14:54:46 +08:00
  • ea3b342dde fix display unclosed values for trial/balance/sheet robert schouten 2016-09-12 14:37:58 +08:00
  • 6465711ca6 [fix] missing gl entries warnings robert schouten 2016-09-12 11:17:14 +08:00
  • bd979ec1ed [fix] itemwise sales register add sales invoice to delivery note when update stock RobertSchouten 2016-09-12 09:46:10 +08:00
  • 3aa315040f [fix] paging for item group Rushabh Mehta 2016-09-11 16:48:24 +05:30
  • 8d0b826840 Added supplier quotation filter for Quoted Item Comparison Ben Cornwell-Mott 2016-09-09 08:00:54 -07:00
  • b835fef8ac [enhancement] modify payment request to get payment url (#6097) Saurabh 2016-09-09 11:19:22 +05:30
  • f4498307c6 fix allow negatives in leave type check RobertSchouten 2016-09-09 11:35:51 +08:00
  • b64fc33be1 stock entries from production_order dont fetch serial number of project RobertSchouten 2016-09-09 11:08:39 +08:00
  • 2efe20bd9a stock entries from production_order dont fetch serial number of project RobertSchouten 2016-09-09 11:05:22 +08:00
  • b7fc4b76e4 stock entries from production_order dont fetch serial number of project RobertSchouten 2016-09-09 11:02:33 +08:00
  • 2ecddf58d2 leave balance now fy not calendar RobertSchouten 2016-09-09 10:48:34 +08:00
  • 93c095bf16 allow users without employee with hr permission to view all calendars RobertSchouten 2016-09-09 10:15:56 +08:00
  • e4d3809c87 allow users without employee with hr permission to view all calendars RobertSchouten 2016-09-09 10:14:07 +08:00
  • e5d13f3156 Update set_student_guardian.py Nabin Hait 2016-09-08 17:57:55 +05:30
  • 7819744e5b Merge pull request #6315 from rohitwaghchaure/patch_fix Nabin Hait 2016-09-08 16:52:32 +05:30
  • fff6e19479 Merge pull request #6318 from neilLasrado/develop Nabin Hait 2016-09-08 16:51:30 +05:30
  • 1e060e98c5 Rearranged feilds in Student Applicant & Student, Split address feild Neil Trini Lasrado 2016-09-08 16:12:39 +05:30
  • aaa6d1f1bc patch fix Rohit Waghchaure 2016-09-08 01:27:16 +05:30
  • d97200cb5a fixed version conflict Nabin Hait 2016-09-07 17:20:45 +05:30
  • a8b8d81e2a Merge branch 'hotfix' Nabin Hait 2016-09-07 17:20:14 +05:30
  • 3e669ca656 bumped to version 7.0.42 Nabin Hait 2016-09-07 17:50:14 +06:00
  • 1bf8e70339 Update convert_timelog_to_timesheet.py Nabin Hait 2016-09-07 17:19:27 +05:30
  • 7c9d981614 Update convert_timelog_to_timesheet.py Nabin Hait 2016-09-07 17:17:47 +05:30
  • 0a0df2e433 fixed version conflict Nabin Hait 2016-09-07 17:01:47 +05:30
  • 1bdffbff57 Merge branch 'hotfix' Nabin Hait 2016-09-07 17:01:17 +05:30
  • 094d3adba3 bumped to version 7.0.41 Nabin Hait 2016-09-07 17:31:17 +06:00
  • 6a5751e91c Merge pull request #6311 from nabinhait/patch_hotfix_1 Nabin Hait 2016-09-07 17:00:29 +05:30
  • 23147ff881 Patch fixed Nabin Hait 2016-09-07 16:31:26 +05:30
  • c16c0ca944 Merge pull request #6310 from rohitwaghchaure/pos_itemwise_tax_issue Nabin Hait 2016-09-07 15:59:32 +05:30
  • 525900c5c1 [Fix] Item level taxes are not getting calculated in POS Rohit Waghchaure 2016-09-07 15:01:08 +05:30
  • 0261889c0f Fixed spelling Ben Cornwell-Mott 2016-09-07 02:28:50 -07:00
  • fbf27b5031 Further corrections to Currency Exchange table Chude Osiegbu 2016-09-07 03:06:08 +01:00
  • 7b2bd20a09 [fix] #6254 pawan 2016-09-06 18:28:41 +05:30
  • b8b228ed14 Fixed version conflict Nabin Hait 2016-09-06 17:56:32 +05:30
  • 75a41a6f75 Merge branch 'hotfix' Nabin Hait 2016-09-06 17:55:55 +05:30
  • 9b54b78794 bumped to version 7.0.40 Nabin Hait 2016-09-06 18:25:55 +06:00
  • e5480f4545 Merge pull request #6300 from neilLasrado/develop Nabin Hait 2016-09-06 17:54:06 +05:30
  • 52891b55d2 Fixed Student Guardian patch - reload issue Neil Trini Lasrado 2016-09-06 17:50:29 +05:30
  • 93851df048 Merge pull request #6299 from nabinhait/patch_fix_800 Nabin Hait 2016-09-06 17:49:53 +05:30
  • f79d7188de Patch fixed Nabin Hait 2016-09-06 17:47:05 +05:30
  • 1830675481 Merge pull request #6295 from rohitwaghchaure/supplier_quotation_uom_conversion_issue Nabin Hait 2016-09-06 17:30:08 +05:30
  • b44efef094 [Issue] Fixed, supplier quotation item uom conversion Rohit Waghchaure 2016-09-06 15:42:36 +05:30
  • 541e8504a6 Merge pull request #6294 from neilLasrado/develop Nabin Hait 2016-09-06 17:20:12 +05:30
  • 6a95723a70 Fixed Student Guardian patch - permission issue Neil Trini Lasrado 2016-09-06 17:10:58 +05:30
  • 194fbaca13 Merge pull request #6291 from RobertSchouten/patch-21 Nabin Hait 2016-09-06 17:06:56 +05:30
  • 06792a93cd Merge pull request #6289 from KanchanChauhan/barcode-in-stock-reconciliation Nabin Hait 2016-09-06 17:06:06 +05:30
  • b830ffc7d5 Merge pull request #6245 from neilLasrado/develop Nabin Hait 2016-09-06 17:05:02 +05:30
  • 49da25dd57 Added patch Neil Trini Lasrado 2016-09-06 15:28:13 +05:30
  • 5ae21053bd fix for closing balance typo RobertSchouten 2016-09-06 15:44:09 +08:00
  • c20adb532f Added student Category Neil Trini Lasrado 2016-09-05 16:55:54 +05:30
  • d878b66936 Updated Student Doctype Neil Trini Lasrado 2016-09-01 14:45:58 +05:30
  • a477e411aa Updated Guardian Doctype; Added new fields Neil Trini Lasrado 2016-09-01 13:01:34 +05:30
  • 366ba04823 Barcode added to Stock Reconciliation Kanchan Chauhan 2016-09-06 12:44:57 +05:30
  • 3cdc74e3b0 Merge pull request #6286 from rohitwaghchaure/pos_name Nabin Hait 2016-09-06 11:38:51 +05:30
  • 10024e13ec Correction to test_records.json for Currency Exchange doctype Chude Osiegbu 2016-09-06 00:26:27 +01:00
  • 7be3aa3158 Changes to allow exchange rates on a specific day to be stored in Currency Exchange and to be pulled by the necessary transactions based on the posting date. Chude Osiegbu 2016-09-05 23:35:00 +01:00
  • 377c7acd53 [POS] Added offline_pos_name in print format Rohit Waghchaure 2016-09-05 17:56:44 +05:30
  • 05621ed564 Merge pull request #6284 from nabinhait/advance_fetch Nabin Hait 2016-09-05 17:02:44 +05:30
  • ca627fb806 [fix] Fetch advance journal entry in invoice if it is tagged against linked order Nabin Hait 2016-09-05 16:16:53 +05:30
  • 406f0a38de Fixed merge conflicts Nabin Hait 2016-09-05 15:44:18 +05:30
  • 6e4ab60e4c Merge branch 'hotfix' Nabin Hait 2016-09-05 15:43:48 +05:30
  • 911e9caa43 bumped to version 7.0.39 Nabin Hait 2016-09-05 16:13:48 +06:00
  • b239a09951 Merge pull request #6282 from nabinhait/maintenance_schedule_fix Nabin Hait 2016-09-05 15:39:54 +05:30
  • d223a03814 Merge pull request #6281 from nabinhait/notifications Nabin Hait 2016-09-05 15:26:23 +05:30
  • 4cb58c410a Minor fix in maintenance schedule Nabin Hait 2016-09-05 15:14:26 +05:30
  • 906552a401 Notifications filters for DN, PR and PI Nabin Hait 2016-09-05 14:35:23 +05:30
  • a58431a9a7 Merge pull request #6210 from rohitwaghchaure/purchase_return_issue Nabin Hait 2016-09-05 12:48:43 +05:30
  • 3bd5014b7b Merge pull request #6280 from nabinhait/minorfixes Nabin Hait 2016-09-05 12:32:09 +05:30
  • 8693b5c93a Minor fixes Nabin Hait 2016-09-04 10:31:41 +05:30
  • cc1c7ad2df added test cases Rohit Waghchaure 2016-09-02 16:19:10 +05:30
  • 560ba391f9 [Enhancement] Purchase return for rejected qty Rohit Waghchaure 2016-08-29 18:19:32 +05:30
  • b2b238323b Suggested Changes to School (#6223) manqala 2016-09-03 16:35:06 +01:00
  • bd9a275d5f [fix] #6254 pawan 2016-09-02 16:50:04 +05:30
  • 23d79b7059 fixed version conflict Nabin Hait 2016-09-02 16:19:54 +05:30
  • 36830016ee Merge branch 'hotfix' Nabin Hait 2016-09-02 16:19:21 +05:30
  • 533e564867 bumped to version 7.0.38 Nabin Hait 2016-09-02 16:49:21 +06:00
  • 88d7e419ad Merge pull request #6263 from nabinhait/timesheet_fix_101 Nabin Hait 2016-09-02 16:18:12 +05:30
  • 54254cca58 Update set_party_name_in_payment_entry.py Nabin Hait 2016-09-02 16:17:42 +05:30
  • 142f14dd5c Migrate employee field to timesheet only if it exists in time log Nabin Hait 2016-09-02 14:47:05 +05:30
  • 15b26d8b1a Fixed merge conflicts Nabin Hait 2016-09-02 14:29:57 +05:30
  • 0f0c131ba4 Merge branch 'hotfix' Nabin Hait 2016-09-02 14:26:33 +05:30
  • e1e187bee1 bumped to version 7.0.37 Nabin Hait 2016-09-02 14:56:33 +06:00
  • c946c730da Merge pull request #6258 from nabinhait/party_name_in_pe Nabin Hait 2016-09-02 14:20:22 +05:30
  • 5a4ca64c4a Party name in Payment Entry and cheque print format Nabin Hait 2016-09-02 12:15:41 +05:30
  • 47fd4c6521 Merge pull request #6261 from nabinhait/order_trends_fix Nabin Hait 2016-09-02 14:17:30 +05:30
  • e58031ab49 Merge pull request #6249 from rohitwaghchaure/rfq_webform_issue Nabin Hait 2016-09-02 14:17:22 +05:30
  • f8e374643c Merge pull request #6257 from nabinhait/letter_head_in_report Nabin Hait 2016-09-02 14:17:12 +05:30
  • 0ef9da65dc Merge pull request #6260 from rohitwaghchaure/timesheet_status_and_date_issue Nabin Hait 2016-09-02 14:16:53 +05:30
  • 98d58b5ed1 Merge pull request #6262 from saurabh6790/hotfix Nabin Hait 2016-09-02 14:14:47 +05:30
  • ff910f4c72 [fixes] set filter for warehouse Saurabh 2016-09-02 13:39:05 +05:30
  • 5c69fed218 Ignore closed sales/purchase order in trends report Nabin Hait 2016-09-02 12:53:18 +05:30
  • d07557eaf6 [Fix] Updated timesheet status Rohit Waghchaure 2016-09-02 12:24:54 +05:30
  • 13b37c6346 Default letter head in report printing based on selected company Nabin Hait 2016-09-02 11:25:28 +05:30