nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-28 06:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,493 Commits 623 Branches 1,804 Tags
b7012a47a22406fdc19a56732bf65d594c771cba
Commit Graph

2157 Commits

Author SHA1 Message Date
Deepesh Garg
a0c847920f Merge pull request #19984 from 0Pranav/mapped-doc-for-customer-quotation-v12 
fix: use open_mapped_doc instead of create_new_doc
 2019-12-19 12:00:23 +05:30
deepeshgarg007
5cc0e08a41 fix: Use get_value instead of get_doc and formatting 2019-12-19 11:07:43 +05:30
0Pranav
6e41475612 fix : only set price list if it exists for customer 2019-12-18 16:05:59 +05:30
0Pranav
200ceb5352 use open_mapped_doc instead of create_new_doc 2019-12-18 12:34:19 +05:30
rohitwaghchaure
62d4dfa883 Merge pull request #19956 from nextchamp-saqib/pos-serial-no 
fix: display serial no selection on adding items to cart
 2019-12-16 14:54:23 +05:30
thefalconx33
b8f9fd023b fix: display serial no selection on adding items to cart 2019-12-16 14:49:59 +05:30
rohitwaghchaure
e0e7dcd2f6 Merge pull request #19914 from nextchamp-saqib/cart-address-hotfix 
fix: enable adding of address without enabling checkout feature
 2019-12-16 13:52:48 +05:30
