2074 Commits

Author	SHA1	Message	Date
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
Rohit Waghchaure	5cc3f14506	fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice	2021-06-19 23:16:23 +05:30
Rohit Waghchaure	ddb0ec261a	fix: code cleanup and convert public method to private for subcontracting class	2021-06-19 23:16:23 +05:30
Rohit Waghchaure	9a2db0b5b1	fix: semgrep error	2021-06-19 23:16:22 +05:30
Rohit Waghchaure	a94b89727c	feat: subcontract code refactor and enhancement	2021-06-19 23:16:22 +05:30
rohitwaghchaure	1c846c5be7	Merge pull request #26114 from rohitwaghchaure/fixed-stock-entry-submission-performance-v13-hotfix ... fix: time out while submitting the stock transactions with more than 50 Items	2021-06-19 18:51:47 +05:30
Rohit Waghchaure	4d81d45a0e	fix: time out while submitting the stock transactions with more than 50 items	2021-06-19 16:15:08 +05:30
Rohit Waghchaure	8520edc952	fix: time out while submitting the stock transactions with more than 50 items	2021-06-19 00:55:35 +05:30
Ankush	584fe32900	fix: escaped warehouse value for sql query (bp #26049) ... Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-06-18 14:47:30 +05:30
Nabin Hait	0950481253	fix: merge conflict	2021-06-15 20:18:06 +05:30
Noah Jacob	b5a1491176	fix: escaped warehouse value for sql query (#26049)	2021-06-15 12:44:04 +05:30
Deepesh Garg	bbf6121bb5	fix: Revert unintended changes	2021-06-14 20:09:31 +05:30
Deepesh Garg	5ef9a62917	fix: Add separate function to validate payment entry taxes	2021-06-14 20:09:17 +05:30
Deepesh Garg	302855e160	fix: Auto tax calculations in Payment Entry	2021-06-14 20:09:10 +05:30
Deepesh Garg	4cd0f6ce23	fix: Revert unintended changes	2021-06-14 20:01:04 +05:30
Deepesh Garg	8718013c96	fix: Add separate function to validate payment entry taxes	2021-06-14 14:34:44 +05:30
Deepesh Garg	580346360f	fix: Auto tax calculations in Payment Entry	2021-06-14 11:16:39 +05:30
Ankush Menat	9891780f5a	perf(minor): remove unnecessary comprehensions (port #25645)	2021-06-11 18:40:22 +05:30
Ankush Menat	a9c84f749a	perf(minor): remove unnecessary comprehensions (#25645)	2021-06-11 16:00:48 +05:30
Rohit Waghchaure	f310501d7d	fix: filter type for item query	2021-06-11 10:53:07 +05:30
Nabin Hait	d17217c4e2	Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13 ... feat: Tax deduction against advance payments	2021-06-10 20:25:30 +05:30
Deepesh Garg	5434dd048b	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates	2021-06-10 18:56:39 +05:30
Deepesh Garg	911818a9e2	fix: Add multiple fixes	2021-06-09 22:55:10 +05:30
Deepesh Garg	6f2dacc60c	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13	2021-06-06 19:31:50 +05:30
Deepesh Garg	18be767f75	fix: Remove invalid test	2021-06-06 13:25:34 +05:30
Deepesh Garg	8a7e283926	feat: Item Taxes based on net rate	2021-06-04 22:53:26 +05:30
rohitwaghchaure	c59371ab0c	fix: filter type for item query (#25942)	2021-06-03 20:02:58 +05:30
Marica	e7d9200e0f	Merge pull request #25221 from Alchez/dev-quality-inspection-accounts ... feat: create Quality Inspections from account and stock documents	2021-06-03 01:39:05 +05:30
Nabin Hait	811f607c85	Merge branch 'version-13' into develop	2021-06-02 22:14:20 +05:30
Nabin Hait	88d94dbf0a	Merge pull request #25915 from rohitwaghchaure/fixed-work-order-no-able-to-select-item ... fix: not able to select the item code in work order	2021-06-02 19:00:34 +05:30
Rohan Bansal	a06ec03efc	test: add test for new QI function	2021-06-02 14:55:31 +05:30
Rohit Waghchaure	5dd92934ae	fix: not able to select the item code in work order	2021-06-02 14:27:24 +05:30
Rohan Bansal	11aff80dea	Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts	2021-06-02 14:22:32 +05:30
Rohit Waghchaure	721b4130db	fix: not able to select the item code in work order	2021-06-02 14:13:09 +05:30
Nabin Hait	a3d1b6973a	fix: merge conflict	2021-05-31 11:21:33 +05:30
Suraj Shetty	c26d41acf9	chore: Remove unnecessary print statements	2021-05-28 09:09:36 +05:30
Rohan Bansal	1e3a3b27c6	style: semgrep issues	2021-05-26 15:18:10 +05:30
Rohan Bansal	1cdf5a0dba	fix: add requested changes	2021-05-26 14:42:15 +05:30
Rohan Bansal	c5b074269a	Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts	2021-05-26 14:32:14 +05:30
Ganga Manoj	18cfced032	fix(Material Request): Make status on list and form view the same (#24856)	2021-05-25 19:54:07 +05:30
Deepesh Garg	84f270e732	fix: Remove unwanted commits	2021-05-25 18:03:42 +05:30
Deepesh Garg	c9da1fc568	chore: Test case for adance TDS allocation	2021-05-25 17:37:17 +05:30
Deepesh Garg	a23aaf43f4	fix: Allocate advance taxes only for payment entry	2021-05-25 17:36:06 +05:30
Deepesh Garg	d18dde7757	fix: Add tds in PO and code cleanup	2021-05-25 17:32:28 +05:30
Deepesh Garg	c26de28613	fix: TDS against Purhase Orders	2021-05-25 17:25:13 +05:30
Deepesh Garg	61c5e478af	feat: Tax deduction against advance payments	2021-05-25 17:20:52 +05:30
Ankush Menat	7b4a38c71e	chore: remove print from account controller (#25807) ... This is polluting test output and it's not useful for debugging without context.	2021-05-23 18:49:26 +05:30
rohitwaghchaure	651e934415	Merge pull request #25683 from noahjacob/supplier_item_group_link ... feat: linking supplier with an item group for filtering items	2021-05-21 12:07:53 +05:30
noahjacob	8e34c49ac9	refactor: using get_all instead of get_list	2021-05-19 13:51:36 +05:30
noahjacob	ca2fb47d44	feat: updates item_code filters if item_group is linked to supplier	2021-05-18 15:01:05 +05:30
Nabin Hait	8b2fef11b1	fix: merge conflict	2021-05-17 11:37:14 +05:30
rohitwaghchaure	2aa401826e	fix: validation message of quality inspection in purchase receipt (#25666)	2021-05-14 12:34:50 +05:30
rohitwaghchaure	e9f6c8cdb1	fix: validation message of quality inspection in purchase receipt (#25667)	2021-05-14 12:34:13 +05:30
rohitwaghchaure	958c96ee3f	Merge pull request #25660 from deepeshgarg007/promotional_item_cost_center ... fix: Breaking cost center validation	2021-05-11 18:08:17 +05:30
Deepesh Garg	a60c3081cf	fix: Breaking cost center validation	2021-05-11 16:38:33 +05:30
Ganga Manoj	f2eb8dd1d5	feat: Transaction Deletion Record (#25354) ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-05-10 14:02:58 +05:30
Suraj Shetty	80aa8a3149	Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing	2021-05-08 11:28:27 +05:30
Rucha Mahabal	062d30146f	fix: Include search fields in Project Link field query (#25505) ... * fix: Include search fields in Project Link field query * fix: add project_name to Project search fields	2021-05-07 13:31:14 +05:30
Suraj Shetty	c702408f99	chore: Remove unnecessary print statements	2021-05-06 18:37:45 +05:30
Saqib	92cefd5655	feat(pos): ability to retry on pos closing failure (#25604) ... * feat(pos): ability to retry on pos closing failure * fix: sider issues * fix: sider issues * fix: mark all queued closing entry as failed * feat: add headline message	2021-05-06 17:03:16 +05:30
Saqib	900a8fb21a	feat(pos): ability to retry on pos closing failure (#25595) ... * feat(pos): ability to retry on pos closing failure * fix: sider issues * fix: sider issues * fix: mark all queued closing entry as failed * feat: add headline message	2021-05-06 17:02:47 +05:30
18alantom	2a20a03c28	fix: check for None in item.schedule_date before setting	2021-05-05 11:59:15 +05:30
Saqib	2bde1baa38	fix: remove print statement	2021-04-29 18:12:42 +05:30
Saqib Ansari	3a5ecb7587	fix: test	2021-04-29 18:12:32 +05:30
Saqib Ansari	a91eebf6aa	feat: base payment amount in payment schedule	2021-04-29 18:12:23 +05:30
Saqib	83e3820575	fix: remove print statement	2021-04-29 12:21:56 +05:30
Saqib Ansari	da5b55c4f5	fix: test	2021-04-28 14:55:33 +05:30
Saqib Ansari	3f7ec95af8	Merge branch 'develop' of https://github.com/frappe/erpnext into payment-term-amount-display-currency-fix	2021-04-28 14:45:27 +05:30
Ankush Menat	9178d95cca	fix: can not create item variants (#25433) ... * fix: item_code assigned to function returning None * fix: ignore has_variants and attributes in variant * fix: patch to remove has_variants and attributes * chore: fix whitespace in translation	2021-04-26 15:37:17 +05:30
Deepesh Garg	4c8d15b487	fix: Incorrect GL Entry validation (#25474) ... * fix: Incorrect GL Entry validation * fix: Add validation for party accounts * fix: Scrub labels * fix: Translation	2021-04-26 15:24:34 +05:30
Saqib Ansari	d552fe6778	feat: base payment amount in payment schedule	2021-04-23 14:46:52 +05:30
Deepesh Garg	cb718fce88	feat: Role to allow over billing, delivery, receipt (#24854) ... * feat: Role to allow over billing, delivery, receipt * fix: Typo	2021-04-19 13:25:15 +05:30
Ankush Menat	7eac4a250d	fix: functions using mutable defaults (#25370)	2021-04-19 10:33:39 +05:30
Ankush Menat	ad6a2657ae	chore: minor translation fixes	2021-04-17 16:56:09 +05:30
Ankush Menat	dedf2c1b61	fix: remove duplicate keys from dictionaries	2021-04-17 16:56:08 +05:30
Marica	4e25aa77dd	Merge branch 'develop' into dev-quality-inspection-accounts	2021-04-14 19:06:14 +05:30
rohitwaghchaure	ac6facda3d	Merge pull request #25186 from rohitwaghchaure/fixed-incorrect-batch-selected-in-purchase-rceipt-develop ... fix: incorrect batch picked in subcontracted purchase receipt	2021-04-14 14:35:12 +05:30
Rohan Bansal	7f8b95efe8	fix: move QI logic to stock module	2021-04-14 14:15:45 +05:30
Nabin Hait	2535fe9b1e	fix: Resolved merge conflict	2021-04-14 13:09:50 +05:30
Nabin Hait	f7441c4c0a	Merge branch 'develop' into fixed-incorrect-batch-selected-in-purchase-rceipt-develop	2021-04-14 11:23:00 +05:30
Deepesh Garg	e2dc102bc6	fix: Zero amount completed delivery notes being shown in Sales Invocie get items (#25317)	2021-04-14 11:21:11 +05:30
Deepesh Garg	b67058869a	fix: Round off final tax amount instead of current tax amount (#25188) ... * fix: Round off final tax amount instead of current tax amount * fix: Syntax error * fix: Indentation * fix: Round Off taxes order execution Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-14 11:20:27 +05:30
rohitwaghchaure	ce6c3b5b74	fix: incorrect incoming rate for the sales return (#25306)	2021-04-13 20:55:52 +05:30
Nabin Hait	10c61376e3	fix: Backport missing commits to develop branch (#25305)	2021-04-13 15:46:01 +05:30
Deepesh Garg	5f3d7f547c	fix: Item wise tax rate for consolidated POS invoice (#25029) ... * fix: Item wise tax rate for consolidated POS invoice * fix: Do not alter item wise taxes for consolidated invoices * fix: Add test case * fix: Update * fix: Set opening stock for test item * fix: Add valuation rate for opening stock	2021-04-12 10:56:47 +05:30
Rohit Waghchaure	1358443cdb	fix: patch	2021-04-10 10:42:08 +05:30
Deepesh Garg	df9388aa8e	Merge pull request #25086 from deepeshgarg007/advance_amount_precision ... fix: Precision issues while allocating advance amount	2021-04-09 21:39:02 +05:30
Rohan Bansal	a93b514b2f	feat: create Quality Inspections from account and stock documents	2021-04-06 17:20:16 +05:30
Rohit Waghchaure	8b829711fc	fix: incorrect batch picked in subcontracted purchase receipt	2021-04-04 12:43:38 +05:30
Walstan Baptista	37b826b988	fix: correct calculation for discount amount when margin is set (#25179)	2021-04-03 19:48:46 +05:30
Nabin Hait	11eb30d082	fix: merge conflict	2021-04-01 15:03:11 +05:30
Marica	8617c0ab99	Merge pull request #25070 from marination/update-items-bin ... fix: Update Bin via Update Item on Purchase/Sales Order	2021-03-31 22:21:41 +05:30
Anupam Kumar	526497bc43	Merge pull request #25104 from anupamvs/purchase-side-margin-beta ... feat: price margin in buying	2021-03-31 18:38:58 +05:30
Anupam	ad520e08ba	feat: price margin in buying	2021-03-31 18:31:12 +05:30
Marica	1b8d36634f	Merge branch 'develop' into patch-7	2021-03-31 16:04:24 +05:30
Saqib	fb4051bddd	feat: discount configuration on early payments (#25089) ... * feat: discount configuration on early payments Co-authored-by: Nabin Hait <nabinhait@gmail.com> * fix: remove duplicate patch call Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-31 15:52:51 +05:30
Saqib	0586b7db79	feat: discount configuration on early payments (#24586) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-31 15:03:53 +05:30
Deepesh Garg	f54d596ae1	fix: Precision issues while allocating advance amoount	2021-03-31 14:06:02 +05:30
Sagar Vora	e50324aed7	perf: reduce number of queries for checking if future SL entry exists (#25064)	2021-03-31 12:44:03 +05:30
Walstan Baptista	d6360755b9	chore: frappe.whitelist for doc methods (#25068) ... * chore: frappe.whitelist for doc methods * fix: incorrect spelling * fix: sider issue Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-31 12:30:32 +05:30
marination	a5de6c779b	fix: Cleaned up and fixed validation and bin updation on deletion ... - Created separate smaller functions for validation and bin updation of deleted row - Made sure previous doc (linked doc) was also updated after deletion of row - Tests to check bin updation on add/update/delete - Made reserved qty for subcontrating read only in bin	2021-03-31 02:03:26 +05:30
Andy Zhu	ba3578929e	Update accounts_controller.py ... Updating Bin quantity based on doctype to optimize running efficiency.	2021-03-31 02:03:16 +05:30
Andy Zhu	c0ba6eafd5	fix: Update Items on Purchase Order ... 1. set warehouse using `get_item_warehouse` 2. update "reserved_qty" for sales order	2021-03-31 02:03:10 +05:30
Andy Zhu	a21e347bf1	fix: Update Items on Purchase Order ... If user add rows or remove rows to update items on purchase order, the quantity in bin won't get updated. This fix is not mature yet but to give an tempopary solution for fixing this issue.	2021-03-31 02:03:02 +05:30
marination	0673f558c1	fix: Cleaned up and fixed validation and bin updation on deletion ... - Created separate smaller functions for validation and bin updation of deleted row - Made sure previous doc (linked doc) was also updated after deletion of row - Tests to check bin updation on add/update/delete - Made reserved qty for subcontrating read only in bin	2021-03-31 01:42:18 +05:30
Marica	c5739957de	Merge branch 'develop' into patch-7	2021-03-30 18:07:32 +05:30
Deepesh Garg	6be78db62c	Merge pull request #25052 from deepeshgarg007/gst_rounding_v13_beta ... feat: Normal rounding for GST Taxes	2021-03-30 17:01:45 +05:30
Anupam Kumar	9be11afbde	feat: price margin in buying (#25058)	2021-03-30 12:09:46 +05:30
Deepesh Garg	c2548ddc75	feat: Normal rounding for GST Taxes	2021-03-29 16:42:47 +05:30
rohitwaghchaure	b38ea0cc8b	fix: patch (#25014) ... * fix: patch * fix: pricing_rule test cases	2021-03-28 15:51:32 +05:30
Sagar Vora	868c0bf45b	perf: reduce no of queries for checking if future sl entry exists (#24881)	2021-03-27 16:10:20 +05:30
rohitwaghchaure	d5759bab11	Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule ... feat: recursive pricing rule	2021-03-26 19:10:10 +05:30
Rohit Waghchaure	256b9c7bf9	fix: total weight not set for free items	2021-03-26 19:05:46 +05:30
Rohit Waghchaure	cd8422a840	feat: recursive product discount	2021-03-26 19:05:43 +05:30
Deepesh Garg	1a6e6320cf	Revert "fix: validating party currency with doc currency (#24318)" ... This reverts commit 02142c41bb.	2021-03-24 21:26:04 +05:30
Afshan	02142c41bb	fix: validating party currency with doc currency (#24318) ... * fix: validating supplier currency * fix: compare current currency with company currency as well. * fix: replaced or with add in condition * fix: conditioning to get proper payment terms values Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-03-23 20:53:56 +05:30
Rohit Waghchaure	bde159a77d	fix: total weight not set for free items	2021-03-22 23:36:48 +05:30
Deepesh Garg	b75cbeee4d	fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-18 21:20:44 +05:30
Deepesh Garg	9b0a9cc2c0	Merge pull request #24912 from deepeshgarg007/multi_currency_lcv_issues ... fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-18 21:20:06 +05:30
Sagar Vora	f4a6c7823a	test: create new item instead of using _Test Item to prevent error (#24915)	2021-03-17 19:57:53 +05:30
Rohit Waghchaure	ff70e61d7a	feat: recursive product discount	2021-03-17 14:30:34 +05:30
Deepesh Garg	22f5ff8492	fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-17 10:56:52 +05:30
Anupam Kumar	ed42afc5e8	feat: price margin in buying (#24685)	2021-03-15 11:11:28 +05:30
Nabin Hait	fe3529b194	fix: merge conflict	2021-03-11 16:45:41 +05:30
Anupam Kumar	77eaf2939a	fix: rate of stock uom division by zero error (#24829)	2021-03-10 12:04:54 +05:30
Afshan	0623a34210	fix: added supplier warehouse field back again (#24827)	2021-03-10 09:46:38 +05:30
Afshan	27bcb2a064	fix: renamed "supplier_warehouse" to "set_from_warehouse" (#24816) ... * fix: reverting and adding new field for supplier warehouse	2021-03-09 22:25:48 +05:30
Anuja Pawar	8755339cba	fix: to update sales person's incentives on save (#24179)	2021-03-01 10:44:13 +05:30
Nabin Hait	d46b23699c	fix: optimize reposting of gle and sle (#24702) ... * fix(india): escape for special characters in JSON (#24695) JSON does not accept special whitespace characters like tab, carriage return, line feed Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf Related issue: ISS-20-21-09811 * fix: Accounting Dimension creation background job timeout * fix(regional): vehicle no is mandatory for ewaybill generation (#24679) * fix: vehicle no required for e-invoice * fix: ewaybill generation dialog condition * fix: excluding unidentified accounts from gstr-1 * fix: optimize reposting of sle and gle (#24694) * fix: optimize update_gl_entries_after method * fix: Optimized reposting patch * fix: accounting dimensions * added reload_doc in patch * Update item_reposting_for_incorrect_sl_and_gl.py Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> * fix: Replaced spaces with tabs * fix: merge conflict * fix: test cases Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: pateljannat <pateljannat2308@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2021-02-23 16:38:52 +05:30
Nabin Hait	19f8fa59d3	fix: optimize reposting of sle and gle (#24694) ... * fix: optimize update_gl_entries_after method * fix: Optimized reposting patch * fix: accounting dimensions * added reload_doc in patch * Update item_reposting_for_incorrect_sl_and_gl.py Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2021-02-22 22:27:22 +05:30
Deepesh Garg	6a5ef261f2	feat: Normal rounding for GST Taxes (#24488) ... * feat: Normal rounding for GST Taxes * fix: Add test case Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-19 14:30:23 +05:30
Anupam Kumar	b1997da488	feat: capture Rate of stock UOM in purchase (#24315) ... * feat: capture Rate of stock UOM in purchase * fix: review changes * added server side code * added stock uom rate in sales transactions * fix: review changes * fix: resolving conflicts * adding patch * fix: removing patch	2021-02-18 21:32:05 +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
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
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	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
Rucha Mahabal	e7bf87cc84	fix: POS return for Serialized Items (#24292) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-02-18 16:04:35 +05:30
Marica	7de7bb5202	Merge branch 'develop' into item_group_on_update_items	2021-02-16 23:06:20 +05:30
Nabin Hait	9b178bcd10	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-16 14:57:00 +05:30
Nabin Hait	1e6cce3593	Merge branch 'develop' into item_group_on_update_items	2021-02-11 21:59:38 +05:30
Jannat Patel	bb0d8f8038	Update accounts_controller.py	2021-02-11 20:59:28 +05:30
Anupam Kumar	7e1dcf911d	feat: capture Rate of stock UOM in purchase (#24315) ... * feat: capture Rate of stock UOM in purchase * fix: review changes * added server side code * added stock uom rate in sales transactions * fix: review changes * fix: resolving conflicts * adding patch * fix: removing patch	2021-02-11 20:19:30 +05:30
Jannat Patel	6756d3b561	Merge branch 'develop' into item_group_on_update_items	2021-02-11 16:29:34 +05:30
Saqib	0681a480c2	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-11 14:06:15 +05:30
Nabin Hait	aa235b36e0	Update erpnext/controllers/accounts_controller.py ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-02-11 13:26:53 +05:30
Jannat Patel	30c8873f24	fix: validation for disabled warehouse (#24539) ... * fix: validation for disabled warehouse * fix: better function name * fix: validation in stock ledger entry	2021-02-11 11:46:48 +05:30
Ankush Menat	df6e20887d	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-11 11:04:39 +05:30
pateljannat	637ddff6e9	fix: code cleanup	2021-02-09 16:17:30 +05:30
pateljannat	0701f08ab6	fix: item_group on update items	2021-02-03 11:53:14 +05:30
Saurabh	df589594cd	Merge branch 'version-13-beta-pre-release' into version-13-beta	2021-02-02 20:58:26 +05:30
Suraj Shetty	54a253616a	Merge pull request #24508 from frappe/rebrand-ui	2021-02-02 09:07:35 +05:30
Rohit Waghchaure	d4d639c7ed	fix: test cases for pricing rule	2021-02-01 23:01:18 +05:30
Rohit Waghchaure	5c28416daa	fix: test cases for pricing rule	2021-02-01 22:58:22 +05:30
rohitwaghchaure	bf7317d4e2	fix: multiple pricing rule issue (#24509)	2021-02-01 20:22:14 +05:30
rohitwaghchaure	68edf749ec	fix: multiple pricing rule issue (#24515)	2021-02-01 20:22:02 +05:30
Saqib Ansari	cee3670167	chore: clean up sales invoice form	2021-02-01 15:45:26 +05:30
Suraj Shetty	0a8939e1c1	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-29 08:56:22 +05:30
Saqib	675a8330a4	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-01-28 18:42:43 +05:30
Saqib	ac9e6ff704	fix(pos): multiple pos fixes and additions (#24227) ... * fix: make custom fields in pos invoice similar to sales invoice * feat: allow/disallow rate & discount change * fix: any pos profile can be selected while creating pos opening * fix: cannot add item to cart * fix: validate phone payment only if payment request exists * fix: replace pos payment method patch * chore: rearrange item & customer group filter * fix: allow/disallow invoice level discount * fix: updating qty of item with uom having space char * fix: move configuration checbox to config section * fix: invalid item rate trigger * fix: cannot remove item from draft invoices * fix: customer currency not set in pos invoice * fix: duplicate item error message * fix: sales uom not fetched in pos invoice * fix: cannot add taxes to pos invoice for uae region * fix: cannot merge pos invoice into credit note * fix: tax calculation while merging pos invoices * feat: delete draft orders from order list * fix: merging of pos invoice with pricing rules	2021-01-28 17:58:55 +05:30
Nabin Hait	a6213ccd61	Merge branch 'develop' into version-13-beta-pre-release	2021-01-28 17:36:08 +05:30
Marica	7aa16bafff	Merge branch 'develop' into lcv_multicurrency	2021-01-28 13:29:36 +05:30
Deepesh Garg	b4be292217	fix: Item valuation for internal stock transfers (#24200) ... * fix: Item valuation for internal stocktransfers * fix: Consider conversion factor for invoices * fix: Add missing set warehouse fields * fix: Add validations and other fixes * fix: Fixes in flow * fix: Internal sales item link in Purchase Invoice * fix: Debugging * fix: Debug travis * fix: Remove commented code * fix: Rate forcing in sales order * fix: Unreallized profit in Sales Register * fix: Item wise gst sales register fix * fix: From warehouse in Purchase Order * fix: Target field in Sales Invoice * fix: remove self * fix: GST Purchasse register and other fixes * fix: Add shipping_address to no field map * fix: Ref doc map * fix: Test Cases * fix: address mapping between sales and purchase document * fix: Import Error * fix: Tax updation for internal invoices * fix: Purchase Order and Invoice linking * fix: Internal Party validation fix * fix: validation * fix(india): GST Taxes for intra state transfer * fix(india): GST Taxes for intra state transfer Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-01-28 13:09:56 +05:30
Saqib	8e55677f10	feat: deleting account & stock entries on deletion of transaction (#24298) ... * feat: control for deleting account & stock entries on deletion of a transaction * chore: change label & fieldname Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-01-28 12:26:45 +05:30
Deepesh Garg	224fdf34e4	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2021-01-25 22:16:02 +05:30
rohitwaghchaure	fa3ec3c346	Merge pull request #23969 from marination/putaway ... feat: Putaway	2021-01-25 16:42:04 +05:30
Suraj Shetty	0c34a711eb	Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release	2021-01-25 16:06:38 +05:30
Marica	62a1caf6c4	Merge branch 'develop' into lcv_multicurrency	2021-01-25 12:39:16 +05:30
Rucha Mahabal	858ad20dd0	Merge branch 'develop' into service-units-in-appointment	2021-01-22 09:09:29 +05:30
Suraj Shetty	f0ff23eac3	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-21 19:07:57 +05:30
Deepesh Garg	60a8ba5cbd	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2021-01-20 10:30:52 +05:30
rohitwaghchaure	c474caba70	Merge pull request #24354 from rohitwaghchaure/fixed-incorrect-key-in-subcontract-develop ... fix: incorrect serial no in the subcontracted purchase receipt	2021-01-19 15:08:53 +05:30
Suraj Shetty	bbc6bfd3c3	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-19 09:34:06 +05:30
marination	957615bec8	fix: Stricter validations ... - Validation for overreceipt on Purchase Invoice, Stock Entry, Purchase Receipt & Stock Reconciliation - Every incoming stock transaction must be checked to avoid overcapacity - However application of rule and splitting only on certain doctypes - Validate capacity < stock balance on save in putaway rule, irrespective	2021-01-18 23:47:24 +05:30
Marica	6ac51edc56	Merge branch 'develop' into putaway	2021-01-18 17:47:25 +05:30
Rucha Mahabal	20e5315480	feat: Allow selecting admission service unit in Patient Appointment for inpatients	2021-01-18 14:56:55 +05:30
Deepesh Garg	cbed6f970a	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2021-01-15 15:43:59 +05:30
Rohit Waghchaure	7cd7bf7f96	fix: incorrect key	2021-01-13 00:13:57 +05:30
Rushabh Mehta	7619d3d6d6	fix(merge): develop	2021-01-12 09:16:21 +05:30
Saqib	d43bb4db41	fix(pos): error while merging pos invoices into sales invoice (#24337)	2021-01-11 12:59:35 +05:30
Marica	eab1867235	Merge branch 'develop' into qi-ux	2021-01-05 14:23:05 +05:30
Saqib	60460a6d23	fix(e-invoicing): minor calculation fixes (#24282)	2021-01-05 13:54:04 +05:30
Saqib	1f591ab02e	fix(e-invoicing): minor calculation fixes (#24285)	2021-01-05 13:53:51 +05:30
Jannat Patel	06a401ffbf	fix: incoming rate attribute error (#24287) ... Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2021-01-05 11:54:34 +05:30
Marica	41ea77ce31	Merge branch 'develop' into putaway	2021-01-05 11:24:05 +05:30
marination	7877d5a7c2	fix: Create QI Parameters (links) in test cases	2021-01-04 11:10:04 +05:30
Deepesh Garg	4a8c2c4cb5	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-12-29 15:10:36 +05:30
Deepesh Garg	7c300859ed	fix: Test Cases	2020-12-26 20:14:51 +05:30
rohitwaghchaure	9f1e1f6c23	Merge pull request #24207 from rohitwaghchaure/fixed-serial-no-return-issue ... fix: partial serial no return issue	2020-12-26 12:12:04 +05:30
Saqib	17e96901db	feat: GST E Invoicing (#23455) ... * feat: init e-invoice settings * feat: read public key file * feat: rsa encryption with public key * feat: save token and sek from auth request * chore: handle error response * feat: AES decryption of SEK with appkey * feat: decrypt json data with SEK * feat: make e invoice from erpnext sales invoice * feat: generate IRN * feat: decode signed json and QR code * chore: validations * feat: cancel IRN * feat: complete e-invoice schema * chore: move e-invoice settings to regional * chore: split einvoice settings and operations * chore: rename schema to template & js cleanup * feat: make IRN field on regional setup * feat: Generate & Cancel IRN from Sales Invoice * chore: minor fixes * fix: item discount * chore: show irn cancelled check after cancellation * fix: hide cancel irn dialog on error * fix: public key is required on validate * fix: cannot find attached key file * fix: validation if e invoicing is disabled * fix: do not show generate irn for invalid supply type * fix: update irn_cancelled after cancelling irn * chore: show irn field for proper gst_category * feat: e-way bill details in e-invoice * fix: save e-way bill no on irn generation * chore: no copy on e invoice custom fields * feat: cancel e-way bill before cancelling IRN * feat: manual download / upload json * chore: group e-invoicing actions * fix: fn name * chore: save signed invoice and qrcode after uplaoding irn * fix: fetch token if not valid * chore: move einvoicing stuff to seperate folder * feat: QRCode Image and E-Invoice Print Format * fix: bug * fix: invalid syntax * chore: code cleanup * chore: clean up e invoice actions * fix: download & upload e-invoice * fix: print format * fix: validations * fix: add permissions on regional setup * feat: add patch * fix: validate document name * fix: return date * fix: credit note einvoice * fix: validations * fix: error logging * fix: e_invoice module not found * fix: add missing package * fix: rename e_invoice_utils.py * fix: einvoice field validation * fix: patch * fix: invoice totals calculation * fix: other charges calculation * chore: improve document name validation message * fix: qr code image string * feat: initialize GSP connector * chore: remove unwanted fields * fix: qr code generation * feat: fetch and cache GSTIN details * feat: generate & cancel IRN * feat: cancel eway bill * chore: remove unwanted fuctions * chore: clean up einvoice actions * fix: attach qrcode on irn generation * fix: generate & cancel IRN * fix: show/hide eway bill fields * fix: valiations * feat: generate eway bill from IRN * chore: remove unwanted imports * chore: error logging * feat: header & footer in GST E Invoice * chore: remove test pincode * fix: invalid syntax * feat: cess non advolem on einvoice item * chore: remove fetch token from e invocie settings * fix: imports * fix: error handling * feat: update timeline on einvoice actions * fix: qrcode image size * fix: exclude intra company transactions * fix: eway bill test * fix: ewaybill mandatory conditions * chore: add tests * fix: returning condition * feat: log e-invocing requests * chore: add ack date and ack no field for print formats * fix: sider issues * feat: show e-invoice preview before IRN generation * fix: use as_list for error message * fix: minor ux issues * fix: dialog is undefined * fix: error handling * feat: add docs link to e invoice settings * feat: multiple gstins for e invoicing * fix: uncomment test condition * fix: remove test pincode * fix: cannot cancel irn without submitting sales invoice * chore: code cleanup * fix: sider issues * fix: e invoice request log permissions Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-12-25 20:55:21 +05:30
Deepesh Garg	5269f02919	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2020-12-25 18:35:26 +05:30
Deepesh Garg	bfc17e487c	fix: Commonify code for Stock Entry	2020-12-25 18:34:39 +05:30
rohitwaghchaure	0917c1ec7c	fix: travis failing (#24211)	2020-12-25 18:13:12 +05:30
Nabin Hait	b99c77b753	Reposting fixes (#24202) ... * fix: finished item validation and rate * fix: Check if stock and account balance in sync after reposting * fix: validate stock accounts in journal entry * fix: validate expense against budget	2020-12-25 18:12:35 +05:30
Nabin Hait	327f03566a	Reposting fixes pre release (#24203) ... * fix: finished item validation and rate * fix: Check if stock and account balance in sync after reposting * fix: validate stock accounts in journal entry * fix: validate expense against budget	2020-12-25 18:11:54 +05:30
Rohit Waghchaure	dab1ab990d	fix: partial serial no return issue	2020-12-25 15:25:16 +05:30
Rohit Waghchaure	adc369f726	fix: partial serial no return issue	2020-12-25 13:28:47 +05:30
Saqib	6d74f5b59b	feat: GST E Invoicing (#23455) ... * feat: init e-invoice settings * feat: read public key file * feat: rsa encryption with public key * feat: save token and sek from auth request * chore: handle error response * feat: AES decryption of SEK with appkey * feat: decrypt json data with SEK * feat: make e invoice from erpnext sales invoice * feat: generate IRN * feat: decode signed json and QR code * chore: validations * feat: cancel IRN * feat: complete e-invoice schema * chore: move e-invoice settings to regional * chore: split einvoice settings and operations * chore: rename schema to template & js cleanup * feat: make IRN field on regional setup * feat: Generate & Cancel IRN from Sales Invoice * chore: minor fixes * fix: item discount * chore: show irn cancelled check after cancellation * fix: hide cancel irn dialog on error * fix: public key is required on validate * fix: cannot find attached key file * fix: validation if e invoicing is disabled * fix: do not show generate irn for invalid supply type * fix: update irn_cancelled after cancelling irn * chore: show irn field for proper gst_category * feat: e-way bill details in e-invoice * fix: save e-way bill no on irn generation * chore: no copy on e invoice custom fields * feat: cancel e-way bill before cancelling IRN * feat: manual download / upload json * chore: group e-invoicing actions * fix: fn name * chore: save signed invoice and qrcode after uplaoding irn * fix: fetch token if not valid * chore: move einvoicing stuff to seperate folder * feat: QRCode Image and E-Invoice Print Format * fix: bug * fix: invalid syntax * chore: code cleanup * chore: clean up e invoice actions * fix: download & upload e-invoice * fix: print format * fix: validations * fix: add permissions on regional setup * feat: add patch * fix: validate document name * fix: return date * fix: credit note einvoice * fix: validations * fix: error logging * fix: e_invoice module not found * fix: add missing package * fix: rename e_invoice_utils.py * fix: einvoice field validation * fix: patch * fix: invoice totals calculation * fix: other charges calculation * chore: improve document name validation message * fix: qr code image string * feat: initialize GSP connector * chore: remove unwanted fields * fix: qr code generation * feat: fetch and cache GSTIN details * feat: generate & cancel IRN * feat: cancel eway bill * chore: remove unwanted fuctions * chore: clean up einvoice actions * fix: attach qrcode on irn generation * fix: generate & cancel IRN * fix: show/hide eway bill fields * fix: valiations * feat: generate eway bill from IRN * chore: remove unwanted imports * chore: error logging * feat: header & footer in GST E Invoice * chore: remove test pincode * fix: invalid syntax * feat: cess non advolem on einvoice item * chore: remove fetch token from e invocie settings * fix: imports * fix: error handling * feat: update timeline on einvoice actions * fix: qrcode image size * fix: exclude intra company transactions * fix: eway bill test * fix: ewaybill mandatory conditions * chore: add tests * fix: returning condition * feat: log e-invocing requests * chore: add ack date and ack no field for print formats * fix: sider issues * feat: show e-invoice preview before IRN generation * fix: use as_list for error message * fix: minor ux issues * fix: dialog is undefined * fix: error handling * feat: add docs link to e invoice settings * feat: multiple gstins for e invoicing * fix: uncomment test condition * fix: remove test pincode * fix: cannot cancel irn without submitting sales invoice * chore: code cleanup * fix: sider issues * fix: e invoice request log permissions Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-12-25 10:26:43 +05:30
Deepesh Garg	e1320c7e47	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2020-12-22 13:32:59 +05:30
Nabin Hait	bd4bdca6ad	feat: Repost item costing (#24183) ... * Repost item valuation (#24031) * feat: Reposting logic for future finished/transferred item * feat: added fields to identify needs to recalculate rate while reposting * refactor: Set rate for outgoing and finished items * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Get outgoing rate for purchase return * refactor: Get incoming rate for sales return * test: Added tests for reposting valuation of transferred/finished/returned items * feat: added incoming rate field in DN, SI and Packed Item table * feat: get incoming rate for returned item * fix: no error while getting valuation rate in stock entry * fix: update stock ledger for DN and SI * feat: update item valuation rate in PR and PI based on supplied items cost * feat: SLE reposting logic for sales return and subcontracted item with test cases * feat: update qty in future sle * feat: repost future sle and gle via Repost Item Valuation * fix: Skip unwanted function calling while reposting * fix: repost sle for specific item and warehouse * test: Modified tests for backdated stock reco * fix: ignore cancelled sle in few methods * feat: role allowed to do backdated entry * feat: Show reposting status on stock valuation related reports * fix: minor fixes * fix: fixed sider issues * fix: serial no fix related to immutable ledger * fix: Test cases fixes related to perpetual inventory * fix: Test cases fixed * fix: Fixed reposting on cancel and test cases * feat: Restart reposting item valuation * refactor: Code cleanup using small functions and test case fixes * fix: minor fixes * fix: Raise on error while reposting item valuation * fix: minor fix * fix: Tests fixed * fix: skip some validation ig gle made from reposting * fix: test fixes * fix: debugging stock and account validation * fix: debugging stock and account validation * fix: debugging travis for stock and account sync validation * fix: debugging travis * fix: debugging travis * fix: debugging travis * fix: removed duplicate field from pos profile	2020-12-21 20:03:59 +05:30
Nabin Hait	a77b8c9fcc	Repost item valuation (#24031) ... * feat: Reposting logic for future finished/transferred item * feat: added fields to identify needs to recalculate rate while reposting * refactor: Set rate for outgoing and finished items * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Get outgoing rate for purchase return * refactor: Get incoming rate for sales return * test: Added tests for reposting valuation of transferred/finished/returned items * feat: added incoming rate field in DN, SI and Packed Item table * feat: get incoming rate for returned item * fix: no error while getting valuation rate in stock entry * fix: update stock ledger for DN and SI * feat: update item valuation rate in PR and PI based on supplied items cost * feat: SLE reposting logic for sales return and subcontracted item with test cases * feat: update qty in future sle * feat: repost future sle and gle via Repost Item Valuation * fix: Skip unwanted function calling while reposting * fix: repost sle for specific item and warehouse * test: Modified tests for backdated stock reco * fix: ignore cancelled sle in few methods * feat: role allowed to do backdated entry * feat: Show reposting status on stock valuation related reports * fix: minor fixes * fix: fixed sider issues * fix: serial no fix related to immutable ledger * fix: Test cases fixes related to perpetual inventory * fix: Test cases fixed * fix: Fixed reposting on cancel and test cases * feat: Restart reposting item valuation * refactor: Code cleanup using small functions and test case fixes * fix: minor fixes * fix: Raise on error while reposting item valuation * fix: minor fix * fix: Tests fixed * fix: skip some validation ig gle made from reposting * fix: test fixes * fix: debugging stock and account validation * fix: debugging stock and account validation * fix: debugging travis for stock and account sync validation * fix: debugging travis * fix: debugging travis * fix: debugging travis	2020-12-21 14:45:50 +05:30
Deepesh Garg	f48296ddf0	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2020-12-17 12:20:16 +05:30
Deepesh Garg	5a2030c2f2	fix: Add server side methods and other fixes	2020-12-17 09:21:11 +05:30
Nabin Hait	13dc63499a	Merge branch 'develop' into version-13-beta-pre-release	2020-12-15 09:06:27 +05:30
Marica	406af27b9e	Merge branch 'develop' into putaway	2020-12-14 13:07:50 +05:30
Suraj Shetty	f2511c84b5	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-12-14 09:05:48 +05:30
rohitwaghchaure	cf5f895617	Merge pull request #24110 from marination/status-updater-same-source-target-tables ... fix: Same source and target tables in Status Updater's update query	2020-12-13 21:29:19 +05:30
Nabin Hait	3423d94145	fix: Fixed merge conflict	2020-12-12 21:12:56 +05:30
Deepesh Garg	f17ea2ccab	fix: Accounting for internal transfer invoices within same company (#24021) ... * fix: Accounting for internal transfer invoices within same company * fix: warehouse fetching * fix: Linting issues * fix: GL entry fixes and validation for intercompany account * fix: Account naming changes and other fixes * fix: Add test for internal transfer * fix: Test Case * fix: Add description for fields * fix: Commonfied code * fix: Map warehouse and serial no	2020-12-11 21:30:39 +05:30
Rohit Waghchaure	3eea3c6c95	fix: Table 'tabStock Entry Detail' is specified twice	2020-12-11 18:45:39 +05:30
Rushabh Mehta	fec8dba16c	fix(merge): merge develop	2020-12-08 16:23:09 +05:30
Marica	0b68243979	Merge branch 'develop' into putaway	2020-12-08 11:44:00 +05:30
Afshan	01eca12fa7	fix: overriding po (#24022) ... * fix: overriding po * fix: po * fix: refactor condition * fix: condition * fix: missing code	2020-12-08 09:27:56 +05:30
marination	fac4035f23	feat: Apply Putaway Rules within transaction itself ... - Added checkbox 'Apply Putaway Rule' in PR and SE - Added link to rule in child tables - Rule is applied on Save - Validation for over receipt - Apply Rule on Stock Entry as well for Material Transfer and Receipt	2020-12-07 21:35:49 +05:30
Marica	724d03ec68	Merge branch 'develop' into fix-si-pos-return	2020-12-07 12:01:19 +05:30
rohitwaghchaure	0a672b69e6	Merge pull request #22859 from marination/pr-dn-return ... feat: Return tracking in PR/DN	2020-12-06 22:43:34 +05:30
Marica	067f35df26	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-12-04 21:13:23 +05:30
Rucha Mahabal	edee530d4c	fix: paid amount in Sales Invoice POS return resets to 0	2020-12-04 12:13:26 +05:30
marination	724e16bca1	chore: Use JSON style response and use ORM ... - Use JSON style response for report columns - Use ORM instead of frappe.db.sql - Remove returned % from list view	2020-11-30 12:55:30 +05:30
Deepesh Garg	1a4390de44	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-11-25 14:51:11 +05:30
Deepesh Garg	6c17b84cae	fix: Replace raw query with ORM	2020-11-25 13:42:16 +05:30
Marica	df17b4ff83	Merge branch 'develop' into pr-dn-return	2020-11-25 10:43:55 +05:30
rohitwaghchaure	6b53ef7cce	Merge pull request #23947 from rohitwaghchaure/incorrect-delink-serial-no-and-batch ... fix: incorrect delink serial no and batch	2020-11-20 13:45:17 +05:30
Rohit Waghchaure	0b71801462	fix: incorrect delink serial no and batch	2020-11-20 12:59:00 +05:30
Rohit Waghchaure	ceab692f73	fix: incorrect delink serial no and batch	2020-11-20 00:25:03 +05:30
Rohit Waghchaure	b6ef59f8e9	fix: incorrect delink serial no and batch	2020-11-19 16:15:32 +05:30
Jannat Patel	c1187bc1d5	fix: duplicate items validation for POS Invoice when allow multiple items is disabled (#23896) ... * fix: duplicate items validation for POS when allow multiple items in disabled * fix: variable name change for duplicate item validation Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2020-11-19 13:10:24 +05:30
Marica	9b897c4073	Merge branch 'develop' into pr-dn-return	2020-11-19 12:21:38 +05:30
Deepesh Garg	96e874bfda	fix: dimension filter query	2020-11-15 22:43:01 +05:30
Shivam Mishra	bed717b442	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-12 11:32:59 +05:30
Afshan	1e564bc02d	fix: refactor	2020-11-10 13:23:59 +05:30
Afshan	a75708b02e	Merge branch 'fix-po-no-fetching' of https://github.com/AfshanKhan/erpnext into fix-po-no-fetching	2020-11-10 13:19:53 +05:30
Afshan	1924019531	fix: refactor	2020-11-10 13:19:21 +05:30
Marica	63d1a0436c	Merge branch 'develop' into fix-po-no-fetching	2020-11-09 12:59:10 +05:30
Anupam	886b680e1b	revert changes	2020-11-06 16:48:39 +05:30
Rohit Waghchaure	2fe3b1807f	fix: multiple pricing rules are not working on selling side	2020-11-05 20:07:19 +05:30
marination	53b1a9a40b	chore: Add Test for missing debit account	2020-11-03 15:56:09 +05:30
Marica	9a75a60784	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-11-03 12:03:50 +05:30
marination	3991b84b2b	chore: Avoid multiline string in Translation & remove print statement	2020-11-02 15:23:41 +05:30
marination	28dd90f3dc	Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return	2020-11-02 15:16:31 +05:30
marination	d6596a169c	fix: Billing % Logic and Map Pending Qty only in PR and DN ... - Billing % should consider unreturned amount as total - While mapping to return doc, map unreturned amount - Added field Received Qty in Stock UOM, to tally against Returned Qty in PR - PR billing percentage updation custom function - In patch set received qty in stock uom first, then update returned qty and billing	2020-11-02 15:07:48 +05:30
Rohit Waghchaure	71913c36a7	fix: po_detail field has no value for subcontracted stock entry	2020-10-30 14:35:16 +05:30
prssanna	71e5b60df1	refactor: refactor contextual print setting implementation	2020-10-29 14:19:34 +05:30
Rohit Waghchaure	a248dfb9a5	fix: multiple pricing rules are not working on selling side	2020-10-28 16:22:49 +05:30
Faris Ansari	bc6a2b2f9c	wip	2020-10-28 13:54:11 +05:30
Marica	cf8698fb0b	Merge branch 'develop' into pr-dn-return	2020-10-27 15:34:51 +05:30
Andy Zhu	b44af32628	Update accounts_controller.py ... Updating Bin quantity based on doctype to optimize running efficiency.	2020-10-27 14:57:59 +13:00
Afshan	0a6e1b3503	fix: refactor	2020-10-26 21:23:31 +05:30
Afshan	3f971b2371	fix: copying po no when mapping doc	2020-10-26 16:59:57 +05:30
Saqib	34873bf26b	fix: multiple pos issues (#23725) ... * fix: point of sale search * fix: pos fetches expired serial nos * fix: pos doesn't refresh on route change * fix: opening balances not set in opening entry * fix: remove debug statement * fix: invalid query if no serial no is reserved by pos invoice * chore: make new order btn primary * chore: filter warehouse by company * chore: add shortcuts for new order and email * fix: cannot fetch serial no if no batch control * chore: add shortcuts for menu items * feat: standard keyboard shortcuts for pos page * feat: display only items that are in stock * fix: empty point of sale page if opening entry dialog is closed * feat: conversion factor in pos item details * fix: show all invalid mode of payments * chore: show all items if allow negative stock is checked * fix: -ve amount set when changing mode of payment * fix: pos closing validations * fix: test * fix: non expired serial no fetching query * fix: cannot dismiss pos opening creation dialog * fix: transalation strings * fix: msgprint to throw * chore: use as_list in frappe.throw * chore: clean up pos invoice.js & .py * fix: codacy * fix: transalation syntax * fix: codacy * fix: set_missing_values called twice from pos page * fix: mode selector with double spaces * fix: do not allow tables in pos additional fields * fix: pos is not defined * feat: set mode of payments for returns * fix: remove naming series from pos profile * fix: error message * fix: minor bugs * chore: re-arrange pos closing entry detail fields * fix: sider & frappe linter * fix: more translation strings * fix: travis * fix: more translation strings * fix: sider * fix: travis * fix: unexpected end of string * fix: travis	2020-10-26 13:24:47 +05:30
Rohit Waghchaure	103ecec9d4	fixed translation syntax	2020-10-26 12:20:11 +05:30
Rohit Waghchaure	538d62b43d	fix: incorrect consumed qty if raw material with batch	2020-10-26 12:19:00 +05:30
rohitwaghchaure	4c688b71f3	fix: consumed qty logic for subcontracted raw materials (#23314) ... * fix: consumed qty logic for subcontracted raw materials * added test case * fix: sales order workflow test case	2020-10-26 12:19:00 +05:30
rohitwaghchaure	1cfa61628d	fix: incorrect calculation for consumed qty for subcontract item (#23257) ... * fix: incorrect calculation for consumed qty for subcontract item * added test case	2020-10-26 12:19:00 +05:30
Saqib	60212ff9b9	fix: multiple pos issues (#23347) ... * fix: point of sale search * fix: pos fetches expired serial nos * fix: pos doesn't refresh on route change * fix: opening balances not set in opening entry * fix: remove debug statement * fix: invalid query if no serial no is reserved by pos invoice * chore: make new order btn primary * chore: filter warehouse by company * chore: add shortcuts for new order and email * fix: cannot fetch serial no if no batch control * chore: add shortcuts for menu items * feat: standard keyboard shortcuts for pos page * feat: display only items that are in stock * fix: empty point of sale page if opening entry dialog is closed * feat: conversion factor in pos item details * fix: show all invalid mode of payments * chore: show all items if allow negative stock is checked * fix: -ve amount set when changing mode of payment * fix: pos closing validations * fix: test * fix: non expired serial no fetching query * fix: cannot dismiss pos opening creation dialog * fix: transalation strings * fix: msgprint to throw * chore: use as_list in frappe.throw * chore: clean up pos invoice.js & .py * fix: codacy * fix: transalation syntax * fix: codacy * fix: set_missing_values called twice from pos page * fix: mode selector with double spaces * fix: do not allow tables in pos additional fields * fix: pos is not defined * feat: set mode of payments for returns * fix: remove naming series from pos profile * fix: error message * fix: minor bugs * chore: re-arrange pos closing entry detail fields * fix: sider & frappe linter * fix: more translation strings * fix: travis * fix: more translation strings * fix: sider * fix: travis * fix: unexpected end of string * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-26 11:17:04 +05:30
Nabin Hait	da301b0b7a	fix: merge conflict	2020-10-25 13:07:59 +05:30
Nabin Hait	5778595d50	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-22 21:42:54 +05:30
prssanna	13c6e2f320	feat: contextual setting for print uom after quantity	2020-10-22 17:19:00 +05:30
Marica	3b1be2b1de	fix: Add Taxes if missing via Update Items (#23702) ... * fix: Add Taxes if missing via Update Items * chore: PO Test for adding tax row via Update Items * chore: SO Test for adding tax row via Update Items	2020-10-22 17:04:31 +05:30
Saqib	a6ff664386	fix: cannot auto unlink payments for credit/debit notes (#23689)	2020-10-22 16:30:57 +05:30
prssanna	d7b704c90f	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-22 15:39:47 +05:30
prssanna	b57b3c9f6c	feat: hook to fetch additional print settings in print view	2020-10-22 15:37:47 +05:30
Saqib Ansari	903055b7b6	fix: '>' not supported between instances of 'str' and 'int'	2020-10-20 11:59:06 +05:30
Marica	50b708f615	Merge branch 'develop' into pr-dn-return	2020-10-13 16:57:11 +05:30
Marica	978e16481e	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-12 21:17:22 +05:30
Saqib	3daad224ad	fix: cannot merge pos invoice if validate selling price is checked (#23593) ... * fix: cannot merge pos invoice if validate selling price is checked * fix: validate selling price * fix: test * chore: add test * fix: error message	2020-10-12 18:31:23 +05:30
rohitwaghchaure	01e23264a6	Merge pull request #23557 from KanchanChauhan/issue#23475-2 ... feat: Supplier Sourced Items in BOM	2020-10-10 11:17:53 +05:30
Kanchan Chauhan	654c36ea99	feat: Supplier Sourced Items in BOM	2020-10-09 22:05:03 +05:30
Saqib	56fea7d243	fix: update items after submission ignores precision (#23491) ... * fix: update items after submission ignores precision * chore: add test	2020-10-09 21:19:25 +05:30
marination	4be5b5c891	fix: Handle missing Account and Item in Opening Invoice Creation Tool	2020-10-08 19:51:42 +05:30
Deepesh Garg	f183dd6d3a	Merge branch 'develop' into tax_fetch_quote	2020-10-06 13:27:28 +05:30