- 9261590 Fixed merge conflict by Nabin Hait · 7 years ago
- 2f9f4f9 Multiple fixes related to payment terms (#12115) by Nabin Hait · 7 years ago
- b725aff [fix] Mobile no search issue in the pos (#12090) by rohitwaghchaure · 7 years ago
- e067bed [fix] Promise issue, in cart against item displaying zero values (#12078) by rohitwaghchaure · 7 years ago
- 78a1735 [fix] Item search in POS (#12037) by rohitwaghchaure · 7 years ago
- 5a34457 [minor] Address fix (#12025) by rohitwaghchaure · 7 years ago
- d377018 [fix] Shipping charges change on qty, item_code and conversion_factor trigger (#12001) by Vishal Dhayagude · 7 years ago
- 2b95a54 POS batch fixes (#12005) by rohitwaghchaure · 7 years ago
- 24e5265 [enhance] Search customer using primary contact mobile number (#11998) by rohitwaghchaure · 7 years ago
- 0f97eda Merge branch 'master' into develop by Nabin Hait · 7 years ago
- d18423d Project Margin Calculation Improvement (#11911) by Charles-Henri Decultot · 7 years ago
- de1e29b Production Order fixes (#11951) by Nabin Hait · 7 years ago
- d19be49 [fix] Error opening the POS (#11929) by rohitwaghchaure · 7 years ago
- 17fd661 Fix travis (#11882) by Zarrar · 7 years ago
- c47745e only fetch distinct names of events (#11846) by Zarrar · 7 years ago
- 34a0e90 [fix] merge conflicts by Saurabh · 7 years ago
- e761b9d Rearranged fields due to merge conflict messup by Nabin Hait · 7 years ago
- ce63ab7 Show Batch Selector Dialog Only If There Are Multiple Batches (#11794) by tundebabzy · 7 years ago
- 8ae53ca When Warehouse Field Is Changed, Batch Number Field Should Be Updated (#11789) (#11790) by tundebabzy · 7 years ago
- c0c470b fixed json affected by latest merge by Shreya · 7 years ago
- 0154538 [fix] [minor] pos.js by Rushabh Mehta · 7 years ago
- 1b344ca [Fix] POS not loading if pos profile not defined (#11778) by rohitwaghchaure · 7 years ago
- d42242d [Feature] Shipping Rule Calculation based on Net Weight (#11770) by Vishal Dhayagude · 7 years ago
- f591a22 Fetch items of item groups defined in the pos profile (#11763) by rohitwaghchaure · 7 years ago
- 0d82b69 add missing field and value parameters by tunde · 7 years ago
- c037dc7 Refactor multi pos profile selection in the pos invoice (#11721) by rohitwaghchaure · 7 years ago
- a14baf4 Merge pull request #11739 from rohitwaghchaure/payment_terms_test_case by rohitwaghchaure · 7 years ago
- 22641e4 Allowing the creation of an Oganization as Lead (#11724) by Charles-Henri Decultot · 7 years ago
- 52bf56d [fix] payment terms test case by Rohit Waghchaure · 7 years ago
- 15f8fe0 [fix] Batch selected in the sales transaction for non batch item (#11713) by rohitwaghchaure · 7 years ago
- aa5b566 Merge branch 'ashish-greycube-feature_10861-1' into develop by Nabin Hait · 7 years ago
- 6876825 Cleanup and fixes on bypass credit limit check on sales order by Nabin Hait · 7 years ago
- 09b39f0 Code cleanup by Rohit Waghchaure · 7 years ago
- 57952f6 Merge branch 'develop' into feature_10861 by Nabin Hait · 7 years ago
- acccdb3 Default batch number selection (#11454) by tundebabzy · 7 years ago
- 82027ea Set print hide property for payment terms by Nabin Hait · 7 years ago
- ed4191e [fix] merge-conflicts by Saurabh · 7 years ago
- 32a62a0 Fixed merge conflict by Nabin Hait · 7 years ago
- cc88457 Update sales_order.py by Nabin Hait · 7 years ago
- 834541a [fix] Added primary action in the modal which will show on the submission in the pos (#11575) by rohitwaghchaure · 7 years ago
- 7794049 [fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment by Rohit Waghchaure · 7 years ago
- 30dc9a1 [feature] [refactor] Shipping Rule for Buying + Refactor (#11628) by Rushabh Mehta · 7 years ago
- 66e65dc [fix] merge-conflicts by Saurabh · 7 years ago
- 44f7b15 [fix] POS redirect issue by Rohit Waghchaure · 7 years ago
- 1c4653e Merge branch 'develop' into payment-terms by Nabin Hait · 7 years ago
- f17ca78 removed names from comments by ashish · 7 years ago
- 604eb9d added flag to function get_customer_outstanding and removed names in comments by ashish · 7 years ago
- a20c8db instead of caller as 3rd arg added a flag by ashish · 7 years ago
- a1feb32 added json for bypass credit limit checkbox by ashish · 7 years ago
- 62155fa Merge branch 'feature_10861' of https://github.com/ashish-greycube/erpnext into feature_10861 by ashish · 7 years ago
- 24b8aa2 set field dependent on link field fix (#11580) by Zarrar · 7 years ago
- 10823e5 Merge branch 'neilLasrado-develop1' into develop by Nabin Hait · 7 years ago
- b55e985 Minor fixes by Nabin Hait · 7 years ago
- be690ef Rate with margin in customer and company currency (#11437) by Shreya Shah · 7 years ago
- cd13a28 Get items from quotation in sales invoice by Nabin Hait · 7 years ago
- 86e7261 Getting Quotation Document in Sales Invoice by AravindPranera · 7 years ago
- ffa659f Merge branch 'develop' into payment-terms by tunde · 7 years ago
- 17b7209 remove erroneous column breaks (#11522) by Prateeksha Singh · 7 years ago
- 731b66b remove erroneous column breaks (#11523) by Prateeksha Singh · 7 years ago
- a5275a1 Merge branch 'master' into develop by Saurabh · 7 years ago
- a5e3c3a Add item directly in the cart only if serial no, batch, barcode has enter in the search field by Rohit Waghchaure · 7 years ago
- 1368ba0 [fix] #11337 (#11339) by Pawan Mehta · 7 years ago
- ff73646 Made POS Profile mandatory and changed test order by Nabin Hait · 7 years ago
- 98aa544 Merge branch 'master' into staging by Saurabh · 7 years ago
- f41b13b [fix] merge-conflicts by Saurabh · 7 years ago
- 72c40f0 Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note (#11440) by Sushant Nadkar · 7 years ago
- 57cc924 [Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart by Rohit Waghchaure · 7 years ago
- bcb7854 Merge pull request #10982 from netchampfaris/multiple-users-pos-profile by rohitwaghchaure · 7 years ago
- cbaa0e6 fix codacy by Faris Ansari · 7 years ago
- 62fd400 Merge branch 'master' into staging by Saurabh · 7 years ago
- 3be72ef Merge branch 'master' into develop by Saurabh · 7 years ago
- 3d59179 Load default pos profile if not found by Faris Ansari · 7 years ago
- 5ec9f69 [Fix] Getting an error while making delivery note from sales order and sales order has no item code by Rohit Waghchaure · 7 years ago
- 895aa7b fix codacy by Faris Ansari · 7 years ago
- 7095de0 Merge branch 'develop' into multiple-users-pos-profile by Faris Ansari · 7 years ago
- b883e4e customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set. cint function is added. by ashish · 7 years ago
- 751b05f sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice. cint function is added. by ashish · 7 years ago
- 9dfc0f3 customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. It is default to 0. Also patch is added to update value of new field to 0 after migrate. by ashish · 7 years ago
- 14e97ce Merge branch 'develop' into payment-terms by tunde · 7 years ago
- c799a22 Merge branch 'master' into staging by Nabin Hait · 7 years ago
- edef981 Merge branch 'master' into develop by Nabin Hait · 7 years ago
- 6887ced [fix] item qty trigger (#11349) by Faris Ansari · 7 years ago
- b445633 Merge branch 'master' into staging by Saurabh · 7 years ago
- 0d597ce Merge branch 'master' into develop by Saurabh · 7 years ago
- c65f1d7 Search item using name instead of item code (#11327) by rohitwaghchaure · 7 years ago
- 8fbf10f New test case files added.(a)test_sales_order_with_bypass_credit_limit_check.js -- New feature: i.e. bypass credit limit check at sales order.(b)test_sales_order_without_bypass_credit_limit_check.js --Regression test case : the existing default flow is checked i.e. credit limit check happens at sales order level by ashish · 7 years ago
- fb364df customer_credit_balance.py -- Credit limit should now reflect outstanding amount for each customer based on value of flage bypass credit limit check at sales order level. A new column is added to show the value of this flag. customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set by ashish · 7 years ago
- 8ad4efe sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice by ashish · 7 years ago
- 06e6a82 customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. test_customer.js : auto generated file as customer.json is modified by ashish · 7 years ago
- 4d22b6d Fixed Merge Conflict by Nabin Hait · 7 years ago
- cd3dbcb Fixed Merge Conflict by Nabin Hait · 7 years ago
- 4a60554 Green indicator in the cart for non stock item (#11325) by rohitwaghchaure · 7 years ago
- bafcd74 Add Bundle Description Field To Product Bundle (#11122) by tundebabzy · 7 years ago
- 1c12375 Subscription fixes (#11292) by Nabin Hait · 7 years ago
- 09ce68e Merge branch 'develop' into payment-terms by tunde · 7 years ago
- eb662b5 Added Test Cases by Neil Trini Lasrado · 7 years ago
- af091ac [BUG] Map Production Order with the exact Sales Order line item by Neil Lasrado · 7 years ago
- 5afc194 [BUG] Fixes make Production Order from Sales Order by Neil Lasrado · 7 years ago
- bc4e2cd [added] hospitality domain (#11020) by Rushabh Mehta · 7 years ago
- cd4202c Merge branch 'master' into develop by mbauskar · 7 years ago