nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 20:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,862 Commits 465 Branches 1,752 Tags
d27e663b2a5eda2f7f546c5e0b22d7faa08d66e9
Commit Graph

34862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankush Menat
3508ed176b test(selling): add test for cancelling sales order 
Add failing test to reproduce bug in cancelling sales order with advance
payments

Related issue: ISS-20-21-09586
 2021-02-18 21:29:03 +05:30
Nabin Hait
186a045e28 fix: update qty in future sle (#24649) 
* fix: update qty in future sle

* fix: validate cancellation due to ongoing reposting

* fix: process sle against current timestamp
 2021-02-18 21:28:28 +05:30
Nabin Hait
deddcc513d fix: stock and account balance syncing (#24644) 
* fix: stock and account balance syncing

* fix: stock and account balance syncing

* fix: stock and account balance syncing

* fix: minor fix
 2021-02-18 21:28:16 +05:30
Rohit Waghchaure
83f5468ca1 fix: patch 2021-02-18 21:28:03 +05:30
rohitwaghchaure
7797e9d3ac fix: added patch to fix incorrect stock qty and account value (#24628) 2021-02-18 21:27:01 +05:30
Nabin Hait
f2be0805f7 fix: formatting query args (#24627) 2021-02-18 21:25:59 +05:30
rohitwaghchaure
76f616565e fix: Consolidated Financial Statement report not works if child company account not present in parent company (#24580) 
Fixed conflicts
 2021-02-18 21:25:40 +05:30
Ankush Menat
4b2cbdc2dd fix: update total in words after updating items (#24602) 
* fix: Update total in words after Updating items

Update total in words after Updating items in sales/purchase orders.
Port of #24592

Closes ISS-20-21-09425

* test: Add test for total & words after update item

Add test for total & words after updating items in sales order.
 2021-02-18 21:25:00 +05:30
rohitwaghchaure
83792ec009 fix: reposting issue with same posting date and posting time (#24570) 
* fix: reposting issue with same posting date and posting time

* Update erpnext/stock/stock_ledger.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-18 21:24:48 +05:30
Nabin Hait
56e6ca6285 fix: couple of travis fixes (#24554) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-02-18 21:24:31 +05:30
Afshan
33f4419a78 fix: StopIteration error when e-invoice not enabled (#24548) 
* fix: StopIteration error when e-invoice not enabled

* chore: update message

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-02-18 21:23:38 +05:30
Deepesh Garg
d60a40ae82 fix: Add accounts user role permission for accounting dimension filter 2021-02-18 21:23:20 +05:30
Afshan
83768b68c1 fix: emp disappear (#24525) 
* fix: emp disappear

* fix: renamed set_totals_call to set_totals

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-18 21:20:14 +05:30
Saqib
90ff48baa3 refactor: POS Invoice merging and cancellation (#24351) 
* feat: pos invoice merging with background jobs

* fix: invoice threshold for queueing job

* refactor: cancellation flow of point of sale

* feat: tests for cancellation of pos closing

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-02-18 21:00:34 +05:30
Saqib
e965d0ff90 fix: discount amount calculation on net total (#24497) 2021-02-18 20:59:46 +05:30
Saqib
fd4bed1a38 fix(e-invoice): do not validate gstin for exports (#24561) 2021-02-18 20:59:26 +05:30
Saqib
ade96589b4 fix(e-invoice): skip e-invoice generation for non-taxable invoices (#24568) 2021-02-18 20:58:54 +05:30
Saqib
18c7c45cfe fix: NoneType has no len() (#24600) 2021-02-18 20:55:53 +05:30
Saqib
4fb547179d fix: customer_currency referenced before assignment (#24607) 2021-02-18 20:53:49 +05:30
Saqib
a439d19917 feat(pos): mpesa related fixes & additions (#24306) 
* fix: switching of mode of payments

* feat: transaction limit for mpesa integration

* feat: resend payment request if one fails

* feat: make new request only for failed ones

* fix: invalid amount for mpesa request

* fix: payment successful message not shown

* fix: url and business shortcode for live env

* fix: duplicate items validation for pos invoices

* fix: pos closing entry queued status

* fix: peroid end date for amended pos closing
 2021-02-18 20:53:26 +05:30
Saqib
57c2e07c45 fix: validate cancellation only if irn generated (#24608) 2021-02-18 20:45:27 +05:30
Anupam Kumar
4dad1f01ba fix: contact permmission issue (#24503) 2021-02-18 20:26:39 +05:30
Rucha Mahabal
73c2d23a9a feat: Department Wise Appointment Type charges (#24572) 
* feat: Appointment Type Service Items

Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>

* fix: set practitioner service item charges mandatory on item selection

Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>

* feat: use charges from appointment type during billing

* feat: handle appointment charges priority for invoice automation

* test: patient appointment auto invoicing scenarios

* fix: sider

* fix: minor fixes

Co-authored-by: muhammad <muhammadmp@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-18 20:22:41 +05:30
Anupam Kumar
6485eeb302 fix: portal permission issue (#24577) 2021-02-18 20:21:39 +05:30
Saqib Ansari
a4fabefee7 fix: sider 2021-02-17 13:06:31 +05:30
Saqib Ansari
5bb15b08d9 fix: tcs amount calculation 2021-02-17 13:06:11 +05:30
Saqib Ansari
f045eb3135 fix: tcs chargable amount 2021-02-17 13:05:54 +05:30
Saqib Ansari
62890adef4 feat: charging tcs on sales invoice 2021-02-17 13:05:24 +05:30
Saqib Ansari
f000b3b362 fix: test 2021-02-17 13:04:27 +05:30
Saqib Ansari
1a8df8f112 feat: pan and tax withholding category fields for customer 2021-02-17 13:04:27 +05:30
Saqib Ansari
760e6cebd4 refactor: tax withholding category against customer 2021-02-17 13:04:27 +05:30
Saurabh
df589594cd Merge branch 'version-13-beta-pre-release' into version-13-beta v13.0.0-beta.11 2021-02-02 20:58:26 +05:30
Saurabh
7645e5319d bumped to version 13.0.0-beta.11 2021-02-02 21:15:21 +05:50
Afshan
c0f8f32801 fix: fetch query for employee (#24529) 2021-02-02 20:27:23 +05:30
Saurabh
17433d2c90 fix: version number 2021-02-02 17:40:11 +05:30
Nabin Hait
243d59b0c3 Reposting logic fixes (#24520) 
* fix: Dependant sle logic fixes

* fix: negative qty validation

* fix: Travis fixes

* fix: test fix
 2021-02-02 16:55:13 +05:30
Afshan
10b00f9d0d fix: separation of salary creation from payroll (#24528) 
* fix: separation of salary creation from payroll

* fix: removed unnecessary veriable

* fix: check existing sal slips

* fix: existing checks

* style: refactoring query
 2021-02-02 16:24:01 +05:30
Afshan
8676089794 fix: emp disappear (#24524) 
* fix: emp disappear

* fix: renamed set_totals_call to set_totals

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-02 11:02:22 +05:30
Nabin Hait
bf97eb2d3b core: Added change log (#24526) 2021-02-02 10:57:55 +05:30
rohitwaghchaure
6d462e058b Merge pull request #24521 from rohitwaghchaure/fixed-pricing-rule-travis-issues 
fix: test cases for pricing rule
 2021-02-01 23:00:24 +05:30
Rohit Waghchaure
5c28416daa fix: test cases for pricing rule 2021-02-01 22:58:22 +05:30
Marica
003ae90e12 fix: Numeric/Non-numeric QI UX (#24517) 
* chore: Show 1 field each of both types of Insoections in grid view

* fix: Make QI check Numeric by default and make checkbox "Numeric"

- Reducing cognitive load
 2021-02-01 20:38:32 +05:30
rohitwaghchaure
68edf749ec fix: multiple pricing rule issue (#24515) 2021-02-01 20:22:02 +05:30
Saurabh
081f506992 fix: consider select perm while setting party details (#24514) 2021-02-01 20:18:44 +05:30
Marica
2fa840e5d4 chore: Use sql to set naming series in older projects (#24513) 
* chore: Use sql to set naming series in older projects

* fix: Remove unncessary db.commit()
 2021-02-01 20:07:00 +05:30
Deepesh Garg
7835ec6a6c fix: Add test case 2021-02-01 12:15:39 +05:30
Deepesh Garg
5c7333bd3a feat: Normal rounding for GST Taxes 2021-02-01 12:15:28 +05:30
Deepesh Garg
a67daefb41 Merge pull request #24496 from frappe/template-task-parent-child-deadlock 
fix: Template task parent child deadlock
 2021-01-30 18:50:24 +05:30
pateljannat
fd91973ac1 fix: template task parent child deadlock 2021-01-29 13:18:39 +05:30
pateljannat
290f02acdb Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into version-13-beta-pre-release 2021-01-29 12:37:49 +05:30