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

Commit Graph

  • c663f5c2bd [Test] test state based taxasion Saurabh 2015-09-15 15:36:21 +05:30
  • adde1cff48 [Enhancement] add state ccriteria in tax rule Saurabh 2015-09-15 12:49:32 +05:30
  • bb9427d1ef [Fixes] deprecated Saurabh 2015-09-14 19:15:16 +05:30
  • 052babc6b6 [Fixes] [Minor] removed console statement Saurabh 2015-09-14 18:51:46 +05:30
  • 24fa06bc53 [Fixes] rebase conflict fixes Saurabh 2015-09-14 18:48:39 +05:30
  • 7c867ae9ad [Fixes] Tax Rule preparation and test taxes creation, remove dummy quotation Saurabh 2015-09-14 16:59:10 +05:30
  • 8f7317175d [enhancement] bring taxes from tax rules and test cases Saurabh 2015-09-14 11:13:01 +05:30
  • 957e7a37be [Shopping Cart][Fixes] tax calculation based on tax rule Saurabh 2015-09-11 15:44:06 +05:30
  • def71d4d5d [Shopping Cart][Fixes] tax calculation based on tax rule Saurabh 2015-09-11 11:14:07 +05:30
  • ef511b160e Added Tax Rule under ERPNext > Accounts > Setup Neil Trini Lasrado 2015-08-26 15:01:20 +05:30
  • 09f9c96c53 Fixes in Tax Rule Neil Trini Lasrado 2015-08-26 10:41:31 +05:30
  • 1a2d121073 Removed default taxes and charges from customer and supplier master. Added patch to create tax rules against customer/supplier Neil Trini Lasrado 2015-08-21 15:53:10 +05:30
  • 810bd35609 Apply Tax Rule based on Customer Selection in Sales / Purchase Transactions Neil Trini Lasrado 2015-08-21 15:04:57 +05:30
  • 949d7dbaba Added validations, test-cases to Tax Rule Neil Trini Lasrado 2015-08-17 14:55:15 +05:30
  • 72e6aa160c Added New Doctype Tax Rule Neil Trini Lasrado 2015-08-14 11:40:00 +05:30
  • 0870b185de Merge pull request #4015 from anandpdoshi/use-add-fetch Anand Doshi 2015-09-15 14:02:06 +05:30
  • 69f2cc8d24 [fix] don't fetch template item in get items of stock reconciliation Anand Doshi 2015-09-15 11:54:13 +05:30
  • 86102064a5 [fix] Use add_fetch in Product Bundle, Maintenance Visit and Maintenance Schedule instead of redundant get_item_details method Anand Doshi 2015-09-15 11:50:27 +05:30
  • 0fd3347148 [fix] handle invalid date in get_retirement_date Anand Doshi 2015-09-15 11:29:51 +05:30
  • b74265c842 [minor] [patch] reload activity cost in default_activity_rate Anand Doshi 2015-09-15 11:27:19 +05:30
  • 1fef2fad2d [minor] fixes in queries and payment tool Anand Doshi 2015-09-14 18:27:21 +05:30
  • 9345240ff1 Merge pull request #4007 from anandpdoshi/setup-wizard-duplicate-entry Anand Doshi 2015-09-14 16:33:16 +05:30
  • 9ab23231e6 Merge pull request #4011 from anandpdoshi/defaults-during-creation Anand Doshi 2015-09-14 16:33:00 +05:30
  • dbe623b167 [fix] Use User Permission value as default only if the document type is Setup Anand Doshi 2015-09-14 13:08:53 +05:30
  • 71e51c179c [fix] changed modified for multi-currency sync Anand Doshi 2015-09-11 16:55:11 +05:30
  • 4b8dbbdf98 [minor] Change modified of Sales Invoice.json Anand Doshi 2015-09-11 16:39:03 +05:30
  • aaf1895a12 Merge branch 'nabinhait-multi-currency' into develop Anand Doshi 2015-09-11 16:35:17 +05:30
  • 979326b0b1 minor fixes in multi-currency Anand Doshi 2015-09-11 16:22:37 +05:30
  • 5d9cfc76cd Don't copy title field in Duplicate Anand Doshi 2015-09-11 12:26:57 +05:30
  • 8db7bd2d8f [fix] Igonre permissions while saving Company and Warehouse from Accounts Settings Nabin Hait 2015-09-10 12:13:27 +05:30
  • d461d462aa [minor] rename notified_modifed > notified_update. Merge with #1296 Rushabh Mehta 2015-09-10 10:30:41 +05:30
  • e67fa424b2 [fix] catch DuplicateEntryError in install_fixtures step of Setup Wizard Anand Doshi 2015-09-11 15:32:06 +05:30
  • 121176f0e9 Merge pull request #4002 from rmehta/notify-update-rename Anand Doshi 2015-09-11 15:11:57 +05:30
  • 1c2636e7b3 Merge pull request #4003 from nabinhait/fix8 Anand Doshi 2015-09-11 15:00:13 +05:30
  • 840cad0ff7 Don't copy title field in Duplicate Anand Doshi 2015-09-11 12:26:57 +05:30
  • f76d63b92a Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency [fix][patch] delete item variant attributes if no variants exists against that item Nabin Hait 2015-09-10 19:26:02 +05:30
  • 71ef6675ce [fix] Journal Entry client side minor fixes Nabin Hait 2015-09-10 19:25:50 +05:30
  • 793b87948c [fix] [patch] item template attributes Anand Doshi 2015-09-10 18:10:15 +05:30
  • a1b0ff09a8 Merge pull request #4004 from nabinhait/fix9 Anand Doshi 2015-09-10 15:56:45 +05:30
  • 5a803d76ad [fix] Bypass Root Not Editable validation from Setup Wizard Nabin Hait 2015-09-10 13:20:35 +05:30
  • 9513025130 [fix] Igonre permissions while saving Company and Warehouse from Accounts Settings Nabin Hait 2015-09-10 12:13:27 +05:30
  • a13c60bf9f [minor] fix title in readme Rushabh Mehta 2015-09-10 10:43:43 +05:30
  • bc23e5ac5c [minor] rename notified_modifed > notified_update. Merge with #1296 Rushabh Mehta 2015-09-10 10:30:41 +05:30
  • 2377cdfa4e Fixed conflict Nabin Hait 2015-09-09 18:45:41 +05:30
  • e3ae05aabd Multi-currency: Exchange Rate in Journal Entry Nabin Hait 2015-09-09 18:43:12 +05:30
  • a2fda1c779 Merge branch 'develop' Anand Doshi 2015-09-09 18:42:49 +05:30
  • a29577ca71 bumped to version 6.1.1 Anand Doshi 2015-09-09 19:12:48 +06:00
  • b1454cdf9f [fix] fix planned qty Anand Doshi 2015-09-09 17:59:48 +05:30
  • f668a4d03c Merge branch 'develop' Anand Doshi 2015-09-09 15:32:03 +05:30
  • c2b4ae6667 bumped to version 6.1.0 Anand Doshi 2015-09-09 16:02:03 +06:00
  • 1857bb8b0b [change-log] Anand Doshi 2015-09-09 15:23:16 +05:30
  • 888a70c2d4 [fix] Setup Wizard - the case of forgetting mute emails Anand Doshi 2015-09-09 15:14:16 +05:30
  • 9d5b84e78a Merge pull request #3996 from nabinhait/fix6 Anand Doshi 2015-09-09 15:11:12 +05:30
  • bdc125ad0f Merge pull request #3999 from nabinhait/planned_qty Anand Doshi 2015-09-09 13:14:09 +05:30
  • f0b3014a23 Planned Qty logic fixed and reposted for existing Nabin Hait 2015-09-09 11:04:05 +05:30
  • 0b17a91aba Merge pull request #3998 from nabinhait/fix7 Nabin Hait 2015-09-09 10:37:30 +05:30
  • 83dd3e14e5 [fix] Gross Profit report should not include return entries Nabin Hait 2015-09-09 10:36:55 +05:30
  • 38f64ea3ab Merge pull request #3991 from anandpdoshi/apply-user-permissions-fix Anand Doshi 2015-09-08 22:09:44 +05:30
  • cd103c05d6 Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order Nabin Hait 2015-09-08 19:24:35 +05:30
  • bc1e8b4408 [minor] Unset Apply User Permissions in default permissions Anand Doshi 2015-09-07 17:35:10 +05:30
  • 6c3ff3e2ed Fixed conflict Nabin Hait 2015-09-08 18:09:03 +05:30
  • 4fb7f881c8 Merge branch 'nabinhait-fix4' into develop Anand Doshi 2015-09-08 16:37:52 +05:30
  • 83a358afc1 Fix invoice outstanding where party missing Nabin Hait 2015-09-07 15:22:24 +05:30
  • 96bb070781 Payment against invoices where party not specified Nabin Hait 2015-09-07 15:51:40 +05:30
  • d387dd3bc6 [fix] Project: round percent_complete to 2 decimals Nabin Hait 2015-09-08 16:14:36 +05:30
  • 9f25575e0c Merge pull request #3988 from nabinhait/fix2 Anand Doshi 2015-09-08 15:59:18 +05:30
  • e1af7f1a0f [minor] default mins_between_operations = 10 Anand Doshi 2015-09-08 15:55:09 +05:30
  • c35df5ce80 Merge branch 'rmehta-stock-settings' into develop Anand Doshi 2015-09-08 15:54:17 +05:30
  • 2c2868db11 [translations] Anand Doshi 2015-09-07 18:47:04 +05:30
  • 17f28c13ed [fix] Customer match condition in autosuggest Anand Doshi 2015-09-02 13:42:50 +05:30
  • 3f1f2dd307 [fix] setup wizard - industry type Anand Doshi 2015-09-07 10:11:23 +05:30
  • ab05dcd9f9 [fix] [patch] reload item attribute + value Anand Doshi 2015-09-04 16:41:22 +05:30
  • f21edba97f [fixes] to task test case and fix tree ui for mobile Rushabh Mehta 2015-09-02 12:18:37 +05:30
  • 91b0e2348c [minor] task not mandatory for Time Log and Expense Claim #3904 Rushabh Mehta 2015-08-31 15:04:48 +05:30
  • 4de91887db [patch] Re-run the 'default_title' patch Nabin Hait 2015-09-03 10:46:48 +05:30
  • 9b1288605f bumped to version 6.0.1 Anand Doshi 2015-09-02 19:28:14 +06:00
  • 43888546f6 Merge pull request #3968 from rmehta/task-not-mandatory Anand Doshi 2015-09-08 15:47:11 +05:30
  • 68d2e317d2 Merge pull request #3992 from anandpdoshi/translations Anand Doshi 2015-09-08 15:45:08 +05:30
  • 2249eea59f Fixed conflict Nabin Hait 2015-09-08 12:55:21 +05:30
  • d608363d7b [fix] Map amount in advance payment entry agaionst SO/PO based on party account currency Nabin Hait 2015-09-08 12:53:59 +05:30
  • b2739cbb79 Get average exchange rate in case of bank transfer Nabin Hait 2015-09-08 12:18:45 +05:30
  • f5940907ae [translations] Anand Doshi 2015-09-07 18:47:04 +05:30
  • 90162078d5 Merge pull request #3989 from anandpdoshi/customer-query-match-condition Anand Doshi 2015-09-07 14:52:49 +05:30
  • cba99743a4 [fix] Customer match condition in autosuggest Anand Doshi 2015-09-02 13:42:50 +05:30
  • f44128f81c Set expense account in stock reco only if company available Nabin Hait 2015-09-07 10:45:15 +05:30
  • 3607737b5e Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency Nabin Hait 2015-09-07 10:41:01 +05:30
  • bf9691ed39 Multiple fixes Nabin Hait 2015-09-07 10:40:48 +05:30
  • bbca95fd1b [fix] setup wizard - industry type Anand Doshi 2015-09-07 10:11:23 +05:30
  • 4df98d52c1 [fix] setup wizard - industry type Anand Doshi 2015-09-07 10:11:23 +05:30
  • e9b445c853 [fix] Stock Entry additional costs patch fix for v4 accounts Nabin Hait 2015-08-24 16:55:02 +05:30
  • 28f8664b93 [fix] [patch] reload item attribute + value Anand Doshi 2015-09-04 16:41:22 +05:30
  • 216aaaf1d6 Set currency and exchange rate based on Customer's currency while making Quotation from Opportunity Nabin Hait 2015-09-04 16:41:04 +05:30
  • be9edae961 [fixes] to task test case and fix tree ui for mobile Rushabh Mehta 2015-09-02 12:18:37 +05:30
  • 4223d7c044 [minor] task not mandatory for Time Log and Expense Claim #3904 Rushabh Mehta 2015-08-31 15:04:48 +05:30
  • 3a53d49b7e [fix] Set account and party balance in Journal Entry Nabin Hait 2015-09-04 15:46:47 +05:30
  • 4d62d7867e [report] Bank Reconciliation Statement in account currency Nabin Hait 2015-09-04 13:26:45 +05:30
  • c0e3b1a0c7 Removed account and party balance in company currency from Journal Entry Nabin Hait 2015-09-04 13:26:23 +05:30
  • 34fe81f7eb Patch fixed Nabin Hait 2015-09-03 19:18:00 +05:30
  • 11a746d363 Fixed conflict Nabin Hait 2015-09-03 16:04:11 +05:30
  • 1609933748 Test cases for multi currency Nabin Hait 2015-09-03 16:03:07 +05:30