721 Commits

Author	SHA1	Message	Date
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
Deepesh Garg	fa79e94b49	Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check	2021-08-15 18:59:08 +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	80c85dd17c	fix: Account currency validation for first transaction	2021-08-12 15:39:07 +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
Anuja Pawar	0e337be065	fix: cost center & account validation in Sales/Purchase Taxes and Charges (#25929)	2021-08-10 17:26:35 +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
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
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
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
GangaManoj	4323f4bcac	fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()	2021-07-22 05:57:42 +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
Afshan	7fd44907ba	feat: fetching of qty as per received qty from PR to PI (#26184)	2021-06-24 14:26:36 +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
Nabin Hait	0950481253	fix: merge conflict	2021-06-15 20:18:06 +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
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
Rohan Bansal	11aff80dea	Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts	2021-06-02 14:22:32 +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	c5b074269a	Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts	2021-05-26 14:32:14 +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
Deepesh Garg	a60c3081cf	fix: Breaking cost center validation	2021-05-11 16:38:33 +05:30
Suraj Shetty	c702408f99	chore: Remove unnecessary print statements	2021-05-06 18:37:45 +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
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
Marica	4e25aa77dd	Merge branch 'develop' into dev-quality-inspection-accounts	2021-04-14 19:06:14 +05:30
Rohan Bansal	7f8b95efe8	fix: move QI logic to stock module	2021-04-14 14:15:45 +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
Marica	1b8d36634f	Merge branch 'develop' into patch-7	2021-03-31 16:04:24 +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
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	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
Rohit Waghchaure	bde159a77d	fix: total weight not set for free items	2021-03-22 23:36:48 +05:30
Rohit Waghchaure	ff70e61d7a	feat: recursive product discount	2021-03-17 14:30:34 +05:30
Jannat Patel	bb0d8f8038	Update accounts_controller.py	2021-02-11 20:59:28 +05:30
Jannat Patel	6756d3b561	Merge branch 'develop' into item_group_on_update_items	2021-02-11 16:29:34 +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
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
Suraj Shetty	54a253616a	Merge pull request #24508 from frappe/rebrand-ui	2021-02-02 09:07:35 +05:30
rohitwaghchaure	bf7317d4e2	fix: multiple pricing rule issue (#24509)	2021-02-01 20:22:14 +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	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
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
Suraj Shetty	bbc6bfd3c3	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-19 09:34:06 +05:30
Deepesh Garg	7c300859ed	fix: Test Cases	2020-12-26 20:14:51 +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
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	5a2030c2f2	fix: Add server side methods and other fixes	2020-12-17 09:21:11 +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
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
Rushabh Mehta	fec8dba16c	fix(merge): merge develop	2020-12-08 16:23:09 +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
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
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
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
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	5778595d50	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-22 21:42:54 +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
Marica	978e16481e	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-12 21:17:22 +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
Andy Zhu	1062d7eee0	fix: Update Items on Purchase Order ... 1. set warehouse using `get_item_warehouse` 2. update "reserved_qty" for sales order	2020-10-06 10:51:42 +13:00
Andy Zhu	760248911d	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.	2020-10-05 12:16:48 +13:00
marination	661bf64bba	fix: Check only Read and Write Permission in Update Items	2020-09-29 18:16:45 +05:30
Saqib	1831893b77	fix: failed workflow condition error message in update items (#23393)	2020-09-23 13:01:49 +05:30
marination	665c27af58	fix: Merge conflict missing line	2020-09-15 12:04:38 +05:30
Marica	baedc627ee	Merge branch 'develop' into item-tax-update-items	2020-09-15 11:30:22 +05:30
Saqib	61314248bb	feat: uom in update items for SO & PO (#22869) ... * feat: uom in update items for SO & PO * fix: supplied items doesn't updates on uom change * chore: add uom and conv factor change test * fix: test * fix: purchase order updates are not tracked * fix: fetch conversion factor on uom change * fix: codacy Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-15 11:14:31 +05:30
Marica	65c2c4f85f	Merge branch 'develop' into item-tax-update-items	2020-09-15 09:49:06 +05:30
Saqib	6db92fbb6a	feat: validate workflow before so/po update items (#23024) ... * feat: validate workflow before so/po update items * fix: incorrect workflow validation on so/po update items Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-14 19:54:17 +05:30
Rushabh Mehta	ff5d19609f	fix(hot): Pricing Rule encoding fixed	2020-08-25 11:59:57 +05:30
marination	698d983eef	fix: Item Tax Updation via Update Items in SO/PO	2020-08-19 14:59:46 +05:30
Nabin Hait	19ea7218d9	fix: Calculate taxes if tax is based on item quantity and inclusive on item price	2020-08-11 20:34:57 +05:30
Deepesh Garg	2621016884	fix: Allocated advance amount for multi-currency payment (#22923) ... * fix: Allocated advance amount for multicurrency payment * fix: Get grand total based on party currency * fix: Remove unwanted code	2020-08-11 16:06:13 +05:30
Deepesh Garg	c7eadfceb0	fix: Multi currency payment reconciliation (#22738) ... * fix: Multi currency payment reconciliation * fix: Hide currency link fields	2020-07-22 17:59:37 +05:30
Marica	3dee5273d6	fix: Update Packed Items via Update Items in SO (#22392)	2020-06-23 10:33:47 +05:30
Rohit Waghchaure	8d5380a2f0	fix: incorrect variable used	2020-06-18 14:06:31 +05:30
marination	b7e94cc742	fix: Travis	2020-06-15 12:16:30 +05:30
marination	f9c4b20985	fix: Added PO test and conversion factor fix ... - Don't change conversion factor if stock uom and uom is the same - Added PO test - Added Accounts User basic role in PO - Minor fixes, wrong variables	2020-06-12 15:49:53 +05:30
Saqib Ansari	c579b0879e	fix: cannot update delivery date	2020-05-29 22:34:22 +05:30
Saqib Ansari	2c3c8aaa2d	fix: submitted sales order can be updated with no permission	2020-05-29 21:55:38 +05:30
Deepesh Garg	2a9c5badc6	feat: Immutable ledger (#18740) ... * fix: Reverse GL entry on cancellation of document * fix: Removed set posting time field for multiple docs * fix: Stop future reposting and reverse entry for purchase receipt and delivery note * fix: Change is_cancelled field from select to check * Revert "fix: Removed set posting time field for multiple docs" This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8. * fix: Multiple fixes in GL Entry * fix: Remove future reporting from doctypes * fix: Canceled entry filters in Stock Ledger and General Ledger Report * fix: Remove print statement * fix: Validation for back dated entries * fix: Codacy fixes * fix: Add ignore links to multiple doctypes * fix: Codacy Fixes * fix: Ignore GL Entry and Stock Ledger entry while cancel * fix: Test case fixes * fix: Patch * fix: Codacy * fix: Budget Test Cases * fix: Patch * fix: Patch * fix: Multiple test cases * fix: changes in make_reverse_entry function * fix: Update patch * fix: Test Cases * fix: Test Case fixes * fix: Move patch upward in patches.txt * fix: Budget Test Cases * fix: Test Case and codacy * fix: Patch * fix: Minor label and UX fixes * fix: Move freezing date check * fix: Test Cases * fix: Test cases * fix: Test Cases * fix: Test Case * fix: Remove update_gl_entries_after function * fix: Remove update_gl_entries_after function * fix: Test Cases * fix: Fiscal Year wise backdated entry * fix: Update entries only for current SLE * fix: Remove is_cancelled * fix: Test Cases * fix: Test cases * fix: Test Cases * fix: Uncomment account and stock balance sync logic * fix: Stock balance and Account balance out of sync fixes * fix: Test Cases * fix: Test cases for POS, Stock Reco and Purchase Receipt * fix: Stock Reco tests * fix: Test stock reco precision * fix: Test stock reco for fifo precision * fix: Test stock reco for fifo precision * fix: Stock Entry test case Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-30 10:38:58 +05:30
Deepesh Garg	525204bc50	feat: Payment allocation based on payment terms (#20945) ... * feat: Payment allocation based on payment terms * fix: Add desccription for checkbox Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-23 16:07:36 +05:30
Saqib Ansari	f53299e98a	fix: warehouse unset when cannot find item warehouse ... * cannot set delivery date when all items gets deleted and new are added	2020-04-15 22:10:48 +05:30
Michelle Alva	7f2477b72c	fix: better error message due date ... show better error message payment schedule due date	2020-04-09 17:23:23 +05:30
Suraj Shetty	da6806e6bc	fix: Translation strings with trailing spaces (#21192)	2020-04-08 09:32:41 +05:30
Saqib	438e0433a3	fix: cannot set warehouse on deleting all so items and updating them (#21078) ... * fix: cannot set warehouse on deleting all so items and updating them * fix: travis * fix: docname is editable in update items dialog	2020-04-03 10:02:56 +05:30
Saqib	dd374ff77b	fix: only update items if rate or qty changed (#20742)	2020-02-27 12:51:31 +05:30
Deepesh Garg	930e61d6e3	Merge pull request #20549 from nextchamp-saqib/so-update-items-warehouse-fix ... fix: mandatory warehouse wrror while updating items after submission	2020-02-10 12:09:11 +05:30
thefalconx33	9225159d8c	fix: mandatory warehouse wrror while updating items after submission	2020-02-09 12:19:03 +05:30
Suraj Shetty	48e9bc3fc9	fix: Incorrect translation syntax	2020-01-29 15:06:18 +05:30
thefalconx33	2073eeb8fa	fix: don't allow deletion of items which has work order assigned to it	2019-12-27 16:26:03 +05:30
Saqib	0ad7449ae3	feat: allow adding & deleting of items in submitted SO & PO (#19911) ... * feat: allow adding of items after quotation submission * feat: allow deletion of items from submitted SO & PO * fix: case when items are added and deleted at once * fix: add test cases * For deletion of items while Updating Items after submitting PO & SO	2019-12-24 16:42:30 +05:30
Rohit Waghchaure	21fe97e723	fix: pricing rule not working for production discount	2019-12-16 11:15:53 +05:30
Nabin Hait	acdd5081da	fix: Service start and end date validation for deferred accounting (#19805)	2019-12-04 15:30:01 +05:30
Marica	c68a940aac	fix: Item qty cannot be zero in Purchase Receipt (#19779)	2019-12-03 12:59:22 +05:30
rohitwaghchaure	a85ddf2fb4	fix: performance issue of sales invoice while save/submit (#19598) ... * fix: performace issue of sales invoice while save/submit * Cached price list data, item group child data, added indexing for blanket order	2019-11-19 18:47:48 +05:30
Saqib	d995609ffa	Fixed asset refactor (#19369) ... * refactor: Asset Movement with multiple assets using table * refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset * feat: Auto create asset on Purchase checkbox * refactor: LCV for asset created via PR/PI * refactor: get asset category accounts from item master * refactor: Purchase Receipt for asset purchasing * refactor: Purchase Invoice for asset purchasing * fix: post-refactor delete fixes * refactor: moved asset validation from pr/pi on asset submission * fix: Asset Category should be defined for auto purchasing assets * fix: undo serial_no_update removal (for non asset item) from LCV * fix: remove duplicate calls from item.js * fix: args position of all occurrence of get_asset_category_account() * fix: test cases * fix: landed cost voucher validations * refactor: test case for auto creation of asset * fix: removed invalid assertions * fix: patch errors on travis * fix: codacy fixes * fix: PI Items not fetching details from item * fix: asset movement from list view having default purpose 'Receipt' * chore: msgprint for selecting item code first while creating asset manually * fix: alert messages * minor: asset movement fixes * fix: lcv was made against submitted assets * minor: ux fixes * refac: move specific asset validation to SINV * chore: remove make_purchase_invoice from asset form * make asset movement on asset submission * add PR & PI queries based on item code * refac: not allow last movement cancellation * move asset movement creation on asset submission * asset movement naming series * add tests * fix: code review changes * chore: remove unecessary asset movement updation * refac: setting latest location while making asset movements * Added extra validations * fix: form dashboard make lcv button * fix: auto asset movement creation validation * fix: allow lcv against other items after removing submitted assets * chore: remove unwanted condition * fix: mismatch debit credit on purchase of asset with valuation tax * chore: toggle required field based on movement type * chore: fix lcv error message * fix: travis failing * fix: travis failing test * fix: wrong conditions after merge * fix: cannot cancel assets * fix: travis failing* fix change in deletion of assets * fix: codacy * fix: process cancellation of assets * refac: cancellation of pr only deletes auto created assets * fix: incorrect query	2019-11-18 11:46:55 +05:30
Rohit Waghchaure	e93dc9f1cd	fix: precision issue	2019-11-08 13:43:15 +05:30
rohitwaghchaure	81c217584a	fix: purchase order issue, margin_rate_or_amount not there in the purchase documents (#19466)	2019-10-31 15:56:10 +05:30
Nabin Hait	49a46f08de	fix: Set gross profit in SO item on updating rate after submission (#19311)	2019-10-21 13:35:43 +05:30
rohitwaghchaure	285344eb0e	fix: over-bill error while making debit note against purchase return e… (#19270) ... * fix: overbill error while making debit note against purchase return entry * Update accounts_controller.py	2019-10-11 11:02:11 +05:30
Marica	f067447d9c	fix: Margin and Discount percentage set correctly via 'Update Items' (#19276)	2019-10-11 10:47:09 +05:30
Marica	23d7b09389	fix: Item Rate within Update Items in Sales order (#19172) ... Blocked negative discount percentage, which affected the item rate every time Update Items action was taken	2019-09-25 17:17:36 +05:30
Mangesh-Khairnar	7bcb24efbf	fix(purchase-invoice): Update paid amount on creation of debit note (#18830) ... * fix(purchase-invoice): set paid amount for purchase return * fix(purchase-invoice): remove payment schedule on creation of debit note	2019-09-11 10:49:33 +05:30
Suraj Shetty	182f4def00	fix: Delivery note creation from pick list ... - Changes in serial no and batch no seletion - Changes in warehouse overrwite logic Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-08-16 08:16:22 +05:30
Mangesh-Khairnar	a3d5200194	fix(sales-order): update items (#18535) ... * fix(sales-order): update items * fix: minor changes * Update: accounts controller	2019-08-05 10:16:40 +05:30
Deepesh Garg	d301d26fda	fix: Enhancement in credit note (#18511) ... * fix: Credit note enhancement * Fix: Print format for Sales Invoice Return * fix: Zero quantity validation fix for credit note	2019-07-31 15:58:19 +05:30
Mangesh-Khairnar	88620d6cbb	fix: precision on comparing with the outstanding amount (#18375)	2019-07-22 11:29:26 +05:30
Nabin Hait	868766ddf0	refactor: Refactored over delivery/receipt/billing fields (#17788) ... * refact: Refactored over delivery/receipt/billing fields * fix: test case	2019-07-15 18:02:58 +05:30
Nabin Hait	34c551d9a5	fix: Missing commits from hotfix branch (#17997) ... * fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases	2019-07-03 10:34:31 +05:30
Nabin Hait	659a01d819	Update accounts_controller.py	2019-07-01 15:16:49 +05:30
deepeshgarg007	e8d21cd8fa	fix: Division by zero error fix in group similar item	2019-06-24 18:49:24 +05:30
deepeshgarg007	acc2422167	Merge branch develop into dimensions	2019-05-28 12:18:32 +05:30
Nabin Hait	5cd04a6d30	fix: payment reconciliation against expense claim (#17729) ... * fix: payment reconciliation against expense claim * feat: Added dashboard for expense claim	2019-05-27 11:44:06 +05:30
deepeshgarg007	3d11ac0e75	fix: Accounting dimensions for child tables	2019-05-19 00:02:01 +05:30
deepeshgarg007	60f4dd0736	Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions	2019-05-14 15:51:12 +05:30
deepeshgarg007	d83cf65be1	fix: Added dimensions in financial reports and general ledger	2019-05-12 18:34:23 +05:30
Rohit Waghchaure	4a267b9340	fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount	2019-05-09 19:52:53 +05:30
Nabin Hait	4a994d4eb8	fix: Don't allocate advance if pos	2019-04-25 17:49:38 +05:30
Anurag Mishra	ed82e8ba3b	fix: removed before from accounts_controlle.pyr and fetch the gl from frontend	2019-04-09 15:19:05 +05:30
Rohit Waghchaure	9835c89e17	Added test cases	2019-04-06 12:29:05 +05:30
Rohit Waghchaure	5fa9a7a1b4	feat: unlink advance payment entry on cancelation of order	2019-04-01 00:40:38 +05:30
Rohit Waghchaure	e540534e42	fix: Pricing rule not working for POS	2019-03-31 17:13:18 +05:30
Saurabh	84a18f5b18	Merge branch 'master' into develop	2019-03-28 13:54:34 +05:30
Suraj Shetty	a7992ecb62	style: Fix formatting	2019-03-27 20:32:42 +05:30
Suraj Shetty	abc2a64d5e	fix: Commonify get gl_entry code by moving it to accounts_controller	2019-03-27 20:25:18 +05:30
Rohit Waghchaure	8bfe330b37	feat: pricing rule enhancements	2019-03-19 12:44:30 +05:30
Saurabh	482ebd2c7c	Merge branch 'master' into develop	2019-02-20 18:14:18 +05:30
rohitwaghchaure	c18e925d61	fix: Moved regional methods from controller to hooks (#16736)	2019-02-20 17:13:15 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
Gaurav	f1e28e0e8d	mod(regional,italy): Updates to Italian Localization ... fixes: removed cleanup_files from italy/utils removed extract_doc_number from italy/utils added country filter to italian localization patch replaced dict assignment with dot operator in prepare_invoice correcions in e-invoice xml following changes in prepare_invoice added setup_report in patch added section for e-invoicing custom fields in company added Italy in test_company	2019-02-19 10:39:22 +05:30
Aditya Hase	13808b4cc9	fix(py3): Convert to float before comparison	2019-02-08 12:03:25 +05:30
Aditya Hase	d9ce732d3e	fix(py3): Explicitly convert to float for comparison	2019-02-07 22:21:05 +05:30
Saif Ur Rehman	1a441b267d	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt	2019-02-01 19:17:04 +05:00
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Sagar Vora	f3cfad7595	Merge branch 'master' into staging-fixes	2019-01-29 17:20:46 +05:30
Saif Ur Rehman	3d275af67b	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/buying/doctype/supplier/supplier.json # erpnext/patches.txt # erpnext/selling/doctype/customer/customer.json	2019-01-24 23:40:16 +05:00
Frappe Bot	e415cce1a9	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
Nabin Hait	d2e2ca31ac	Merge pull request #16460 from nabinhait/pricing-rule-issue ... fix: Enforce pricing rule based on rate on server side	2019-01-23 12:09:12 +05:30
Nabin Hait	da32916396	fix: Enforce pricing rule based on rate on server side	2019-01-22 19:06:06 +05:30
Nabin Hait	bef2c22d23	Fix: merge conflict	2019-01-18 10:15:47 +05:30
Rohit Waghchaure	f725816809	Enhance: Added field limit in the Payment Reconciliation to handle large entries	2019-01-17 12:54:14 +05:30
Saif Ur Rehman	8d61794540	Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt # erpnext/stock/doctype/item/item.json	2019-01-10 04:23:40 +05:00
Saif Ur Rehman	eb7277d2d4	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/patches.txt	2019-01-09 11:25:53 +05:00
Nabin Hait	bf0b6fd8a9	Merge pull request #16342 from finbyz/staging-fixes ... fix: rounded total if available while caclulating advance paid	2019-01-08 20:29:32 +05:30
Saurabh	afec3ca89a	Merge branch 'staging' into develop	2019-01-08 17:09:36 +05:30
Saif Ur Rehman	380b4b0926	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/accounts/doctype/accounts_settings/accounts_settings.json # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order_item/purchase_order_item.json # erpnext/buying/doctype/supplier/supplier.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/setup/doctype/item_group/item_group.json # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/item/item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json	2019-01-08 13:41:46 +05:00
Sagar Vora	f733a39089	fix: remove trailing whitespace	2019-01-07 14:24:01 +05:30
finbyz	5efc7973ea	Minor Fix for Rounded Total	2019-01-05 11:12:11 +05:30
Saif Ur Rehman	648bd15b2a	Force item_tax_rate on setting item details server-side	2019-01-03 04:03:54 +05:00
deepeshgarg007	77cde832d6	Added validation for update items in purchase order as well	2018-12-27 15:56:51 +05:30
deepeshgarg007	ffb411d9e2	Validation while updating items in sales order	2018-12-27 14:12:05 +05:30
Rushabh Mehta	fafbb0278f	fix: reload parent after setting children	2018-12-24 22:09:15 +05:30
Rushabh Mehta	c9b1a35ac3	fix: set explicit idx for new item in update_child_qty_rate	2018-12-24 20:55:35 +05:30
Rohit Waghchaure	f6f503a1f6	[Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice	2018-12-19 15:15:35 +05:30
Stavros Anastasiadis	3d82b74ea4	Update Items in Submit state can add new row (#15644) ... * Update Items in Sumbit state can add new row In Sales Order and Purchase Order when docstatus is submitted user can use Update Item btn to add new child Items * Remove unused code line * Remove blocking db save thread line * Remove Company as not standard Field in Purchase Order Item * Minor indentation fix * Add Unit Test, add new row in update_child_qty_rate * Codacy fix	2018-12-10 17:30:55 +05:30
Nabin Hait	e4cc062cf1	Merge pull request #16109 from rohitwaghchaure/while_pulling_advanced_entry_system_uses_grand_total ... [Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice	2018-11-27 13:22:50 +05:30
Nabin Hait	72fc1b57be	Merge pull request #16083 from Anurag810/new-fix-branch ... [fix] delivery note with quantity equal 0 #14211	2018-11-27 13:10:31 +05:30
Rohit Waghchaure	6cc2f52fa4	[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice	2018-11-27 12:07:03 +05:30
Rohit Waghchaure	d1a85a3637	[Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice	2018-11-26 18:42:29 +05:30
Anurag Mishra	e657fe84b8	making validation generic for sales order,sales invoice,purchase order etc.	2018-11-26 17:13:10 +05:30
Zarrar	5be6d19f4d	[Minor] Display Discount Amount when Tax table is empty (#15812) ... * show discount amount even when tax table is empty * negate the value for discount while printing	2018-11-08 12:16:26 +05:30
Shreya Shah	785f1aa96d	fix(print): Update idx if grouping same items (#15647)	2018-10-11 10:14:25 +05:30
Faris Ansari	2ab6e0e39b	fix(translations): Replace translations by keyword with indexed version (#15426) ... * fix(translations): Replace translations by keyword with indexed version Keywords in the translation also gets translated which results in an error because python cannot find the key * Update buying_controller.py	2018-09-19 13:13:59 +05:30
Nabin Hait	6a5695fe17	minor fix	2018-08-09 11:30:21 +05:30
Nabin Hait	9a33bc6417	optimizing transactions by caching	2018-08-09 10:47:09 +05:30
Nabin Hait	50238c3049	[optimize] tree conditions for pricing rule	2018-08-08 18:43:04 +05:30
Rushabh Mehta	708e47aadf	optimize(various)	2018-08-08 16:37:31 +05:30
Nabin Hait	041a5c2d3b	Get Advances and auto allocate (#14970)	2018-08-01 18:07:39 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
rohitwaghchaure	3ffe89659a	[Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice (#14879)	2018-07-13 17:40:48 +05:30
Nabin Hait	b2da082798	Fixed logic and tests	2018-07-13 17:02:08 +05:30
Doridel Cahanap	6f06cc27e6	Update Qty and Rate in PO and SO	2018-07-13 17:02:08 +05:30
Alchez	9155e40bc7	[Fix] Set default CF in case none exist (#14829)	2018-07-09 16:57:42 +05:30
Alchez	8f2a0f3d79	[Fix] Incorrect assignment of Serial No in POS Invoice (#14772) ... * Fix incorrect assignment of serial no in Sales Invoice through POS * Add conversion factor to quantity check	2018-07-06 14:36:52 +05:30
Saurabh	1cfcf70905	Resolved merge conflicts	2018-07-06 13:18:44 +05:30
rohitwaghchaure	ea943c6fe4	[Fix] Due date validate issue in the POS (#14825)	2018-07-06 12:28:58 +05:30
rohitwaghchaure	7048925016	[Enhance] Standalone debit/credit note (#14269) ... * [Enhance] Standalone debit/credit note * Test cases * Test cases and documentation * Removed credit, debit note links from accounts module	2018-06-11 12:02:14 +05:30
Saurabh	0eb622f7da	[fix] resolve conflicts	2018-05-31 17:32:17 +05:30
Zarrar	b9f54ca946	[Enhance] Group same items during printing Delivery Note, Invoices, etc (#14250) ... * add doctypes allowed to group items, average the rate * add check field to group items during print * call common before_print in delivery note * fix precision issue while calculating average	2018-05-28 17:41:09 +05:30
mnatalia	5f0e8d6e09	Added possibility to translate (#14173)	2018-05-22 09:08:50 +05:30
Rohit Waghchaure	992fb34c95	[Fix] Asset adjustment issues	2018-05-17 11:22:59 +05:30
Rohit Waghchaure	2868840e6b	[Fix] Validation issue	2018-05-16 23:57:28 +05:30
Rohit Waghchaure	421697250b	[Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:20:52 +05:30
tundebabzy	ad08d4ce96	Ability to hold payment for disputed invoices #12048 (#13298) ... * add new fields to Supplier Master: - on_hold: To signal the Customer is blocked from completing certain transactions - hold_type: 3 options - All, invoices and payments * sanitize `on_hold` field input * show hold status in list view * add `release_date` field to Supplier Master: - specifies the date when transaction restraint will be removed * reset release date if supplier is not on hold * add validation to stop transactions when Supplier is blocked * add test cases * return empty list for outstanding references if supplier is blocked * block make button:payment if supplier is blocked * adjust test cases * PEP 8 clean up * more tests * adds new fields to Purchase Invoice: - release_date: once set, invoice will be on hold until set date - hold_comment: so user can add comment pertaining to why invoice is on hold * implement individual purchase invoice on hold logic * allow user to change release date * update manual * final cleanup including more validation and tests * update supplier manual * make default for release_date argument todays date * remove Auto Repeat added by mistake * add on_hold_field to purchase invoice * add 'On Hold' or 'Temporarily on Hold' status for purchase invoice in list view * implement explicit payment hold in purchase invoice * update manual * add dialog for saving comment * bug fix, refactor, clean up * more test cases	2018-05-16 11:31:41 +05:30
Rohit Waghchaure	a02640e249	[Minor] Is fixed asset checkbox not set at server side if duplicate	2018-05-16 10:49:12 +05:30
Shreya	3f77852e93	Pass buying or selling as filter parameters ... Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.	2018-05-15 17:22:06 +05:30
Saurabh	2ca83d61ea	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
Rohit Waghchaure	aa7b434270	Create asset adjustment doctype, post gl entry for the asset	2018-05-14 19:07:40 +05:30