Saqib
62114b226f
feat: unreconcile on cancellation of bank transaction ( #27109 )
2021-08-25 16:25:51 +05:30
Pruthvi Patel
7c957d72b3
perf: reduce number of queries to validate selling price ( #26225 )
...
* perf: reduce number of queries to validate selling price
* fix: improved flow and formatting
* fix: improve condition and use of `as_dict`
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-08-24 21:24:25 +05:30
Nabin Hait
b99a8cb96e
Merge pull request #27087 from deepeshgarg007/validate_due_date_fix
...
fix: Ignore due date validations if payment terms are copied from orders/receipts
2021-08-24 21:10:44 +05:30
Subin Tom
2e5525aba9
fix: Correct price list rate value in return si ( #27097 )
2021-08-24 17:24:41 +05:30
Ankush Menat
6de7b8ea93
fix: discard empty rows from update items ( #27021 )
2021-08-24 12:18:40 +05:30
Deepesh Garg
bd709f8ab0
fix: Ignore due date validations if payment terms are copied from orders/receipts
2021-08-23 19:05:52 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue ( #26872 )
2021-08-23 11:05:07 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext ( #26940 )
2021-08-20 11:10:46 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +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.
(cherry picked from commit d8a7abcd02f674bf6c4270a817ae9762a0b57140)
Co-authored-by: Türker Tunalı <turkert@hotmail.com>
2021-08-18 18:33:06 +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
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
Deepesh Garg
5122948450
Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting
2021-08-13 16:00:20 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms
2021-08-11 19:31:30 +05:30
Deepesh Garg
bff3b0962a
fix: Override template only if setting is enabled
2021-08-10 23:58:27 +05:30
Afshan
b614834efe
fix: unseting of payment if no pos profile found ( #26884 )
2021-08-10 21:33:58 +05:30
Anuja Pawar
0e337be065
fix: cost center & account validation in Sales/Purchase Taxes and Charges ( #25929 )
2021-08-10 17:26:35 +05:30
Marica
f6ea00e029
Merge branch 'develop' into serial-no-space
2021-08-10 13:17:08 +05:30
Afshan
f5b5be9644
Merge branch 'develop' into po-payment-terms
2021-08-10 09:32:08 +05:30
Deepesh Garg
bcf56e64ba
fix: Ignore default payment term templates when coping payment terms from orders
2021-08-09 18:53:14 +05:30
GangaManoj
5b33e75c65
fix: Fetch discount details from Payment Terms only if Discount Type = Percentage
2021-08-09 18:53:14 +05:30
GangaManoj
0588382c38
fix: Stop fetching amount while fetching Payment Terms
2021-08-09 18:53:14 +05:30
GangaManoj
54d1336d11
fix: Condition for fetching Payment Terms from Sales/Purchase Orders
2021-08-09 18:53:13 +05:30
Afshan
b3bbebd27c
fix: add parameter for db insert while adding item tax ( #26855 )
2021-08-09 14:39:32 +05:30
Marica
4c929b6994
Merge branch 'develop' into serial-no-space
2021-08-09 10:50:09 +05:30
Saqib
668f442139
Merge branch 'develop' into po-payment-terms
2021-08-06 13:42:10 +05:30
Deepesh Garg
ad7bb316c1
fix: GL Entries for discount amount with item qty greater than 1
2021-08-02 12:41:06 +05:30
Deepesh Garg
92f7a5a390
fix: GL For taxes if discount applied on Grand Total
2021-08-02 12:39:43 +05:30
Rohit Waghchaure
343143037c
fix: conflicts
2021-08-01 14:45:24 +05:30
Rohit Waghchaure
2a14f255cf
fix: COGS account in purchase receipt
2021-07-31 11:14:14 +05:30
Marica
7cbd755951
Merge branch 'develop' into serial-no-space
2021-07-30 14:09:19 +05:30
Saqib
d4ae1febe3
fix: gl entries for exchange gain loss ( #26734 )
2021-07-30 11:21:49 +05:30
GangaManoj
c7c90244fe
fix: Check if Purchase Order has Payment Terms Template
2021-07-29 19:19:46 +05:30
Saqib
bbb96899a5
Merge branch 'develop' into po-payment-terms
2021-07-29 17:23:09 +05:30
Nabin Hait
ebbabf11e9
Merge pull request #25944 from ruchamahabal/fix-employee-onboarding-status
...
fix: boarding status in Employee Onboarding and Separation
2021-07-29 15:24:54 +05:30
Ankush
f8343890b9
feat: don't recompute taxes ( #26695 )
2021-07-29 11:09:34 +05:30
Deepesh Garg
e79bfbb104
Merge pull request #26665 from ankush/dont_recompute_taxes
...
feat: don't recompute taxes
2021-07-28 19:36:27 +05:30
Ankush Menat
dfdd1c6e02
feat: don't recompute taxes
2021-07-27 14:49:44 +05:30
Rohit Waghchaure
6b482ebb0f
fix: serial no and batch validation
2021-07-27 13:42:37 +05:30
Subin Tom
ed68f11a46
fix: Supplier invoice importer fix pre release ( #26636 )
...
* fix: Supplier Invoice Importer fix
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
2021-07-26 16:47:36 +05:30
Subin Tom
fac88a3329
fix: Supplier Invoice Importer fix
2021-07-23 21:23:48 +05:30
Rohit Waghchaure
45d506c489
fix: serial no and batch validation
2021-07-23 16:40:45 +05:30
marination
eecfc4c0ae
fix: Clean Serial No input on Server Side
2021-07-22 13:23:54 +05:30
GangaManoj
4323f4bcac
fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()
2021-07-22 05:57:42 +05:30
Rohit Waghchaure
c14aa45720
fix: incorrect valuation rate calculation in gross profit report
2021-07-20 18:19:15 +05:30
Rucha Mahabal
99de84ebe1
Merge branch 'develop' into fix-employee-onboarding-status
2021-07-20 12:22:10 +05:30
GangaManoj
4105e27138
fix: Create GL Entries for Additional Discount Account
2021-07-20 03:46:02 +05:30
Ganga Manoj
0ea2934cd5
fix: GL Entry creation
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-19 23:44:55 +05:30
Ganga Manoj
63b7ecd0fe
fix: Use the item's project instead of the invoice's
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-19 23:44:21 +05:30
Ganga Manoj
980798c6fd
fix: Use the item's cost centre instead of the Invoice's
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-19 23:43:36 +05:30
