nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 23:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,874 Commits 459 Branches 1,746 Tags
939b0dd67d8619ca3dc4ae60f3f7a95565dd3f45
Commit Graph

38874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
71e7254184 test: creation of advance entry on invoice submission 2021-08-19 18:09:35 +05:30
Saqib Ansari
977b09b6ba feat: auto create advance entry on invoice submission 2021-08-19 18:09:35 +05:30
Saqib Ansari
cad08bc428 feat: toggle to enable common party accounting 2021-08-19 18:09:35 +05:30
Saqib Ansari
dddc29fdc1 feat: initialize party link for customer & suppliers 2021-08-19 18:09:35 +05:30
Afshan
c60d5523bc fix: add child item groups into the filters (#26997) 
* fix: add child item groups into the filters

* fix: appending values to proper variable

* fix: refactor the loop
 2021-08-19 16:23:18 +05:30
Noah Jacob
6541453c16 fix(ux): removed rate from grid view 2021-08-19 15:53:55 +05:30
Alan
09f34e558e fix: set production plan to completed even on over production (#27027) 2021-08-19 15:51:36 +05:30
Ankush Menat
993b0532f8 Merge pull request #27026 from ankush/eq_assign 
fix: equality check instead of assignment


[skip ci]
 2021-08-19 15:43:34 +05:30
Noah Jacob
cf8d2d97dd fix: Incorrect mandatory error message for warehouse 2021-08-19 15:43:20 +05:30
Ankush Menat
5b54d0436b chore: revert "chore: ignore whitespace fixes from git blame" 
This reverts commit 2c40b7c206.
 2021-08-19 14:18:39 +05:30
Ankush Menat
2c40b7c206 chore: ignore whitespace fixes from git blame 2021-08-19 14:12:09 +05:30
Ankush Menat
0ef5247e2f chore: whitespace cleanup from codebase (#27023) 
* chore: mass trailing whitespace and EOF fixes

* chore: update git-blame-ignore-revs
 2021-08-19 14:09:54 +05:30
Ankush Menat
49db369d21 chore: update git-blame-ignore-revs 2021-08-19 13:44:11 +05:30
Ankush Menat
4551d7d602 chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Deepesh Garg
869e36c33a Merge pull request #26737 from nemesis189/payment-reconc-party-validation-fix 
fix: Payment Reconciliation party validation issue
 2021-08-19 12:40:54 +05:30
Afshan
ecd6584c50 fix: assigning values to rows in sales register reports (#26546) 
* fix: assigning values to rows in sales register reports

* fix: check for is_internal_customer for unrealized_profit_loss_account
 2021-08-19 12:18:27 +05:30
Frappe PR Bot
44434ff70f fix: date_unchanged calculation in "Update Items" (#26992) (#27011) 
Branch corrected https://github.com/frappe/erpnext/pull/26058

  ERPNext generates "Cannot set quantity less than delivered quantity" error even the delivered qty is zero when user clicks "Update Items".
  "date_unchanged" variable gets false value because of new_date is string.

  "getdate(new_date)" corrects the date comparison.

  ![ERPNext_PR](https://user-images.githubusercontent.com/710051/121928377-c0263180-cd48-11eb-8cd9-eda7dace09d6.gif)

(cherry picked from commit d8a7abcd02)

Co-authored-by: Türker Tunalı <turkert@hotmail.com>
 2021-08-18 18:33:06 +05:30
Subin Tom
ef792971f3 fix: Add ignore user perms to set_target_warehouse field in sales invoice (#26987) 
* reverting ot v12.7.1

* fix: Ignore user permissions for set_target_warehouse in SI

Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-18 18:20:04 +05:30
Afshan
dc7280eef0 fix: filtering of items in Sales and Purchase Orders (#26936) 
* fix: filtering of items in Sales and Purchase Orders

* fix: slider

* fix: slider
 2021-08-18 17:44:40 +05:30
Afshan
87372c8ce4 Merge branch 'develop' into payment-reconc-party-validation-fix 2021-08-18 16:20:36 +05:30
Subin Tom
333e44eb47 fix: Dimension filter query fix to avoid including disabled dimensions (#26988) 
* reverting ot v12.7.1

* fix: Dimension filter query fix to not display disabled dimensions

Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-18 16:17:54 +05:30
Afshan
2416b3a1ee Merge branch 'develop' into payment-reconc-party-validation-fix 2021-08-18 16:03:47 +05:30
Marica
112fc888f1 fix: Return Qty in PR/DN for legacy data (#27001) 2021-08-18 15:29:48 +05:30
Saqib
cab49254fc fix: failing tests in issue doctype (#26998) 2021-08-18 14:53:32 +05:30
Saqib
fbc163cea6 feat: dynamic conditions for applying SLA (#26662) 2021-08-18 11:53:26 +05:30
Rucha Mahabal
15df0ad6a0 fix: undefined variable due to inconsistent porting of commits (#26994) 2021-08-18 11:23:44 +05:30
rohitwaghchaure
c068e8128c Merge pull request #26993 from rohitwaghchaure/fixed-sales-invoice-not-loading 
fix: sales invoice not loading issue
 2021-08-18 10:32:54 +05:30
Rohit Waghchaure
e0862de863 fix: sales invoice not loading issue 2021-08-18 10:27:58 +05:30
GangaManoj
4a77bd2304 fix: Syntax error 2021-08-18 00:33:43 +05:30
Afshan
5fec44446e fix: set account for change amount even if pos profile not found (#26986) 2021-08-17 20:06:19 +05:30
Deepesh Garg
93fc469ace Merge pull request #26973 from deepeshgarg007/payment_entry_unallocated_fix 
fix: Incorrect unallocated amount calculation in payment entry
 2021-08-17 19:13:58 +05:30
Mohammed Redah
a2966db1e5 fix: change print_format_type from Server to Jinja (#26374) 2021-08-17 18:45:55 +05:30
18alantom
cc177f3415 fix: wo tests, sider, account for pl in se validation 2021-08-17 16:49:00 +05:30
18alantom
2670adc0c0 test: check manufacture completion qty in se and wo 2021-08-17 16:40:44 +05:30
18alantom
ad73d3fbfb refactor: validation error message formatting 2021-08-17 16:40:16 +05:30
18alantom
23ef51a981 fix: sider 2021-08-17 16:40:05 +05:30
18alantom
47a4a3d888 refactor: polyfill ?? 2021-08-17 16:39:05 +05:30
Deepesh Garg
fd739749ba test: Add test case for payment entry 2021-08-17 16:38:25 +05:30
18alantom
55acb2e843 fix: sider 2021-08-17 16:37:34 +05:30
18alantom
cdf253aeb4 fix: add more validations, remove source wh req for pl item 2021-08-17 16:36:32 +05:30
18alantom
8ecb146231 test: add bom tests for process loss val, add se test for qty calc 2021-08-17 16:36:24 +05:30
18alantom
7433b97106 refactor: shift auto entry of is process loss check, update validations 2021-08-17 16:35:16 +05:30
18alantom
3df8d0cdf0 fix: add warehouse and unset is scrap for process loss items 2021-08-17 16:29:42 +05:30
18alantom
984c97ed4e feat: add is process loss autoset and validation 2021-08-17 16:28:54 +05:30
18alantom
b6dc0efa27 feat: add provision for process loss in manufac 2021-08-17 16:23:19 +05:30
Frappe PR Bot
a14d218834 fix: typo (#26967) (#26984) 
(cherry picked from commit ace8cf965d)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2021-08-17 16:14:37 +05:30
Ankush Menat
8bbec42fa0 fix: undo changes to patch (#26983) 
* fix: undo changes to patch

* ci: ignore empty body / head
 2021-08-17 15:14:13 +05:30
Saqib
3c525e1136 fix(sla): 'doctype' is not defined (#26982) 2021-08-17 14:22:47 +05:30
Sagar Vora
d932cba38a Merge pull request #26976 from resilient-tech/fix-incorrect-modified 
fix: Incorrect `modified` time in documents that inherit from `StatusUpdater`
 2021-08-17 13:17:09 +05:30
rohitwaghchaure
972da750bc Merge pull request #26977 from rohitwaghchaure/fixed-added-missing-fieldname 
chore: added missing field-name
 2021-08-17 13:10:29 +05:30