1. d8e9198 Fixed Merge conflict by pawan · 7 years ago
  2. 97b8a7b Minor fixes in payroll entry by Nabin Hait · 7 years ago
  3. c84476b Fixed merge conflict by Nabin Hait · 7 years ago
  4. a160879 set the reference document in the payment entry while creating from fees (#11861) by Manas Solanki · 7 years ago
  5. 6a418f2 change Purchase Taxes and Charges default to 'Total' (#11857) by tundebabzy · 7 years ago
  6. d52c64f [fix] Show total for opening and closing dr/cr (#11860) by rohitwaghchaure · 7 years ago
  7. 3a5ca92 [Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category (#11848) by rohitwaghchaure · 7 years ago
  8. a11dcb6 Pull items in Stock Entry from Purchase Invoice (#11839) by Nabin Hait · 7 years ago
  9. 1fb285c hide html example in print (#11830) by tundebabzy · 7 years ago
  10. 11938a4 fixed typo (#11825) by Shreya Shah · 7 years ago
  11. 7a294e6 Update asset_category.json by Nabin Hait · 7 years ago
  12. 5e80195 Update asset_category.json by Nabin Hait · 7 years ago
  13. 34a0e90 [fix] merge conflicts by Saurabh · 7 years ago
  14. ec3be9e [hotfix] Party Type name (#11797) by Faris Ansari · 7 years ago
  15. e761b9d Rearranged fields due to merge conflict messup by Nabin Hait · 7 years ago
  16. 17e03cf [minor] Removed hidden for field pos profile by Rohit Waghchaure · 7 years ago
  17. 855e390 [fix] Sales Invoice json conflict (#11779) by Vishal Dhayagude · 7 years ago
  18. d42242d [Feature] Shipping Rule Calculation based on Net Weight (#11770) by Vishal Dhayagude · 7 years ago
  19. f591a22 Fetch items of item groups defined in the pos profile (#11763) by rohitwaghchaure · 7 years ago
  20. cf9573a Removed asset doctypes files from accounts module and patches by Nabin Hait · 7 years ago
  21. c037dc7 Refactor multi pos profile selection in the pos invoice (#11721) by rohitwaghchaure · 7 years ago
  22. e58a41a Added maintenance to Asset and enhanced maintenance for Asset Maintenance by Kanchan Chauhan · 7 years ago
  23. b750b30 fixed merge-conflicts by Saurabh · 7 years ago
  24. ab5e77e [fix] do not pull disabled pos profiles (#11733) by Saurabh · 7 years ago
  25. 57952f6 Merge branch 'develop' into feature_10861 by Nabin Hait · 7 years ago
  26. 82027ea Set print hide property for payment terms by Nabin Hait · 7 years ago
  27. ed4191e [fix] merge-conflicts by Saurabh · 7 years ago
  28. 96abfd2 [fix] In payment entry, run some events serially to avoid async issue by Nabin Hait · 7 years ago
  29. 32a62a0 Fixed merge conflict by Nabin Hait · 7 years ago
  30. 0551f7b Cleanup and fixes of payment terms feature by Nabin Hait · 7 years ago
  31. 179e0c1 Added party name in accounts receivable/payable report (#11656) by rohitwaghchaure · 7 years ago
  32. 7794049 [fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment by Rohit Waghchaure · 7 years ago
  33. 1b4894c make root_type null if not root (#11626) by Zarrar · 7 years ago
  34. 30dc9a1 [feature] [refactor] Shipping Rule for Buying + Refactor (#11628) by Rushabh Mehta · 7 years ago
  35. 66e65dc [fix] merge-conflicts by Saurabh · 7 years ago
  36. 44f7b15 [fix] POS redirect issue by Rohit Waghchaure · 7 years ago
  37. 7fa111d Update sales_invoice.py by Nabin Hait · 7 years ago
  38. 6b70906 Update purchase_invoice.py by Nabin Hait · 7 years ago
  39. 1c4653e Merge branch 'develop' into payment-terms by Nabin Hait · 7 years ago
  40. 877e1bb Post GL Entry based on rounded total in Sales/Purchase Invoice (#11542) by Nabin Hait · 7 years ago
  41. 1749b7c Minor fixes related to account renaming and deletion by Nabin Hait · 7 years ago
  42. 46be989 Account number in chart of accounts (#10551) by Nabin Hait · 7 years ago
  43. 135a54c Allow print before pay in POS (#11590) by augustinfotech · 7 years ago
  44. eb39820 convert html into text in the taxes description as it can break the reports (#11603) by Manas Solanki · 7 years ago
  45. bda07c6 Added Warehouse, Cost Center, Owner filters to Sales Register (#11600) by Pawan Mehta · 7 years ago
  46. 21cbbae [fix] Payment reconcillation showing linked journal entries (#11611) by rohitwaghchaure · 7 years ago
  47. f67372c removed logic from delivery note for checking bypass credit limit flag by ashish · 7 years ago
  48. 62155fa Merge branch 'feature_10861' of https://github.com/ashish-greycube/erpnext into feature_10861 by ashish · 7 years ago
  49. d3f5d09 [feature] Opening Invoice Creation Tool (#11589) by Rushabh Mehta · 7 years ago
  50. 24b8aa2 set field dependent on link field fix (#11580) by Zarrar · 7 years ago
  51. 6fd163b Merge branch 'master' into develop by Nabin Hait · 7 years ago
  52. 3a9ca88 Update party.py (#11584) by Umair Sayed · 7 years ago
  53. be690ef Rate with margin in customer and company currency (#11437) by Shreya Shah · 7 years ago
  54. cd13a28 Get items from quotation in sales invoice by Nabin Hait · 7 years ago
  55. 0ebd3c3 Getting Quotation Document in Sales Invoice by AravindPranera · 7 years ago
  56. ffa659f Merge branch 'develop' into payment-terms by tunde · 7 years ago
  57. ec8a0a2 Merge branch 'master' into develop by Nabin Hait · 7 years ago
  58. 6605919 GL Entries on sale of an asset (#11538) by Nabin Hait · 7 years ago
  59. deeb138 Ignore paid credit note in outstanding invoices in Payment Entry (#11534) by Nabin Hait · 7 years ago
  60. 0f86d86 [fix] validate party account (#11517) by Saurabh · 7 years ago
  61. 17b7209 remove erroneous column breaks (#11522) by Prateeksha Singh · 7 years ago
  62. 731b66b remove erroneous column breaks (#11523) by Prateeksha Singh · 7 years ago
  63. 4313326 [fix] treeview for tasks (#11515) by Rushabh Mehta · 7 years ago
  64. 7ab28ec [fix] give preference to gateway selected on shopping cart settings (#11393) by Saurabh · 7 years ago
  65. 1575307 Nestedset model fixes for changing parent and renaming (#11467) by Nabin Hait · 7 years ago
  66. ff73646 Made POS Profile mandatory and changed test order by Nabin Hait · 7 years ago
  67. 98aa544 Merge branch 'master' into staging by Saurabh · 7 years ago
  68. f41b13b [fix] merge-conflicts by Saurabh · 7 years ago
  69. 72c40f0 Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note (#11440) by Sushant Nadkar · 7 years ago
  70. f688af3 [fix] Offline pos name is not defined issue in the POS (#11469) by rohitwaghchaure · 7 years ago
  71. 35fc45e [fix] POS Profile test cases by Rohit Waghchaure · 7 years ago
  72. e552a51 Minor cleanups by Nabin Hait · 7 years ago
  73. 436f7b9 codacy issues by pawan · 7 years ago
  74. 438dfc0 fix codacy issues by pawan · 7 years ago
  75. d592256 remove old report by pawan · 7 years ago
  76. b699b86 Add Total Row by pawan · 7 years ago
  77. 8d1d64a [fix] #11449 by pawan · 7 years ago
  78. e61a275 [fix] #11427 by pawan · 7 years ago
  79. bcb7854 Merge pull request #10982 from netchampfaris/multiple-users-pos-profile by rohitwaghchaure · 7 years ago
  80. b1616a0 changes in thepos profile by Manas Solanki · 7 years ago
  81. 3f0dfd7 set the pos profile in the sales invoice by Manas Solanki · 7 years ago
  82. 76ce074 return the account details if and only if there is single account of that type (#11407) by Manas Solanki · 7 years ago
  83. 62fd400 Merge branch 'master' into staging by Saurabh · 7 years ago
  84. 3be72ef Merge branch 'master' into develop by Saurabh · 7 years ago
  85. 99748db [Fix] Wrong difference amount in the payment entry for the internal transfer type by Rohit Waghchaure · 7 years ago
  86. 3d59179 Load default pos profile if not found by Faris Ansari · 7 years ago
  87. 160e710 set bank account only if there is single bank type account (#11363) by Manas Solanki · 7 years ago
  88. 6b26e39 use the new frappe charts :D (#11391) by Prateeksha Singh · 7 years ago
  89. 895aa7b fix codacy by Faris Ansari · 7 years ago
  90. 7095de0 Merge branch 'develop' into multiple-users-pos-profile by Faris Ansari · 7 years ago
  91. 8c1099d Add POS Profile User DocType by Faris Ansari · 7 years ago
  92. ca2250c sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice.cint function is added. by ashish · 7 years ago
  93. 14e97ce Merge branch 'develop' into payment-terms by tunde · 7 years ago
  94. c799a22 Merge branch 'master' into staging by Nabin Hait · 7 years ago
  95. edef981 Merge branch 'master' into develop by Nabin Hait · 7 years ago
  96. 52909b7 [test] Fixed advance jv cancellation (#11333) by Nabin Hait · 7 years ago
  97. b445633 Merge branch 'master' into staging by Saurabh · 7 years ago
  98. 0d597ce Merge branch 'master' into develop by Saurabh · 7 years ago
  99. 2e6f6d6 [minor] cleanup code (#11331) by rohitwaghchaure · 7 years ago
  100. ff20182 sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice by ashish · 7 years ago