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

Commit Graph

  • b34ba6bd6e [RFQ] Web form alignment issue Rohit Waghchaure 2016-09-01 18:01:27 +05:30
  • b2f0920346 [minor] new global for query report filters Rushabh Mehta 2016-09-01 17:53:19 +05:30
  • 5a101ef4c6 Fixed merge conflict Nabin Hait 2016-09-01 12:43:24 +05:30
  • 94dbc14f8a Merge branch 'hotfix' Nabin Hait 2016-09-01 12:42:29 +05:30
  • 600ab0f7a0 bumped to version 7.0.36 Nabin Hait 2016-09-01 13:12:29 +06:00
  • 9afee28c36 Merge pull request #6243 from rohitwaghchaure/timesheet_issue Nabin Hait 2016-09-01 12:38:30 +05:30
  • 86f143863f [Patch] Check table exist Rohit Waghchaure 2016-09-01 12:37:20 +05:30
  • 2490ea0b91 Fixed merge conflict Nabin Hait 2016-09-01 12:29:31 +05:30
  • c7be851bf8 Merge branch 'hotfix' Nabin Hait 2016-09-01 12:26:11 +05:30
  • b6f33c7c4f bumped to version 7.0.35 Nabin Hait 2016-09-01 12:56:11 +06:00
  • bb2bceef62 Merge pull request #6229 from rohitwaghchaure/pos_payment_issue Nabin Hait 2016-09-01 12:25:31 +05:30
  • 3e805708dc Merge pull request #6237 from rohitwaghchaure/timesheet_employee_missing_issue Nabin Hait 2016-09-01 12:15:06 +05:30
  • 7f165f19d2 [Fix] Timesheet employee is missing in patch Rohit Waghchaure 2016-09-01 00:57:43 +05:30
  • 774ce63b75 remove mode of payment, migrate mode of payment from v6 to v7 Rohit Waghchaure 2016-08-31 15:45:05 +05:30
  • 879cb6ebee [POS] Fixed POS Sales Invoice when Payment Table is Empty Rohit Waghchaure 2016-08-31 13:04:05 +05:30
  • 48914b47b7 Merge branch 'strixaluco-patch-2' into develop Nabin Hait 2016-08-31 12:36:18 +05:30
  • c0c2f75159 fixed conflict Nabin Hait 2016-08-31 12:36:03 +05:30
  • 16e15283b5 Imported unicode literals Nabin Hait 2016-08-31 12:32:10 +05:30
  • 566759acae Merge pull request #6211 from rohitwaghchaure/v7.1_fixes Nabin Hait 2016-08-31 12:12:48 +05:30
  • 88e3487f03 Merge pull request #6206 from neilLasrado/docs Nabin Hait 2016-08-31 12:12:17 +05:30
  • fa3146b444 Merge pull request #6218 from RobertSchouten/patch-20 Nabin Hait 2016-08-31 11:09:47 +05:30
  • ef16d657ff Merge pull request #6226 from rohitwaghchaure/pos_fixes_and_cleanups Nabin Hait 2016-08-31 11:02:16 +05:30
  • d39f53319d Added zero value condition Rohit Waghchaure 2016-08-31 02:09:15 +05:30
  • 609e2b4ca3 [POS] Currency format issue Rohit Waghchaure 2016-08-31 02:04:37 +05:30
  • 4f71190a85 Merge pull request #6215 from rohitwaghchaure/pos_precision_issue Nabin Hait 2016-08-30 09:52:55 +05:30
  • 385e8edd3c Merge pull request #6216 from rohitwaghchaure/update_component_patch_fix Nabin Hait 2016-08-30 09:51:23 +05:30
  • ba4456b42b dont run duplicate set status on submit RobertSchouten 2016-08-30 08:21:20 +08:00
  • da7fb70009 [Patch] Fixed error unknown column 'type' in 'field list' Rohit Waghchaure 2016-08-30 01:41:35 +05:30
  • a57bf5ee2e [fix] Precision issue for field conversion rate in POS Rohit Waghchaure 2016-08-30 00:41:33 +05:30
  • d260602cae Merge pull request #6202 from KanchanChauhan/component-type-added Nabin Hait 2016-08-29 16:19:05 +05:30
  • 145f87c068 'Type' field added to Salary Component Kanchan Chauhan 2016-08-29 15:26:57 +05:30
  • a2bf16bfaa [Fix] Billing Hours showing blank on sales invoice Rohit Waghchaure 2016-08-29 13:37:13 +05:30
  • 338e63c448 Fixed version conflict Nabin Hait 2016-08-29 11:47:50 +05:30
  • 51a236f38b Merge branch 'hotfix' Nabin Hait 2016-08-29 11:47:30 +05:30
  • 11c2207a8a bumped to version 7.0.34 Nabin Hait 2016-08-29 12:17:30 +06:00
  • a0da708d51 Merge pull request #6185 from rohitwaghchaure/fixes_and_cleanup_pos Nabin Hait 2016-08-29 11:42:09 +05:30
  • 84e88b5d63 Merge pull request #6198 from rmehta/hotfix Nabin Hait 2016-08-29 11:23:50 +05:30
  • 9d1b56f423 [minor] validate permission in Process Payroll and all products fix for home page Rushabh Mehta 2016-08-29 11:03:10 +05:30
  • 63bdd679d0 [POS] Fixes and cleanup Rohit Waghchaure 2016-08-27 01:35:31 +05:30
  • 955b979a97 Merge pull request #6183 from KanchanChauhan/columns-added-deleted Rushabh Mehta 2016-08-26 14:34:50 +05:30
  • dd96cbd012 Coded column deleted, column added from UI Kanchan Chauhan 2016-08-26 14:25:16 +05:30
  • 4403cf71b5 Merge pull request #6152 from rohitwaghchaure/profitability_report Nabin Hait 2016-08-26 13:21:01 +05:30
  • 69aebf4db5 fixes test cases, added patch Rohit Waghchaure 2016-08-23 10:41:15 +05:30
  • 0cb171feb2 [Enhancement] Added billing hours for account user in timesheet Rohit Waghchaure 2016-08-22 18:42:02 +05:30
  • e334813daf Merge pull request #6166 from neilLasrado/demo Nabin Hait 2016-08-26 13:05:43 +05:30
  • 6462ba4e0b minor changes Rohit Waghchaure 2016-08-26 12:39:54 +05:30
  • 0da75aede3 Fixed merge conflict Nabin Hait 2016-08-26 12:40:02 +05:30
  • f92f04bffc Merge branch 'hotfix' Nabin Hait 2016-08-26 12:37:19 +05:30
  • 6592899741 bumped to version 7.0.33 Nabin Hait 2016-08-26 13:07:19 +06:00
  • 06b27757ab Merge pull request #6179 from rohitwaghchaure/minor_fix_patch Nabin Hait 2016-08-26 12:33:33 +05:30
  • e21e1ebae2 [Sales Return] Minor fix in patch Rohit Waghchaure 2016-08-26 12:06:27 +05:30
  • 0a99b4347b Party mandatory message Nabin Hait 2016-08-26 12:30:37 +05:30
  • a26bb96d2d Merge pull request #6178 from nabinhait/status_updater_fix Nabin Hait 2016-08-26 12:09:39 +05:30
  • e244cde9c3 Merge pull request #6158 from KanchanChauhan/salary-structure-layout Nabin Hait 2016-08-26 12:00:29 +05:30
  • c97f7cac80 Merge pull request #6162 from strixaluco/patch-1 Nabin Hait 2016-08-26 11:59:11 +05:30
  • fbe1563101 Merge pull request #6168 from rohitwaghchaure/hotfix Nabin Hait 2016-08-26 11:58:46 +05:30
  • 47a3f639ed Ignore validating billed amount against order if order item amount is zero Nabin Hait 2016-08-26 11:39:23 +05:30
  • 6b8435c902 Merge pull request #6172 from joopdorresteijn/patch-1 Nabin Hait 2016-08-26 10:50:54 +05:30
  • 067245933e Fixed Demo Neil Trini Lasrado 2016-08-22 12:57:09 +05:30
  • efb5bf2cfc [POS] Fixed payment gl entry for sales return Rohit Waghchaure 2016-08-25 02:09:53 +05:30
  • cdfd35c9ca New Languages added: Rushabh Mehta 2016-08-25 15:23:40 +05:30
  • 385311c8a2 Merge pull request #6170 from rohitwaghchaure/patch_fix Nabin Hait 2016-08-25 14:41:47 +05:30
  • 8da1e9eeb8 Update user-restriction.md joopdorresteijn 2016-08-25 15:46:24 +08:00
  • 0788ee62c1 Fixed patch, 'SalesInvoice' object has no attribute 'account_for_change_amount' Rohit Waghchaure 2016-08-25 12:46:34 +05:30
  • 5380a1c56a Update price-lists.md strixaluco 2016-08-25 10:40:42 +08:00
  • 1e8732abc2 removed old report Rohit Waghchaure 2016-08-24 19:20:58 +05:30
  • 5794ffd43d added filters project and cost center in profit and loss statement, open profit and loss statement on click of cost center/project in profitability analysis Rohit Waghchaure 2016-08-24 19:12:14 +05:30
  • 1255a6627e project based profitability Analysis Rohit Waghchaure 2016-08-24 17:56:09 +05:30
  • 78e08b8af5 [Report] Profitability Analysis Rohit Waghchaure 2016-08-24 16:22:30 +05:30
  • fb432821bf [Report] Cost center wise profitability Rohit Waghchaure 2016-08-16 10:39:19 +05:30
  • b9b36a2062 [minor] update salary structure company if not set Rushabh Mehta 2016-08-24 15:20:43 +05:30
  • caeb9dc025 [minor] update salary structure company if not set Rushabh Mehta 2016-08-24 15:14:48 +05:30
  • 5fb2bc2b87 [fix] [versioning] Rushabh Mehta 2016-08-24 12:51:45 +05:30
  • 547dff5d5b [version] 7.1-beta Rushabh Mehta 2016-08-24 12:44:32 +05:30
  • 7d60dd7e21 Update price-lists.md strixaluco 2016-08-24 09:42:07 +08:00
  • a623a59f9e [minor] docs typo fix strixaluco 2016-08-24 09:36:17 +08:00
  • fcb793e4dd [minor] language fields are now links Rushabh Mehta 2016-08-23 16:50:53 +05:30
  • 22073f3a7f Layout changes in Salary Structure Kanchan Chauhan 2016-08-23 15:35:22 +05:30
  • cfbd0199eb Merge branch 'master' into develop Nabin Hait 2016-08-23 12:10:56 +05:30
  • ec6267e82a Merge branch 'hotfix' Nabin Hait 2016-08-23 12:10:56 +05:30
  • db05ac2414 bumped to version 7.0.32 Nabin Hait 2016-08-23 12:40:56 +06:00
  • f862505bf9 Merge pull request #6153 from rohitwaghchaure/hotfix Nabin Hait 2016-08-23 12:07:40 +05:30
  • ea6d7e9b09 [Fix] decimal button not working Rohit Waghchaure 2016-08-22 19:49:17 +05:30
  • 26f9673ad9 Merge pull request #6126 from rohitwaghchaure/multiyear_financial_statements Nabin Hait 2016-08-23 11:32:08 +05:30
  • 423f39b4f0 Merge pull request #6101 from bcornwellmott/ppt_test2 Nabin Hait 2016-08-23 11:31:17 +05:30
  • 3d93ddc606 [fix] docs links Rushabh Mehta 2016-08-22 18:47:35 +05:30
  • c525449c13 Merge pull request #6139 from PawanMeh/fixes_6089 Nabin Hait 2016-08-22 18:10:14 +05:30
  • ca4d9b54cd fixed accumulated values for cash flow Rohit Waghchaure 2016-08-22 15:53:01 +05:30
  • bee3b40725 Update gross_profit.py Pawan Mehta 2016-08-22 17:47:13 +05:30
  • 18bb431baa [fix] #6089 pawan 2016-08-22 17:27:22 +05:30
  • 8f782e71af Merge pull request #6149 from nabinhait/change_log_v7 Nabin Hait 2016-08-22 15:56:32 +05:30
  • dac204b1e3 Merge pull request #6124 from rohitwaghchaure/hotfix Nabin Hait 2016-08-22 15:56:20 +05:30
  • 9c786948d5 Merge pull request #6125 from nabinhait/lcv_hotfix Nabin Hait 2016-08-22 15:53:21 +05:30
  • 6f1795cb3d Merge pull request #6146 from neilLasrado/operation Nabin Hait 2016-08-22 15:52:57 +05:30
  • 01b555edc7 Change logs for v7 Nabin Hait 2016-08-22 15:50:21 +05:30
  • c95a3180c2 Merge pull request #6127 from KanchanChauhan/demo-fixes-salary Nabin Hait 2016-08-22 15:22:41 +05:30
  • 20b01873ab Made operation mandatory and removed mandatory from operation desc in Production Order Operation, set operation name as desc in operation master if desc is blank Neil Trini Lasrado 2016-08-22 13:12:44 +05:30
  • 114cb9f1dc Merge pull request #6145 from netchampfaris/help-feature Rushabh Mehta 2016-08-22 15:02:59 +05:30
  • 43accf4c07 Merge pull request #6144 from nabinhait/timesheet_patch_fix Nabin Hait 2016-08-22 14:39:01 +05:30
  • 3a6155b1b9 add help_links.js Faris Ansari 2016-08-22 14:36:57 +05:30