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

Commit Graph

  • 7866c6e6db [fix] modified in sales order and purchase order Anand Doshi 2015-10-07 17:26:19 +05:30
  • 5812fdb574 Merge branch 'develop' Nabin Hait 2015-10-07 14:40:32 +05:30
  • 4c502bcd26 bumped to version 6.4.5 Nabin Hait 2015-10-07 15:10:32 +06:00
  • 714948c867 Merge pull request #4136 from nabinhait/uom Nabin Hait 2015-10-07 14:30:18 +05:30
  • 8f3b360f83 Merge pull request #4133 from saurabh6790/erp_support Nabin Hait 2015-10-07 14:29:38 +05:30
  • 314086d6c0 [fix] Fetch UOM Conversion Factor from template if not specified in variants Nabin Hait 2015-10-07 11:55:01 +05:30
  • bcd655a985 Merge pull request #4109 from rmehta/fix-sales-purchase-order-status Nabin Hait 2015-10-07 11:34:30 +05:30
  • b0dbdc1439 minor fixes Saurabh 2015-10-07 11:27:25 +05:30
  • 37b0bf257d Merge pull request #4117 from nabinhait/sample_data Nabin Hait 2015-10-07 11:25:50 +05:30
  • c5a25f44e1 Merge pull request #4119 from nabinhait/fix3 Nabin Hait 2015-10-07 11:25:19 +05:30
  • 8dafa376ab Merge pull request #4123 from nabinhait/fix4 Nabin Hait 2015-10-07 11:24:45 +05:30
  • 74eb8e34da [Fixes] minor fix for fiscal year in holiday list Saurabh 2015-10-07 11:17:14 +05:30
  • 5c66fb7631 Merge pull request #4130 from nabinhait/reports Nabin Hait 2015-10-07 11:15:36 +05:30
  • be3b3b2107 Merge pull request #4132 from nabinhait/credit_limit Nabin Hait 2015-10-07 11:15:02 +05:30
  • 9ab09fd1d6 Merge pull request #4134 from nabinhait/valuation_rate Nabin Hait 2015-10-07 11:09:56 +05:30
  • 8a7bdd5a92 [fix] Valuation Rate in Stock Balance report Nabin Hait 2015-10-06 18:46:56 +05:30
  • 1d753c92b1 Calendar view for holiday listing Saurabh 2015-10-06 15:21:23 +05:30
  • 54ecc8ebba minor fix in credit limit Nabin Hait 2015-10-06 14:28:41 +05:30
  • f4edaef481 [fix][report] Left join used in pending reports Nabin Hait 2015-10-06 12:48:04 +05:30
  • ebbd163903 [fix] allowed more than 2 currencies in Journal Entry Nabin Hait 2015-10-05 13:21:38 +05:30
  • 8954b24b22 [fix] Return account currency only if account provided Nabin Hait 2015-10-04 12:27:46 +05:30
  • ae92fc7f35 [fix] Create sample opportunity and quotation only if Customer exists Nabin Hait 2015-10-03 13:22:53 +05:30
  • 0bc3ca02f3 [fix] default contact for website Rushabh Mehta 2015-10-03 12:08:32 +05:30
  • d10ba853e6 [fix] sales & purchase order status Rushabh Mehta 2015-10-02 12:42:48 +05:30
  • 5bcf8315de Merge branch 'develop' Anand Doshi 2015-10-02 16:35:36 +05:30
  • 789a798e36 bumped to version 6.4.4 Anand Doshi 2015-10-02 17:05:36 +06:00
  • ee1169dac7 Merge pull request #4112 from nabinhait/fix1 Nabin Hait 2015-10-02 16:27:49 +05:30
  • fbef1fdf3a Minor fix Nabin Hait 2015-10-02 16:18:32 +05:30
  • 4358e1cd46 Merge pull request #4111 from nabinhait/payment_reco_patch Anand Doshi 2015-10-02 16:05:03 +05:30
  • 7a287a9153 [patch] Fix affected Journal Entries due to reconciliation Nabin Hait 2015-10-02 15:32:00 +05:30
  • 5a49ded5d9 Merge branch 'develop' Anand Doshi 2015-10-02 12:43:27 +05:30
  • 71f23acc2b bumped to version 6.4.3 Anand Doshi 2015-10-02 13:13:27 +06:00
  • 1a1f790150 [fix] test case Anand Doshi 2015-10-02 12:34:18 +05:30
  • 3c54e9779b Merge pull request #4108 from nabinhait/payment_reco Rushabh Mehta 2015-10-02 12:32:54 +05:30
  • db48b7d764 [fix] Payment Reconciliation in multi-currency Nabin Hait 2015-10-02 12:05:55 +05:30
  • 83c0899c83 [fix] [minor] default ranges for demo Rushabh Mehta 2015-09-30 16:55:26 +05:30
  • e5047ec90a Merge pull request #4106 from anandpdoshi/payment-tool-amount Nabin Hait 2015-10-02 10:39:57 +05:30
  • d9ab725be4 [fix] In Payment Tool, Set Payment Amount = Outstanding Amount if checked Anand Doshi 2015-10-01 19:15:06 +05:30
  • 7afaeb0820 [fix] the case when party account currency is missing Anand Doshi 2015-10-01 18:55:25 +05:30
  • da2d8b958d Merge branch 'develop' Anand Doshi 2015-10-01 14:01:22 +05:30
  • ba48f82e03 bumped to version 6.4.2 Anand Doshi 2015-10-01 14:31:22 +06:00
  • 8e7e128e81 Merge pull request #4104 from nabinhait/addresses_and_contacts Anand Doshi 2015-10-01 14:00:38 +05:30
  • 0353569e8b Merge pull request #4103 from nabinhait/monthly_attendance_sheet Anand Doshi 2015-10-01 13:58:33 +05:30
  • 665e2f5418 Merge pull request #4100 from nabinhait/general_ledger_report Anand Doshi 2015-10-01 13:56:13 +05:30
  • dace2b6796 [fix] get permission query condition if no permitted links Nabin Hait 2015-10-01 13:54:46 +05:30
  • 712b02593a [fix] Month issue fixed in Monthly Attendance Sheet Nabin Hait 2015-10-01 12:35:45 +05:30
  • d2a60fd727 Merge pull request #4102 from nabinhait/lead_email Anand Doshi 2015-10-01 12:07:37 +05:30
  • f924e08b93 [fix] Validate duplicate email ids in Lead Nabin Hait 2015-10-01 11:51:48 +05:30
  • 5c623dae4d [fix] General Ledger report fixed Nabin Hait 2015-10-01 11:22:09 +05:30
  • e2c3d40b57 [hotfix] Payment Reconciliation Invoice Type Anand Doshi 2015-10-01 11:21:09 +05:30
  • 673887455f [fix] Show Contribution (%) in Sales Team table in Customer Form Anand Doshi 2015-10-01 11:18:40 +05:30
  • 63199e486b Merge branch 'develop' Anand Doshi 2015-09-30 20:51:00 +05:30
  • bf7294cf5c bumped to version 6.4.1 Anand Doshi 2015-09-30 21:20:59 +06:00
  • 8aa06a809a Merge pull request #4096 from nabinhait/jv_reference Anand Doshi 2015-09-30 19:44:21 +05:30
  • 72d2d682ae Repost GL Entries for Journal Entries where reference name is missing Nabin Hait 2015-09-30 18:42:54 +05:30
  • 21f6ea6f7e [hotfix] remove allow on submit from item tables Anand Doshi 2015-09-30 18:45:10 +05:30
  • 185f488c51 Merge branch 'develop' Anand Doshi 2015-09-30 17:23:52 +05:30
  • f3006972d5 bumped to version 6.4.0 Anand Doshi 2015-09-30 17:53:52 +06:00
  • dccc6bc11d [change-log] Anand Doshi 2015-09-30 17:19:51 +05:30
  • 15d2c89939 Merge remote-tracking branch 'upstream/master' into develop Anand Doshi 2015-09-30 17:13:58 +05:30
  • ca4c8a2a46 [translations] Anand Doshi 2015-09-30 17:10:58 +05:30
  • c320fe541d Merge pull request #4067 from anandpdoshi/remove-party-account-currency Anand Doshi 2015-09-30 16:55:24 +05:30
  • f40a87511e Merge pull request #4091 from rmehta/repack-allow-low-rate Anand Doshi 2015-09-30 16:46:31 +05:30
  • 4945b94950 [fix] added validation to match account currency with existing gle and test case Anand Doshi 2015-09-30 16:41:15 +05:30
  • cb96b61449 [fix] remove validation to disallow lower rate Rushabh Mehta 2015-09-30 16:22:05 +05:30
  • 248c867a2c [minor] removed test case for party multi-currency validation, since party multi-currency is now based on account Anand Doshi 2015-09-28 15:24:00 +05:30
  • da98ab6f3c [fix] Only 1 account per company for a party Anand Doshi 2015-09-28 15:13:38 +05:30
  • cd0989e051 Added method get_account_currency Anand Doshi 2015-09-28 13:31:17 +05:30
  • b20baf894f [fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account Anand Doshi 2015-09-25 16:17:50 +05:30
  • d3cf4f1264 Merge pull request #4075 from anandpdoshi/journal-entry-get-exchange-rate Nabin Hait 2015-09-30 15:05:41 +05:30
  • 2dbe2b63b2 Merge pull request #4088 from anandpdoshi/address-contact-permissions Anand Doshi 2015-09-30 12:19:50 +05:30
  • edba8f5582 [fix] Print 'Attach' field in Stock Entry Detail Anand Doshi 2015-09-30 11:49:04 +05:30
  • 89b8d11f9c [fix] Apply permissions on address and contact based on permissions of Customer, Supplier Anand Doshi 2015-09-29 20:06:53 +05:30
  • 19a33994da [cleanup] removed desk_home and desk_home_flows from conf.js Anand Doshi 2015-09-29 20:06:22 +05:30
  • 89349d3ae3 [fix] [payment-reconciliation] ignore rows with blank invoice numbers Rushabh Mehta 2015-09-29 16:39:53 +05:30
  • f6a31a568a Merge pull request #4085 from rmehta/bulk-priority Anand Doshi 2015-09-29 15:25:13 +05:30
  • 4bcbcd29f7 [enhancement] lower priority for newsletter emails Rushabh Mehta 2015-09-29 14:58:45 +05:30
  • 740a11263f [minor] validate invoice number is selected in Payment Reconciliation Anand Doshi 2015-09-29 12:54:50 +05:30
  • 142859f36e Merge pull request #4076 from anandpdoshi/shopping-cart-order Anand Doshi 2015-09-28 19:40:17 +05:30
  • 6534ad082d Merge pull request #4069 from anandpdoshi/round-status-updater-percentages Anand Doshi 2015-09-28 19:40:01 +05:30
  • 6361ae3495 Merge branch 'rmehta-backup-cleanup' into develop Anand Doshi 2015-09-28 19:38:06 +05:30
  • 7f75dbf061 [cleanup] remove backup manager Rushabh Mehta 2015-09-24 17:58:34 +05:30
  • 199d8a44fc [fix] check doc.has_website_permission in order.html Anand Doshi 2015-09-28 19:04:42 +05:30
  • 72b1128467 [fixes] accounts controller add flt Rushabh Mehta 2015-09-28 17:27:02 +05:30
  • d6cb55ad1a [fix] return exchange rate as 1 if no account is specified Anand Doshi 2015-09-28 17:20:02 +05:30
  • c76e34d7de [fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom Anand Doshi 2015-09-28 16:44:48 +05:30
  • 33b10faf94 Merge pull request #4074 from anandpdoshi/multi-level-bom-fetch Anand Doshi 2015-09-28 17:00:52 +05:30
  • d970b001a4 [fix] Round status update percentages to 2 decimals Anand Doshi 2015-09-25 17:57:20 +05:30
  • d767fb6134 [fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom Anand Doshi 2015-09-28 16:44:48 +05:30
  • 6239923340 Merge pull request #4071 from gmarke/patch-2 Rushabh Mehta 2015-09-28 10:18:56 +05:30
  • e5a31462fe Update get_item_details.py gmarke 2015-09-27 09:38:01 +02:00
  • 6f39300d43 Merge pull request #4068 from anandpdoshi/due-date-validation Anand Doshi 2015-09-25 17:31:33 +05:30
  • 0ca587e018 [fix] if no party, don't validate due date based on credit days Anand Doshi 2015-09-25 16:32:14 +05:30
  • 8ffe12ebe4 [chart-of-accounts] added default for Guatemala Rushabh Mehta 2015-09-25 15:40:33 +05:30
  • 8579af371c Merge pull request #4057 from rmehta/gl-report-fix Anand Doshi 2015-09-25 12:30:26 +05:30
  • b5ff9421e1 [optimize] customer outstanding query Rushabh Mehta 2015-09-25 12:24:10 +05:30
  • ba8ec17f0b Merge pull request #4065 from nabinhait/receivable_payable Rushabh Mehta 2015-09-25 11:34:14 +05:30
  • 44bd3b2601 [fix] Fetch gl entries in receivable/payable report only if party mentioned Nabin Hait 2015-09-25 10:33:03 +05:30
  • 9d40eca428 Merge pull request #4064 from nabinhait/trial_balance_for_party Rushabh Mehta 2015-09-25 10:01:44 +05:30
  • 1b6c00e2c7 [report] Trial Balance for Party Nabin Hait 2015-09-25 09:17:20 +05:30