nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 03:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,329 Commits 463 Branches 1,752 Tags
a7167f775de9a57e2035eab3f7c71ed8e3f0b557
Commit Graph

23359 Commits

Author SHA1 Message Date
Saqib Ansari
a7167f775d feat: init e-invoice settings 2020-09-30 13:18:36 +05:30
Deepesh Garg
1ccba26173 Merge branch 'version-13-beta' of https://github.com/frappe/erpnext into enconnex_erpnext 2020-09-30 12:31:19 +05:30
Saurabh
0a88624df0 Merge pull request #23373 from abhishekbalam/version-13-beta 
fix(activation): Added New DocTypes in get_level()
 2020-09-21 15:38:19 +05:30
Abhishek Balam
064a2c9aed fix: add doctypes to activation 2020-09-21 15:35:24 +05:30
Saurabh
10bf6dc2a6 fix: check setup complete flag instead setup page 2020-08-25 14:51:00 +05:30
Deepesh Garg
afd2e7bb8e Merge pull request #23141 from deepeshgarg007/sle_cancel_v13_beta 
fix: Reverse SLE not created for fraction qty or qty less than 1
 2020-08-25 14:42:04 +05:30
Deepesh Garg
04e3098481 fix: Test Case for qty less than 1 2020-08-25 14:27:47 +05:30
Deepesh Garg
84e78ec7ad fix: Negative SLE not created for fraction qty or qty less than 1 2020-08-25 14:27:35 +05:30
Afshan
930adec7ee fix:referencing frm 2020-08-25 13:48:44 +05:30
Deepesh Garg
c3fb68265f fix: Do not update total for RCM invvoices if net taxes are zero 2020-08-25 13:35:33 +05:30
Deepesh Garg
ffbf30809d fix: filter pricing rules based on condition 2020-08-14 22:37:27 +05:30
Deepesh Garg
ad02cfe98e Merge branch version-13-beta into enconnex_erpnext 2020-08-14 19:21:54 +05:30
Abhishek Balam
392a2856d3 fix: condition syntax validation readded, fetch item details if condition not met ignoring rule 2020-08-14 19:15:06 +05:30
Abhishek Balam
56b0136696 fix: eval fail message fix 2020-08-13 12:54:38 +05:30
Deepesh Garg
da82a380e1 fix: Condition fix 2020-08-13 12:54:30 +05:30
Deepesh Garg
c0e3bcf865 fix: Pass doc instead of args 2020-08-13 12:54:23 +05:30
Abhishek Balam
398c0f0b7f feat: add condition field in pricing rule 2020-08-13 12:51:35 +05:30
Abhishek Balam
6b9f7e35f4 fix: change opportunity to 'Converted' when items not selected in opportunity itself for making quotation and sales order 2020-08-11 16:17:34 +05:30
Deepesh Garg
f9a6a90900 fix: Ignore cpmpany and bank account doctype while deleting company transactions 2020-08-10 18:26:47 +05:30
sahil28297
8aeb20cab8 Merge pull request #22977 from sahil28297/fix_pos_isse_v13 
fix: remove mentions of display items in stock (#22963)
 2020-08-10 16:00:56 +05:30
sahil28297
81e35f67be Merge pull request #22979 from saurabh6790/pos 
fix: [pos] minor bugs
 2020-08-10 16:00:20 +05:30
sahil28297
e183161158 Merge pull request #22980 from sahil28297/sub_dashboard_link_v13 
fix: Subscripition link in Customer dashboard (#22960)
 2020-08-10 15:59:58 +05:30
marination
3beeeb589a fix: Susbcription in Sales Taxes and Charges Dashboard 2020-08-10 15:55:02 +05:30
Deepesh Garg
b1e2cdd4d2 fix: Subscripition link in Customer dashboard (#22960) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-10 15:53:29 +05:30
Saqib Ansari
cc5b49bff4 fix: [pos] minor bugs 2020-08-10 15:52:32 +05:30
Mangesh-Khairnar
9305e7f1cc fix: remove mentions of display items in stock (#22963) 2020-08-10 15:48:33 +05:30
Deepesh Garg
9ebe8d5895 fix: Add default billing address for purchase documents 2020-08-07 19:49:08 +05:30
Shivam Mishra
b110e5842f fix: unbound error in product configurator 2020-08-06 18:30:55 +05:30
marination
0702fbd206 fix: Show Add to Cart Button anyway 
- add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion
 2020-08-06 18:28:55 +05:30
marination
72fdc1302c fix: product action instead of info 2020-08-06 18:28:55 +05:30
Shivam Mishra
aa4f8cf4fc fix: handle product_info null 2020-08-06 18:28:55 +05:30
Saurabh
5ad9c2a1a0 bumped to version 13.0.0-beta.4 2020-08-06 13:50:20 +05:50
Suraj Shetty
8d05514260 refactor: Format and sanitise user inputs to search queries. (#22922) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-05 20:07:30 +05:30
marination
6823e8ed03 fix: Remove Duplicate Banket order method 2020-08-04 14:04:15 +05:30
Nabin Hait
a1d3537f2a fix: Bank Clearance of POS purchase invoice (#22883) 2020-08-03 20:42:00 +05:30
Nabin Hait
5e548b4387 Dunning cleanup beta (#22899) 
* fix: Dunning cleanup

* fix: Added dashboard for Dunning
 2020-08-03 20:39:15 +05:30
Rucha Mahabal
cb665dc4d1 fix: Assessment Result child table not visible when accessed via dashboard (#22881) 2020-08-03 19:43:17 +05:30
Anupam Kumar
25ee4328d3 card company issue (#22900) 2020-08-03 19:39:55 +05:30
Prssanna Desai
b44ee186cd fix: check if row['delay'] exists (#22892) 2020-08-03 15:18:35 +05:30
Marica
4e0989d0cb fix: Misleading description in Warehouse (#22878) 2020-08-03 14:56:20 +05:30
Nabin Hait
1a64d1a4ab Reset home page based on product settings (#22876) 2020-08-03 10:43:56 +05:30
Nabin Hait
826158c792 fix: Update modified timestamp in accounts settings (#22874) 2020-08-03 09:34:55 +05:30
Anurag Mishra
804426023f fix: minor payroll_dashboard fixes (#22832) 
* fix: minor payroll_dashboard fixes

* Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-03 09:28:04 +05:30
Deepesh Garg
7a004615a7 Merge pull request #22855 from nabinhait/gl-balance-fix-pre--v13 
fix: Ignore cancelled gl entries to get account balance
 2020-07-30 22:15:46 +05:30
Nabin Hait
38d5c2e04f fix: Ignore cancelled gl entries to get account balance 2020-07-30 20:53:07 +05:30
prssanna
60cdef7d57 fix: add range filters to oldest items chart 2020-07-29 18:06:54 +05:30
Nabin Hait
b7602d29f2 fix: POS patch fix (#22827) 2020-07-28 09:13:42 +05:30
Deepesh Garg
fa28e600b5 fix: Unable to submit backdated stock transactions for different items (#22822) 
* fix: Unable to submit backdated stock transactions for different items

* fix: Test cases

* fix: Test Cases

* fix: Test Cases

* fix: Test for stock account JV

* fix: Journal Entry Test

* fix: Delete unwanted code
 2020-07-28 08:49:21 +05:30
Nabin Hait
abc3227480 chore: Added change log 2020-07-24 21:02:15 +05:30
Mangesh-Khairnar
762f6297f6 fix(payment-request): do not set guest as administrator (#22804) 2020-07-24 18:05:13 +05:30