thefalconx33
1de3040ecb fix: additional notes from Quotations not saved in SO 2019-12-11 18:11:48 +05:30
rohitwaghchaure
ac967d09ec fix: Item-wise Sales History report not working (#19890) 2019-12-10 21:34:20 +05:30
Deepesh Garg
72649c207f feat(regional): Auto state wise taxation for GST India (#19877) 
* feat(regional): Auto state wise taxation for GST India

* fix: Update gst category on addition of GSTIN

* fix: Codacy and travis fixes

* fix: Travis

* fix(test): Update GST category only if GSTIN field available

* fix: Test Cases

* fix: Do not skip accounts if place of supply is not present

* fix: Auto GST taxation for SEZ Party types

* fix: Automatic taxation for multi state

* fix: Codacy and travis fixes

* fix: Auto GST template selection in Sales Order

* fix: Move inter state check and source state to tax category

* fix: Remove unique check from tax template

* fix: Remove unique check from tax template

* fix: Address fetching logic in Sales

* fix: fecth tax template on company address change

* fix: fetch company gstin on address change

* fix: company_gstin set value fix

* fix: Mutiple fixes and code refactor

* fix: Add missing semicolon

* fix: Company address fetching in sales invoice

* fix: Remove print statement

* fix: Import functools

* fix: Naming fixes and code cleanup

* fix: Update patches

* fix: Remove changes in patches.txt

* fix: Iteritems compatibility for python 3
 2019-12-10 15:54:29 +05:30
Deepesh Garg
1e2be32860 fix: Consistency in button positions in Sales Order and Purchase Order (#19834) 2019-12-09 13:04:58 +05:30
Pranav Nachnekar
d16ef54665 fix: query for finding lost quotation (#19801) 
* fix:query for finding lost quotation

* Update opportunity.py
 2019-12-04 15:31:25 +05:30
Deepesh Garg
18f05db19a Merge pull request #19763 from Mangesh-Khairnar/fix-pr-creation-so 
fix(sales-order): allow payment request creation for so that are not billed
 2019-12-03 10:42:53 +05:30
deepeshgarg007
9b64e2e24c fix: Available stock for packing item report 2019-12-01 22:20:18 +05:30
Mangesh-Khairnar
4f95e5d092 fix: show create payment request for so that are not billed 2019-11-30 20:31:18 +05:30
Marica
b1fac1817c fix: Validation for Suppliers in SO to PO (#19700) 
- Check if there is a Supplier against atleast one item in Sales Order
- Validation message earlier was vague
 2019-11-28 18:23:11 +05:30
Marica
9d5f43f4f0 fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19694) 2019-11-27 15:50:45 +05:30
Deepesh Garg
5558ee8597 Merge pull request #19591 from 0Pranav/FR-ISS-152101 
fix: add status "expired" to doctype quotation
 2019-11-26 09:08:30 +05:30
deepeshgarg007
53a66ee386 fix: Method name in hooks, test case code clean up 2019-11-25 21:58:15 +05:30
0Pranav
565d3efcdf fetch updated document in test_quotation 2019-11-25 17:11:12 +05:30
0Pranav
cf3a2f6579 set transaction date to yesterday 2019-11-25 16:26:04 +05:30
0Pranav
032baeac5b don't submit quotation 2019-11-25 15:15:00 +05:30
0Pranav
754c43f6c3 fix set_expired_status method 2019-11-25 14:27:43 +05:30
0Pranav
e0c9f3c282 fix valid date 2019-11-25 14:14:51 +05:30
0Pranav
a9ff7df2e6 add sql query to set valid_till 2019-11-25 12:55:27 +05:30
Pranav Nachnekar
04e3a506e4 fix: Primary address not being fetched for customer (#19667) 
* fix: priamry address not being fetched

* add doctype to filter for customer_primary_address

* remove get_customer_primary_address_method
 2019-11-25 12:04:00 +05:30
0Pranav
a077795581 fix tests 2019-11-25 12:01:00 +05:30
0Pranav
eefc492ff4 call commit after sql query for schedular job 2019-11-25 10:51:27 +05:30
0Pranav
6c368e2dfb submit quotation in test 2019-11-22 13:22:12 +05:30
0Pranav
b3354198f1 Fix sql query in set_expired_status 2019-11-22 12:38:43 +05:30
0Pranav
f5112905dc import make_item method in tests 2019-11-21 13:19:44 +05:30
0Pranav
4a28144941 add tests 2019-11-20 15:53:19 +05:30
0Pranav
5717a265b7 remove: unused imports 2019-11-20 15:31:13 +05:30
rohitwaghchaure
238521c2bd Merge pull request #19501 from Mangesh-Khairnar/multiple-pos-profile 
feat: multiple company pos profile
 2019-11-19 18:39:06 +05:30
Mangesh-Khairnar
c436d93303 fix: reset pos profile when default doesn't exists 2019-11-19 18:21:53 +05:30
Pranav Nachnekar
e13b769813 use nowdate instead of date.today() 
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2019-11-19 12:04:30 +00:00
0Pranav
b9460ed22c switched ORM methods for single SQL query 2019-11-19 10:46:07 +05:30
Mangesh-Khairnar
f69b9a8c47 fix: fetch default pos profile user for the company 2019-11-15 16:54:26 +05:30
0Pranav
53b65ab8ed Add status expired to doctype quotation 2019-11-15 16:42:32 +05:30
rohitwaghchaure
6424416886 fix: sales order item shwoing incorrect produced qty (#19584) 2019-11-15 14:18:45 +05:30
0Pranav
f75ea952e3 Added expired status to quotation 2019-11-13 11:03:53 +05:30
Mangesh-Khairnar
2f44480d69 enhancement: Item-wise sales history report (#19500) 
* refactor(item-wise-sales-history): convert query report to script report

* refactor: add columns, fetch data

* refactor: shift company set func to utils

* fix: add filters

* fix: minor changes

* fix: fetch all the descendants
 2019-11-11 10:54:12 +05:30
Diksha
7091a2102c fix(sales order): rename delivery to delivery note on sales order make button 2019-11-04 12:03:35 +05:30
Mangesh-Khairnar
e3bc213262 feat: multiple company pos profile 2019-11-01 22:35:08 +05:30
Rohan
8728e94dbd Merge branch 'develop' into develop-company-address-label 2019-10-29 11:26:00 +05:30
Suraj Shetty
83b58352ce fix: Overwrite default cost center if item has default cost center set. (#19405) 2019-10-28 12:05:30 +05:30
Rohan
962f4eb96c Merge branch 'develop' into develop-company-address-label 2019-10-23 15:57:26 +05:30
Nabin Hait
bd6b1806cd fix: fixed asset register report and made skip-dn field hidden 2019-10-22 14:28:37 +05:30
Deepesh Garg
6208755d54 fix: Unable to add details in quotation and opportunity (#19354) 2019-10-21 13:29:44 +05:30
deepeshgarg007
737ec6b26e fix: Travis 2019-10-20 17:36:36 +05:30