1843 Commits

Author	SHA1	Message	Date
Saqib Ansari	c6c7a8b5cf	fix: cost center & naming series	2021-08-25 20:17:04 +05:30
Saqib Ansari	7254368fc5	perf: reduce number of queries to get party link	2021-08-25 20:15:23 +05:30
Saqib Ansari	881301ca9b	Merge branch 'develop' of https://github.com/frappe/erpnext into common-party-acc	2021-08-25 20:02:27 +05:30
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
Saqib	1db812ab9f	Merge branch 'develop' into common-party-acc	2021-08-24 17:27:43 +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	5395f56c88	Merge branch 'develop' into common-party-acc	2021-08-20 20:42:50 +05:30
Saqib	c335962827	refactor!: drop e-invoicing integration from erpnext (#26940)	2021-08-20 11:10:46 +05:30
Saqib Ansari	977b09b6ba	feat: auto create advance entry on invoice submission	2021-08-19 18:09:35 +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
GangaManoj	cde0cc0678	fix: Fetch Payment Terms from Sales/Purchase Orders	2021-07-17 22:53:21 +05:30
Ganga Manoj	bfb7256143	Merge branch 'develop' into enable-discount-accounting	2021-07-17 20:01:09 +05:30
GangaManoj	228499369c	fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice	2021-07-17 19:49:16 +05:30
GangaManoj	fa4c03e7a1	fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries	2021-07-17 17:42:36 +05:30
GangaManoj	857501cbe1	fix: Make additional GL Entries for discount applied on taxes	2021-07-15 22:03:46 +05:30
Deepesh Garg	4478c547bf	fix: Unallocated amount for inclusive charges	2021-07-13 16:35:58 +05:30
Deepesh Garg	4a2e4748ac	fix: Unallocated amount for inclusive charges	2021-07-13 11:22:55 +05:30
GangaManoj	8f7b0a1753	fix: Create common function for discount accounting	2021-07-13 03:01:02 +05:30
Saqib	7fb64d1645	fix: exchange gain loss not set for advances linked with invoices (#26436)	2021-07-12 18:33:16 +05:30
Saqib	a20999cfbc	fix: exchange gain loss not set for advances linked with invoices (#25369)	2021-07-12 14:33:23 +05:30
marination	f67f13c384	chore: Test case for QI Rejection in Stock Entry ... - Use `get_single_value` instead of `get_doc` in validation - Test Case to check impact of stock settings on SE with rejected qi	2021-07-10 21:02:36 +05:30
Marica	9ba3fce4fd	fix: Consistent alert indicators	2021-07-10 21:02:28 +05:30
marination	654e9d85d1	fix: sider and semgrep	2021-07-10 21:02:19 +05:30
marination	9ac9a4ef21	feat: Optionally allow rejected quality inspection on submission	2021-07-10 21:02:03 +05:30
marination	c8a825c478	chore: Test case for QI Rejection in Stock Entry ... - Use `get_single_value` instead of `get_doc` in validation - Test Case to check impact of stock settings on SE with rejected qi	2021-07-10 18:26:36 +05:30
Marica	01be96adb2	Merge branch 'version-13-hotfix' into qi-rejection	2021-07-09 13:30:21 +05:30
Nabin Hait	fa006402b8	fix: merge conflict	2021-07-01 12:47:28 +05:30
Rohit Waghchaure	5d5dc56f94	fix: removed values out of sync validation from stock transactions	2021-06-26 22:29:19 +05:30
rohitwaghchaure	c1853ddf73	Merge pull request #26226 from rohitwaghchaure/fixed-removed-values-out-of-sync-on-stock-transaction-submission ... fix: removed values out of sync validation from stock transactions	2021-06-26 22:28:42 +05:30
Rohit Waghchaure	170f2ad056	fix: removed values out of sync validation from stock transactions	2021-06-26 21:42:47 +05:30
Ankush	532a224c44	fix: precision rate for packed items (#26046) (#26217) ... Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-06-25 13:28:01 +05:30
Noah Jacob	58daf5f916	fix: precision rate for packed items (#26046)	2021-06-25 12:52:17 +05:30
Ankush	21e44b19f0	perf: don't query unless required (bp #26175) ... re-order conditionals so queries are not evaluated unless required. # Conflicts: # erpnext/stock/doctype/batch/batch.py	2021-06-24 20:58:07 +05:30
Ankush	2ea750eadd	perf: don't query unless required (#26175) ... re-order conditionals so queries are not evaluated unless required.	2021-06-24 20:29:18 +05:30
Noah Jacob	ac0bc1f170	fix: precision rate for packed items (#26208)	2021-06-24 19:36:17 +05:30
Afshan	7fd44907ba	feat: fetching of qty as per received qty from PR to PI (#26184)	2021-06-24 14:26:36 +05:30
Rucha Mahabal	e81775d6f7	chore: remove unused import	2021-06-24 13:18:49 +05:30
Rucha Mahabal	357657fa73	chore: create a separate controller file for EmployeeBoardingController	2021-06-24 13:00:50 +05:30
Afshan	53fefd7513	feat: fetching of qty as per received qty from PR to PI (#25837)	2021-06-24 10:09:02 +05:30
Anurag Mishra	11c155e6ce	feat: Employee Grievance (#25705) (#26162) ... * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * fix: patch test and sider issue * fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes * feat: added subject field for more context - set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests * fix: sider issues * fix: removed suspension and paycut * fix:sider * fix: test * fix: test * fix: resolved Conflicts * fix: sider * fix: remove debugging print statements * fix: validation message * fix: unnecessary comma Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 12:13:32 +05:30
Anurag Mishra	fc98abece9	feat: Employee Grievance (#25705) ... * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * fix: patch test and sider issue * fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes * feat: added subject field for more context - set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests * fix: sider issues * fix: removed suspension and paycut * fix:sider * fix: test * fix: test * fix: resolved Conflicts * fix: sider * fix: remove debugging print statements * fix: validation message * fix: unnecessary comma Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 11:21:38 +05:30
Subin Tom	889140fd8c	fix: sql syntax error in get_project_name method (#26147)	2021-06-22 16:26:19 +05:30
Subin Tom	943b46a759	fix: sql syntax error in get_project_name method (#26145)	2021-06-22 14:26:36 +05:30
Marica	703c30f5f8	fix: Consistent alert indicators	2021-06-22 11:20:17 +05:30
marination	ea0dea46e0	fix: sider and semgrep	2021-06-21 16:51:12 +05:30
marination	49ec0e5ac3	feat: Optionally allow rejected quality inspection on submission	2021-06-21 16:18:35 +05:30
Rohit Waghchaure	01faa9ca11	fix: rate not able to change in purchase order	2021-06-21 14:56:38 +05:30
Rohit Waghchaure	582f187726	fix: rate not able to change in purchase order	2021-06-21 00:59:02 +05:30
Rohit Waghchaure	e5fb23972a	fix: available qty for consumption	2021-06-20 15:28:25 +05:30
Rohit Waghchaure	110e152fa3	fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice	2021-06-20 15:28:23 +05:30
Rohit Waghchaure	6bbc8ec3e8	fix: code cleanup and convert public method to private for subcontracting class	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	21b58ef045	fix: semgrep error	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	7b7ceaadd9	feat: subcontract code refactor and enhancement	2021-06-20 15:27:01 +05:30
Rohit Waghchaure	f5db407461	fix: available qty for consumption	2021-06-19 23:19:45 +05:30