rohitwaghchaure
d0baa90b50
Merge pull request #24715 from rohitwaghchaure/fixed-patch-item-reposting-develop
...
fix: patch failing because of incorrect gl entries
2021-02-24 17:18:43 +05:30
Ankush Menat
23c30e43f0
fix: make round off GLE always non-opening
...
Opening GL entries can not be for profit and loss accounts. Round off
accounts are by default P&L account. Hence when making opening entry,
make round off entries as non-opening.
Related issue: ISS-20-21-09677
2021-02-24 11:03:24 +05:30
Rohit Waghchaure
39b5ad8e69
fix: patch failing because of incorrect gl entries
2021-02-23 18:35:36 +05:30
Rohit Waghchaure
bc8c9de26d
fix: patch failing because of incorrect gl entries
2021-02-23 18:26:48 +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
Saqib Ansari
85c91ca2db
Merge branch 'develop' into tcs_calculation
2021-02-23 15:56:29 +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
Mohammad Hasnain Mohsin Rajan
07f40596bc
feat(Bank Reconciliation): Redesign ( #24273 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-22 22:19:47 +05:30
Deepesh Garg
c839177f8e
fix: Issue on posting inter-warehouse transfer invoice
2021-02-22 21:04:51 +05:30
Afshan
fdafb55fba
fix: error message when making reverse journal entry ( #24665 )
2021-02-22 19:25:57 +05:30
rohitwaghchaure
311bb6452f
Merge pull request #24691 from deepeshgarg007/accounting_dimension_timeout
...
fix: Accounting Dimension creation background job timeout
2021-02-22 15:29:41 +05:30
Deepesh Garg
aa46def745
fix: Accounting Dimension creation background job timeout
2021-02-21 21:54: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
rohitwaghchaure
7797e9d3ac
fix: added patch to fix incorrect stock qty and account value ( #24628 )
2021-02-18 21:27:01 +05:30
rohitwaghchaure
76f616565e
fix: Consolidated Financial Statement report not works if child company account not present in parent company ( #24580 )
...
Fixed conflicts
2021-02-18 21:25:40 +05:30
Deepesh Garg
d60a40ae82
fix: Add accounts user role permission for accounting dimension filter
2021-02-18 21:23:20 +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
4fb547179d
fix: customer_currency referenced before assignment ( #24607 )
2021-02-18 20:53:49 +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
rohitwaghchaure
03a1484aed
Merge pull request #24621 from rohitwaghchaure/fixed-consolidated-report-not-working-develop
...
fix: Consolidated Financial Statement report not works if child compa…
2021-02-17 16:35:43 +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
rohitwaghchaure
d60ff83b6f
fix: added patch to fix incorrect stock qty and account value ( #24628 )
2021-02-16 09:12:27 +05:30
Deepesh Garg
e2324c77fe
fix: Test Cases
2021-02-15 20:01:32 +05:30
rohitwaghchaure
164ffac4ef
fix: Consolidated Financial Statement report not works if child company account not present in parent company ( #24580 )
...
Fixed conflicts
2021-02-12 17:33:07 +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
0a7939277c
fix: dynamic links for reports ( #24462 )
...
* fix: dynamic links for reports
* fix: revert changes for payment period report
* fix: link doctypes
2021-02-11 20:11:06 +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
Saqib
e37a5c2646
fix: customer_currency referenced before assignment ( #24607 )
2021-02-11 13:10:52 +05:30
Saqib
e07eb86498
Merge branch 'develop' into tcs_calculation
2021-02-11 12:13:47 +05:30
Saqib
15f4672ffa
fix: pos closing valdation ( #24605 )
2021-02-11 12:11:44 +05:30
Nabin Hait
9d3f242f39
Update subscription.js
2021-02-11 11:17:33 +05:30
Nabin Hait
79ba299abc
Merge branch 'develop' into subscription_fix_new
2021-02-11 11:03:45 +05:30
Deepesh Garg
516b3ae1bc
fix: get company attribute
2021-02-09 16:47:55 +05:30
Deepesh Garg
45cec6928b
fix: get company attribute
2021-02-09 16:44:12 +05:30
Deepesh Garg
5006a2065e
fix: Comment
2021-02-09 16:38:11 +05:30
Deepesh Garg
e56daeb347
fix: Multiple fixes in subscription
2021-02-09 16:13:45 +05:30
Deepesh Garg
236c9ae453
Merge pull request #24578 from marination/acc-dimension-update-fix
...
fix: Avoid changing Ref. Doctype in Accounting Dimension after creation
2021-02-09 06:51:58 +05:30
Saqib
8991d4ed0b
fix: fetching of standalone cr/dr notes for reconciliation ( #24575 )
2021-02-08 20:19:11 +05:30
marination
5a7ddba9a3
fix: Avoid changing Ref. Doctype in Accounting Dimension after creation
2021-02-08 17:06:23 +05:30
Anuja Pawar
ffb36aac8f
fix: fixing item_code not found error in the report ( #24483 )
2021-02-05 23:35:47 +05:30
Saqib
0f2dc0eb73
Merge branch 'develop' into tcs_calculation
2021-02-04 18:38:26 +05:30
Deepesh Garg
dce73d1881
fix: Add accounts user role permission for accounting dimension filter
2021-02-03 12:06:36 +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
Saurabh
9dcb286c31
fix: consider select perm while setting party details ( #24518 )
2021-02-01 20:36:15 +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
Saurabh
081f506992
fix: consider select perm while setting party details ( #24514 )
2021-02-01 20:18:44 +05:30
prssanna
a3585e40f7
style: fix formatting
2021-02-01 19:50:27 +05:30
Saqib Ansari
cee3670167
chore: clean up sales invoice form
2021-02-01 15:45:26 +05:30
Saqib
fb75f0935f
Merge branch 'develop' into tcs_calculation
2021-01-29 14:26:48 +05:30
Saqib Ansari
3b2327ba8d
fix: sider
2021-01-29 12:08:35 +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
62dfff5dde
Merge branch 'develop' into tcs_calculation
2021-01-28 18:08:13 +05:30
Saqib Ansari
4d9b6066a2
fix: tcs amount calculation
2021-01-28 18:07:08 +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
Afshan
e5529ad461
fix: validate tax template for tax category ( #24402 )
...
* fix: validate tax template for tax category
* Update sales_taxes_and_charges_template.py
2021-01-28 12:22:39 +05:30
Marica
cc22814df5
Merge branch 'develop' into lcv_multicurrency
2021-01-28 12:15:09 +05:30
Saqib Ansari
ae9a9a2167
fix: tcs chargable amount
2021-01-27 19:36:29 +05:30
Saqib Ansari
ff12f91486
feat: charging tcs on sales invoice
2021-01-27 19:17:38 +05:30
Saqib Ansari
6db14d02d2
fix: test
2021-01-27 17:11:34 +05:30
Saqib Ansari
6f718a31f0
refactor: tax withholding category against customer
2021-01-27 16:59:07 +05:30
Saqib
5ba2f58355
fix: e_invoice print format not showing other charges ( #24474 )
2021-01-27 12:34:08 +05:30
Deepesh Garg
dade7a4583
fix: Translation Syntax
2021-01-26 21:11:55 +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
Marica
5631d014a7
Merge branch 'develop' into item-wise-purchase-registry-item-name-error
2021-01-22 12:35:35 +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
Saqib
577d2bed6e
fix: failing einvoice test ( #24434 )
2021-01-21 18:43:55 +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
Jannat Patel
953960b193
Merge branch 'develop' into item-wise-purchase-registry-item-name-error
2021-01-19 10:44:49 +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
Saqib
7b8eac958e
feat: re-linking bank accounts with plaid ( #24392 )
2021-01-18 16:44:41 +05:30
pateljannat
6bec696396
fix: item_group fallback
2021-01-18 16:21:56 +05:30
pateljannat
fa2b0d43bd
fix: handled invoices with no item_code
2021-01-18 15:27:40 +05:30
Deepesh Garg
1564d6ee1f
fix: Test Case
2021-01-15 19:51:15 +05:30
Deepesh Garg
0c4d61269a
fix: test case
2021-01-15 15:57:18 +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
Anuja P
47b42e6441
fix: Translation fixes
2021-01-14 21:20:00 +05:30
Anuja P
5ead7ee6cf
fix:Payment Period based on invoice date report fix/refactor
2021-01-14 20:58:34 +05:30
Deepesh Garg
c96ea002a0
Merge pull request #24375 from deepeshgarg007/plv_cost_center_ignore_v13
...
fix: Ignore group cost center validation for period closing voucher
2021-01-14 19:47:56 +05:30
Deepesh Garg
847c706d2f
fix: Ignore group cost center validation for period closing voucher
2021-01-14 19:44:41 +05:30
Marica
3c878505cb
Merge branch 'develop' into naming-series-proj
2021-01-14 16:34:51 +05:30
Anuja Pawar
e62ce4b172
fix: Add button PO, PI, SI, DN and, Quotation Dashboard ( #24187 )
2021-01-13 21:13:12 +05:30
Jannat Patel
00ccec7314
fix: subscription prepaid date validation ( #24356 )
2021-01-13 21:02:15 +05:30
Marica
1ff7743d81
Merge branch 'develop' into naming-series-proj
2021-01-13 10:40:24 +05:30
rohitwaghchaure
bc465a3045
Merge pull request #24332 from rohitwaghchaure/fixed-payment-entry-multi-currency-issue-develop
...
fix: payment entry multi-currency issue
2021-01-13 00:13:14 +05:30
Marica
cb079cd8c4
Merge branch 'develop' into naming-series-proj
2021-01-12 19:57:55 +05:30
Anurag Mishra
36fa0512d2
fix: not able to create dunning from sales invoice
2021-01-12 17:02:19 +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
Rohit Waghchaure
3777c6aa38
fix: payment entry multi-currency issue
2021-01-08 12:59:15 +05:30
Wolfram Schmidt
5eef19723d
Update item_tax_template_dashboard.py
...
added missing backlink. In Item Groups I can set Item Tax Temple in Table taxes.
2021-01-05 18:47:11 +01:00
Anurag Mishra
b864b09d40
Merge branch 'develop' into gratuity
2021-01-05 14:47:38 +05:30
Deepesh Garg
bfa71c23ae
Merge pull request #23965 from vorasmit/remarks-fix-develop
...
fix: add remarks to sales invoice
2021-01-05 09:54:53 +05:30
Nabin Hait
517fd8b9e6
fix: Ignore customer and supplier while deleting company transactions ( #24279 )
...
* fix: Ignore customer and supplier while deleting company transactions
* fix: Test cases fixed based on Travis
2021-01-05 09:23:39 +05:30
Deepesh Garg
797a742cb2
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2021-01-04 14:24:00 +05:30
Afshan
a245f667d0
fix: pos error pop up ( #24237 )
2021-01-02 10:30:22 +05:30
Saqib
fc7a11e2aa
fix (e-invoicing): item & invoice value calculation ( #24253 )
2020-12-31 11:35:46 +05:30
Deepesh Garg
23ab5c5cc0
fix: Multiplle sider issues
2020-12-31 11:29:06 +05:30
Deepesh Garg
133ce286f9
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-31 11:24:14 +05:30
Saqib
f946bbd032
fix: minor e-invoicing issues ( #24239 )
...
* fix: invoice value set to zero if rounded total disabled
* fix: unit rate & gross amount calculation
* fix: e-invoice-setup patch
* chore: no need to re-run the patch
* fix: item value & invoice value calculations
2020-12-30 14:43:42 +05:30
Deepesh Garg
ff51540eed
Merge branch 'accounting_dimension_filters' of github.com:deepeshgarg007/erpnext into accounting_dimension_filters
2020-12-29 17:02:07 +05:30
Deepesh Garg
e061004956
fix: Improve validation message
2020-12-29 17:00:39 +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
Anurag Mishra
dfe8f7601b
Merge branch 'develop' into gratuity
2020-12-29 13:27:03 +05:30
Afshan
91e3c07d77
fix: assest depreciation ledger
2020-12-28 19:42:46 +05:30
Deepesh Garg
4f8da4c313
fix: Test Cases
2020-12-26 11:37:51 +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
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
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
rohitwaghchaure
4e9361f74b
Merge pull request #24204 from rohitwaghchaure/pricing-rule-not-working-margin
...
fix: multiple pricing rule with margin type as Percentage is not working
2020-12-25 09:33:39 +05:30
Rohit Waghchaure
ba5b603a0b
fix: multiple pricing rule with margin type not working
2020-12-24 22:49:38 +05:30
Rohit Waghchaure
aea62da544
fix: multiple pricing rule with margin type not working
2020-12-24 22:44:31 +05:30
Anurag Mishra
ba6ff6e227
fix: conflict
2020-12-23 18:07:53 +05:30
Anurag Mishra
b88af3a3f7
feat: Accrural Entry for Gratuity beafore Payment
2020-12-23 18:07:53 +05:30
Anurag Mishra
25c356894d
test: gratuity
2020-12-23 18:07:53 +05:30
Anurag Mishra
49b326fc08
feat(HR): Gratuity Payment
2020-12-23 18:07:05 +05:30
Deepesh Garg
e5e2ad646a
fix: Test Cases
2020-12-22 19:53:07 +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
barredterra
1725fbc59a
feat: separate equity tree in CoA SKR04
2020-12-22 12:32:36 +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
5432ee3364
Merge pull request #24095 from frappe/skr04_equity_dev
...
feat: separate equity tree in CoA SKR04
2020-12-17 12:37:28 +05:30
Deepesh Garg
d6cd02d29d
fix: Add tests
2020-12-17 09:21:24 +05:30
Deepesh Garg
924f99bead
fix: Help message
2020-12-16 15:42:50 +05:30
Deepesh Garg
4638f604ed
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-16 14:59:30 +05:30
Shivam Mishra
fd044b032f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
2020-12-16 13:21:10 +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
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
Mohammad Hasnain Mohsin Rajan
f8d6726990
fix(acc recv report): columns mismatch ( #24109 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-12-11 13:28:23 +05:30
Suraj Shetty
dc13d4b0fc
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-11 12:57:04 +05:30
Saqib
7acb42d6df
feat(POS): hide images & auto add item checkbox ( #24102 )
2020-12-10 16:22:01 +05:30
Raffael Meyer
7f387452ca
Merge branch 'develop' into skr04_equity_dev
2020-12-10 10:51:55 +01:00
Rushabh Mehta
39154e5296
fix(minor): add debounce to calls
2020-12-10 12:37:16 +05:30
barredterra
52d37edf98
feat: separate equity tree in CoA SKR04
2020-12-09 17:57:29 +01:00
Rushabh Mehta
fec8dba16c
fix(merge): merge develop
2020-12-08 16:23:09 +05:30
Rucha Mahabal
fa950662b9
fix: import statement
2020-12-08 12:32:19 +05:30
Rucha Mahabal
db0bbfac97
feat(reports): get item details from Item doctype instead of the Transaction
2020-12-08 12:20:07 +05:30
Afshan
727b2f9b97
fix: throw an error when no pos profile exist ( #24025 )
...
* fix: throw an error when no pos profile exist
* fix: throw an error when no pos profile exist
* fix: test cases
* fix: tests
* fix: test
* fix: space as indent
* fix: travis
2020-12-08 09:45:19 +05:30
Anuja P
550cb9c78f
fix: suggested changes
2020-12-07 11:11:00 +05:30
Anuja P
47b4b7009d
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
...
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
2020-12-07 10:55:44 +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
Anuja P
b6cf75d2a8
fix: error messsage indent fix
2020-12-05 22:25:17 +05:30
Anuja P
d3157c9347
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
...
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
2020-12-05 22:21:03 +05:30
Anuja P
2e4faf96f2
fix: Added TDS Payable account number and an error message
2020-12-05 13:36:43 +05:30
Marica
067f35df26
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-12-04 21:13:23 +05:30
marination
c866abca56
fix: (travis) Disable update stock for deferred accounting item's Sales Invoice
2020-12-04 20:12:52 +05:30
marination
6a2431586e
fix: Make new Customers for account missing test and set company
2020-12-04 13:31:36 +05:30
Rohit Waghchaure
28e86cf183
fix: pricing rule with transaction not working for additional product
2020-12-04 11:57:56 +05:30
Glen Whitney
dea6a90a1f
feat(Accounting Dimension): other apps may have accounting dimension doctypes
...
Prior to this change, there was simply a single hardcoded list of doctypes
with accounting dimensions in ERPNext. However, when extending the
capabilities of ERPNext using an add-on app rather than by modifying
ERPNext itself, it may well be necessary to create new doctypes in other
apps that will have accounting dimensions as well.
So, this PR moves the list of doctypes with accounting dimensions into
hooks.py so it can be accumulated from multiple apps. It also allows the
list of doctypes in make_dimension_in_accounting_doctypes be specifiable,
for more convenient use in the after_install hooks of other apps.
2020-12-03 22:27:44 +00:00
Shivam Mishra
2fa3cac814
feat: update workspace folders
2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86
feat: rename desk page to workspace
2020-12-03 15:39:53 +05:30
Deepesh Garg
12b45b3f2a
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-02 12:46:23 +05:30
Deepesh Garg
59820004b8
fix: Exception naming
2020-12-02 12:34:59 +05:30
Deepesh Garg
ab5053ef9c
fix: Accounting dimension import in PCV
2020-12-02 12:34:40 +05:30
Shivam Mishra
9aaca25edb
feat: update desk page json
2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c
chore: update all desk pages
2020-12-01 12:51:38 +05:30
Afshan
ccf5dc66e2
feat: multi-currency payroll ( #23519 )
...
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* Update asset_value_adjustment.py
* patch: update columns
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* patch: update columns
* Update asset_value_adjustment.py
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: Added company field in leave encashment and employee benefit
* refactor: Refactored multi-currency payroll patch
* fix: currency column in salary register
* refactor: Refactored code for making bank and return entry against employee advance
* fix: minor cleanup
* fix: fixed translation
* fix: removed salary component type
* fix: fixed sider issues
* fix: translation and slider
* style: formatted msg
* fix: fixed slider
* fix: travis
* fix: refactor
* fix: slider
* fix: slider
* fix: slider
* fix: travis
* fix: patch
* fix: patch
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: re-run travis
* fix: rerun travis
* fix: rerun travis
* fix: rerun travis
* fix: travis rerun
* fix: increased throttle_user_limit from 60 to 100
* fix: patch
* fix: patch
* fix: assign payroll payable account as default payroll payable account in SSA
* fix: removed debugger
* fix: slider
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-01 09:11:05 +05:30
Shivam Mishra
27e7c264f2
fix: link type
2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b
feat: update desk pages
2020-11-30 14:58:00 +05:30
marination
d0ee615c2c
chore: Pricing Rule with Item Price Test
2020-11-30 14:58:00 +05:30
marination
8e2ce641c3
fix: Dont overrule Item Price via Pricing Rule Rate if 0
2020-11-30 14:58:00 +05:30
Raffael Meyer
896e4b1722
fix: improve UX of DATEV report ( #23892 )
...
* feat(DATEV Settings): button to show report
* feat(desk): add DATEV to Reports under Accounting
* fix(report DATEV): last calendar month as default
* fix: let user create DATEV Settings
(Instead of showing an error message.)
2020-11-30 14:58:00 +05:30
Raffael Meyer
1ea12079da
fix: fiscal year can be shorter than 12 months ( #23838 )
...
* fix: replace unnecessary SQL query
* feat: checkbox "Is Short Year"
Also, set checkbox and dates only once.
* fix: toggle no longer necessary
Date fields use set_only_once.
* feat: short years can be less than 12 months
* fix: if short year, don't add 12 months to start date
* test: short year
* fix: move short fiscal year to test records
2020-11-30 14:58:00 +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
6302de9290
Merge pull request #23975 from deepeshgarg007/jv_zero_value
...
fix: Validation for journal entry with 0 debit and credit values
2020-11-30 10:56:40 +05:30
Deepesh Garg
2d5530da96
fix: Invoice discounting test
2020-11-29 22:17:47 +05:30
Marica
307bd01504
Merge branch 'develop' into pr-dn-return
2020-11-25 17:24:03 +05:30
Mohammad Hasnain Mohsin Rajan
90e33e53fd
refactor: Format translation strings ( #24004 )
...
* fix: translation strings
* fix: linting
2020-11-25 15:37:54 +05:30
Prssanna Desai
e60a62bde5
fix: function imports in account_balance_timeline.py ( #24003 )
2020-11-25 15:37:02 +05:30
Mohammad Hasnain Mohsin Rajan
e15b6a91de
Filters for tax templates ( #23998 )
...
* feat: add company filter to tax templates
* fix: remove filer from PO because it is from tran
* fix: linting
* fix: solve translation string issues
* fix: remove doctype name
2020-11-25 15:36:41 +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
6b9dda5f3e
fix: Move filter setup to doctype controllers
2020-11-25 14:49:10 +05:30
Deepesh Garg
92b3449789
fix: Label changes
2020-11-25 14:01:57 +05:30
Deepesh Garg
4e991fe668
fix: Define specific exceptions and fix tests
2020-11-25 13:46:07 +05:30
Deepesh Garg
df065f7044
fix: form layout and naming fixes
2020-11-25 13:44:52 +05:30
Marica
df17b4ff83
Merge branch 'develop' into pr-dn-return
2020-11-25 10:43:55 +05:30
Nabin Hait
0508e6bdfa
fix: Added link of bank reconciliation and clearance in accounting desk page ( #23809 )
2020-11-25 09:16:12 +05:30
Raffael Meyer
fbcc3c1b70
fix: Translatable strings ( #23783 )
...
* fix: start_pattern
* fix: translatable strings
* fix: add missing semicolon (task)
* fix: add missing semicolon (setup_wizard)
* fix: text should start on the same line
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: move out HTML element as variable
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: pull out message, translate "Undo".
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: typo
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: text should start on the same line
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* Revert "fix: start_pattern"
This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d.
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-11-25 09:11:51 +05:30
Mohammad Hasnain Mohsin Rajan
e4755828c4
fix: template errors in pricing rule ( #23999 )
...
* fix: solve microtemplating errors
2020-11-24 23:31:06 +05:30
Deepesh Garg
20d6143c38
fix: Validation for journal entry with 0 debit and credit values
2020-11-21 12:09:11 +05:30
Smit Vora
8aeb340dc8
fix: add remarks to sales invoice
2020-11-19 19:18:48 +05:30
Rohit Waghchaure
f0b1670abc
fix: tds test case
2020-11-19 18:40:13 +05:30
Marica
9b897c4073
Merge branch 'develop' into pr-dn-return
2020-11-19 12:21:38 +05:30
Deepesh Garg
dd7a6d948c
Merge pull request #23672 from rohitwaghchaure/skip-non-apply-tds-invoices-develop
...
fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled
2020-11-19 11:27:38 +05:30
Nabin Hait
2afc0bd87b
Merge branch 'develop' into naming-series-proj
2020-11-19 08:24:32 +05:30
Rucha Mahabal
14514f776b
fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field ( #23776 )
...
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-19 08:17:16 +05:30
Deepesh Garg
f0187f6db2
Merge pull request #23447 from hasnain2808/UAE-VAT-Format
...
feat: UAE VAT 201 Report
2020-11-18 15:15:00 +05:30
Rushabh Mehta
542bc01718
fix(minor): update routes
2020-11-18 15:00:34 +05:30
Saqib
d82b76fe0a
fix: pos item search includes non stock items ( #23914 )
...
* fix: pos item search includes non stock items
* chore: add validation for non stock items
2020-11-18 11:56:49 +05:30
Deepesh Garg
350972ece4
fix: Account filters
2020-11-17 13:51:58 +05:30
Deepesh Garg
8b4d92d4fc
fix: Disable filters after test
2020-11-17 13:19:29 +05:30
Deepesh Garg
6456c3dc24
fix: Linting and test cases
2020-11-17 11:10:00 +05:30
Deepesh Garg
4bd52b4842
fix: Add test case
2020-11-16 23:01:36 +05:30
Deepesh Garg
d82c0f3bea
fix: Add disable and mandatory check for accounting dimension filters
2020-11-16 20:32:16 +05:30
Mohammad Hasnain
d2477e6cc5
fix(UAE VAT 201): remove branch parts
2020-11-16 18:47:05 +05:30
Mohammad Hasnain
2e1787300d
feat(UAE VAT 201): emirate according to branch
2020-11-16 17:36:27 +05:30
Marica
06f522cb27
Merge branch 'develop' into naming-series-proj
2020-11-16 13:32:24 +05:30
Deepesh Garg
0c6319194e
fix: GL Entry validation for dimensions
2020-11-16 13:20:19 +05:30
marination
d51c953c22
chore: Fix Tests, use project name instead of project_name field
2020-11-16 12:48:40 +05:30
rohitwaghchaure
6094d66a6d
Merge pull request #23636 from marination/item-price-pricing-rule-conflict
...
fix: Dont overrule Item Price via Pricing Rule Rate if 0
2020-11-16 12:22:30 +05:30
Deepesh Garg
9e9ea96582
fix: linting
2020-11-16 12:03:47 +05:30
Deepesh Garg
1f9b03345d
fix: Remove project filter
2020-11-16 09:55:35 +05:30
Deepesh Garg
f916bc048f
fix: Remove cost center query from doctypes
2020-11-15 22:44:39 +05:30
Deepesh Garg
96e874bfda
fix: dimension filter query
2020-11-15 22:43:01 +05:30
Deepesh Garg
8b6370bb45
feat: Add accounting dimension filter doctype
2020-11-15 22:41:36 +05:30
Raffael Meyer
7178df8567
fix: improve UX of DATEV report ( #23892 )
...
* feat(DATEV Settings): button to show report
* feat(desk): add DATEV to Reports under Accounting
* fix(report DATEV): last calendar month as default
* fix: let user create DATEV Settings
(Instead of showing an error message.)
2020-11-15 09:45:10 +05:30
Raffael Meyer
4bf09dd02b
fix: fiscal year can be shorter than 12 months ( #23838 )
...
* fix: replace unnecessary SQL query
* feat: checkbox "Is Short Year"
Also, set checkbox and dates only once.
* fix: toggle no longer necessary
Date fields use set_only_once.
* feat: short years can be less than 12 months
* fix: if short year, don't add 12 months to start date
* test: short year
* fix: move short fiscal year to test records
2020-11-15 09:32:24 +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
Marica
2b44f22cf4
Merge branch 'develop' into fix-po-no-fetching
2020-11-11 11:10:34 +05:30
Mohammad Hasnain Mohsin Rajan
72adb0b218
Merge branch 'develop' into UAE-VAT-Format
2020-11-10 09:58:45 +05:30
Anurag Mishra
91fdb7aa69
feat: added column cost_center to receivable reports ( #23835 )
2020-11-09 20:20:05 +05:30
Marica
9a3e1f6f83
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-09 14:51:20 +05:30
Marica
63d1a0436c
Merge branch 'develop' into fix-po-no-fetching
2020-11-09 12:59:10 +05:30
Marica
f72a5a6dca
Merge branch 'develop' into pr-dn-return
2020-11-09 12:19:36 +05:30
Marica
709daf354b
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-09 10:33:32 +05:30
Marica
da2c6444f6
Merge branch 'develop' into bank-link-card-desk
2020-11-09 10:29:51 +05:30
Mohammad Hasnain Mohsin Rajan
d54969bd86
Merge branch 'develop' into UAE-VAT-Format
2020-11-06 23:39:34 +05:30
Mohammad Hasnain
c5aad7b6e5
feat(UAE VAT 201): reorder desk page listing
2020-11-06 23:36:50 +05:30
Mohammad Hasnain
4d99d695a3
feat(uae vat 201): update desk page entry
2020-11-06 23:33:19 +05:30
Saqib
e0af8fe8e5
fix: auto fetch sr nos with modifed conversion factor ( #23854 )
2020-11-06 18:19:36 +05:30
Saqib
1090181204
fix: auto fetch sr nos with modifed conversion factor ( #23855 )
2020-11-06 18:19:26 +05:30
Anupam Kumar
ca9b58589b
fix: replaced formatdate -> format_date ( #23847 )
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-11-06 14:56:27 +05:30
Marica
0d441b66cd
Merge pull request #23808 from nabinhait/web-page-bank-statement-section-pre-release
...
fix: Added link of bank reconciliation and clearance in accounting desk page
2020-11-06 13:16:44 +05:30
marination
0b4946ba27
fix: Add missing links
...
- Added Bank Transaction Statement Entry and Bank Statement Settings
2020-11-06 13:15:46 +05:30
Nabin Hait
06ba92be7a
fix: Added link of bank reconciliation and clearance in accounting desk page
2020-11-06 13:15:38 +05:30
marination
427c1bb0a7
fix: Add missing links
...
- Added Bank Transaction Statement Entry and Bank Statement Settings
2020-11-06 13:08:53 +05:30
Marica
7e1511f527
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-06 12:28:55 +05:30
Anupam
c3307f7900
fix: replaced formatdate -> format_date
2020-11-06 12:28:38 +05:30
Marica
d845e8a53a
Merge branch 'develop' into pr-dn-return
2020-11-06 12:25:11 +05:30
Marica
9694432270
Merge branch 'develop' into dialog-cleanup
2020-11-06 12:19:41 +05:30
Rohit Waghchaure
88e0a64df2
added test cases
2020-11-05 20:07:27 +05:30
Rohit Waghchaure
2fe3b1807f
fix: multiple pricing rules are not working on selling side
2020-11-05 20:07:19 +05:30
Anupam Kumar
3a9dc90695
fix: fix: replaced formatdate -> format_date ( #23829 )
2020-11-05 18:51:56 +05:30
Marica
6d2bcd2404
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-05 12:25:38 +05:30
Marica
a45f98ba99
Merge branch 'develop' into pr-dn-return
2020-11-05 10:34:23 +05:30
Marica
144fef0097
Merge branch 'develop' into item-price-pricing-rule-conflict
2020-11-05 09:28:30 +05:30
Marica
364916fa7b
Merge branch 'develop' into dialog-cleanup
2020-11-05 09:27:57 +05:30
Abhishek Balam
5db99e0649
fix: code improvement, match error type for message
2020-11-04 23:43:11 +05:30
Abhishek Balam
5fe3abcfae
fix: sales person without customer link throwing keyerror
2020-11-04 23:23:34 +05:30
Rucha Mahabal
dd7f4df669
fix: Budget test cases ( #23822 )
2020-11-04 21:59:08 +05:30
Nabin Hait
da14a76ee0
fix: Added link of bank reconciliation and clearance in accounting desk page
2020-11-04 13:06:36 +05:30
rohitwaghchaure
a53454d3d1
Update test_budget.py
2020-11-04 12:06:21 +05:30
marination
574477187f
chore: Pricing Rule with Item Price Test
2020-11-03 20:22:48 +05:30
Marica
cf08f0da70
Merge branch 'develop' into item-price-pricing-rule-conflict
2020-11-03 18:29:22 +05:30
Rohit Waghchaure
c8cc4bfc56
fix: Budget test cases
2020-11-03 17:09:09 +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
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
marination
97d38548aa
chore: Purchase Invoice Get Items From cleanup
2020-10-30 17:50:25 +05:30
marination
e14fdf4a3c
chore: RFQ cleanup and Title case for 'Get Items From'
...
- Cleanup up RFQ Get Items From Dialogs
- Title cased 'Get items from' to 'Get Items From'
2020-10-30 17:06:00 +05:30
Shivam Mishra
2d1f8341f9
feat: update onboarding for accounts
2020-10-30 15:55:19 +05:30
Shivam Mishra
18ef17f3ba
feat: add tour for sales taxes template
2020-10-30 15:55:19 +05:30
Mohammad Hasnain Mohsin Rajan
30197d7fba
Merge branch 'develop' into UAE-VAT-Format
2020-10-30 10:29:56 +05:30
Rucha Mahabal
1636383120
fix: subscription test case
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-30 00:09:55 +05:30
rohitwaghchaure
445d23223b
Merge branch 'develop' into multiple-pricing-rules-are-not-applied
2020-10-29 22:25:19 +05:30
Nabin Hait
2bb110b3d1
Merge branch 'develop' into fix-po-no-fetching
2020-10-29 18:57:33 +05:30
rohitwaghchaure
d0c2700c85
fix: subscription test case ( #23763 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-29 18:52:16 +05:30
prssanna
71e5b60df1
refactor: refactor contextual print setting implementation
2020-10-29 14:19:34 +05:30
Saqib
825d79b31b
fix: pos profile has no attr 'show_only_available_items' ( #23759 )
2020-10-29 13:23:59 +05:30
Saqib
b193731158
fix: pos profile has no attr 'show_only_available_items' ( #23758 )
2020-10-29 13:23:50 +05:30
Mohammad Hasnain Mohsin Rajan
55c78b17ba
fix(UAE VAT 201): change desk page record
2020-10-29 12:43:43 +05:30
Deepesh Garg
2004f64bcd
Merge pull request #23755 from deepeshgarg007/accounting_dimension_gl_fix_v13
...
fix: Do not allow Company as accounting dimension
2020-10-29 11:58:19 +05:30
Deepesh Garg
0dcb5887f3
fix: Do not allow Company as accounting dimension
2020-10-29 11:54:14 +05:30
Deepesh Garg
ae6a51b83a
Merge pull request #23749 from deepeshgarg007/accounting_dimension_gl_fix
...
fix: Do not allow Company as accounting dimension
2020-10-28 22:05:11 +05:30
Mohammad Hasnain Mohsin Rajan
6e9e6d2491
Merge branch 'develop' into UAE-VAT-Format
2020-10-28 21:06:11 +05:30
Rohit Waghchaure
0fa741b267
added test cases
2020-10-28 17:43:36 +05:30
Deepesh Garg
94a630c255
fix: Do not allow Company as accounting dimension
2020-10-28 17:15:14 +05:30
Saqib
0d5aff54c2
fix: pos register shows cancelled documents ( #23745 )
2020-10-28 17:09:07 +05:30
Saqib
a51d9e3259
fix: pos register shows cancelled documents ( #23747 )
2020-10-28 17:08:47 +05:30
Rohit Waghchaure
a248dfb9a5
fix: multiple pricing rules are not working on selling side
2020-10-28 16:22:49 +05:30
Marica
4326d21a79
Merge branch 'develop' into purchase-invoice-payment-terms
2020-10-27 18:40:20 +05:30
Marica
cf8698fb0b
Merge branch 'develop' into pr-dn-return
2020-10-27 15:34:51 +05:30
marination
fa085d7f4b
fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt
2020-10-27 13:18:30 +05:30
Saqib
fa5fe18b70
fix error message
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-10-26 19:27:02 +05:30
Deepesh Garg
64a4437b48
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-26 18:41:32 +05:30
Afshan
3f971b2371
fix: copying po no when mapping doc
2020-10-26 16:59:57 +05:30
rohitwaghchaure
8ba05dc674
Merge branch 'develop' into skip-non-apply-tds-invoices-develop
2020-10-26 14:11:34 +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
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
ba1cca6b2d
fix: Show accounts in financial statements upto level 20 ( #23718 )
2020-10-24 22:00:32 +05:30
Marica
6f45a86920
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-23 19:56:15 +05:30
Deepesh Garg
c4be397954
Merge pull request #23439 from Mangesh-Khairnar/mpesa-integration
...
feat: M-pesa integration
2020-10-23 19:35:52 +05:30
Saqib
b4448114cf
feat: opening invoice creation tool with background jobs ( #23595 )
...
* feat: opening invoice creation tool with background jobs
* fix: tests
* fix: codacy
* fix: sider
* fix: codacy
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:32:37 +05:30
Marica
758a68da35
fix: Sequence Matcher shouldn't get None input ( #23539 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:26:43 +05:30
Michelle Alva
b39c17dd55
fix: Typo/Grammatical fixes in Settings ( #23612 )
...
* fix(Stock Settings): Type/Grammatical fixes in Settings
* fix: grammatical fixes in manufacturing settings
* fix: typo fix in accounting settings
* fix: typo fixes in HR settings
* fix: typo fixes in buying settings
* fix: typo fixes in Selling Settings
* Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Apply suggestions from code review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Apply suggestions from code review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Update accounts_settings.json
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-23 18:22:26 +05:30
Mangesh-Khairnar
675f79920e
fix: consider the existing paid payment request for phone payment channel
2020-10-23 15:41:05 +05:30
Mangesh-Khairnar
e03a02d9c0
fix: show descriptive message for missing fields
2020-10-23 13:38:55 +05:30
marination
efcc489967
fix: Cashier Closing Type Issue
2020-10-23 11:55:03 +05:30
Nabin Hait
5778595d50
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-22 21:42:54 +05:30
Mangesh-Khairnar
1a6d82a447
fix(payment-request): only consider paid transactions
2020-10-22 01:07:49 +05:30
Shivam Mishra
5e00ed926c
feat: update icons
2020-10-21 12:30:22 +05:30
Shivam Mishra
9d468a8daf
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-21 11:38:31 +05:30
Mohammad Hasnain
c08591124c
chore(UAE VAT 21): solve merge conflicts
2020-10-20 10:17:48 +05:30
Mohammad Hasnain
75ccb62d46
Merge branch 'develop' into UAE-VAT-Format
2020-10-20 09:40:44 +05:30
Mohammad Hasnain
33cdfdfb7f
feat(UAE VAT 201): Add tests for report
2020-10-19 20:48:43 +05:30
Mangesh-Khairnar
5c29eb08c4
Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration
2020-10-19 18:29:46 +05:30
Mangesh-Khairnar
ebb8ee3dc6
fix(payment gateway account): add patch to set the payment channel as email
2020-10-19 18:27:40 +05:30
Joseph Marie Alba
8115be58a3
fix: Posting Date bug in load_defaults ( #23415 )
...
this.frm.posting_date is always invalid and should be changed to this.frm.doc.posting_date
The effect of this bug fix is, a default Posting Date value may now be set in Custom Script's onload event, and the default value will be honored.
Example: (Assuming posting date has been included in standard filter)
```
frappe.ui.form.on('Journal Entry', {
before_load(frm) {
var posting_date = $("input[data-fieldname='posting_date']")[0].value
posting_date = moment(posting_date)._d
frm.set_value('posting_date', posting_date )
}
})
```
Without the fix, the posting date will always be today's date. With the bug fix, the default value for posting date which is taken from the posting date's Standard Filter vale is honored.
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-19 17:02:04 +05:30
Glen Whitney
f5a8dc0f9c
fix(Bank Reconciliation): update/merge CR/DR journal entry search ( #23629 )
...
* fix(Bank Reconciliation): update/merge CR/DR journal entry search
Prior to this commit, the debit journal entry search (for
credit-side Bank Transaction entries) and the corresponding
credit journal entry search had diverged, with the latter
working but the former not working. Thus, the search for
journal entries matching a credit Bank Transaction (for the
purposes of reconciliation) was never returning any matching
journal entries, making reconciliation difficult.
To fix this, this commit not only updates the debit journal
entry search, but takes advantage of the fact that the two SQL
queries for the two sides (debit/credit) differ only by the
word "debit" or "credit," to merge the code for the two
queries, making the code more DRY and hopefully reducing the
chance of similar bugs occurring in the future.
* fix: message translation
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-19 16:49:55 +05:30
Shivam Mishra
2c2e7297ae
feat: update accounts onboarding
2020-10-19 14:44:02 +05:30
Saqib
896a0cc1f7
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-19 11:55:12 +05:30
Rucha Mahabal
c3b1aef9f9
fix(minor): msgprint not defined in POS Invoice ( #23680 )
...
* fix(minor): msgprint not defined in POS Invoice
* fix: translation friendly syntax
2020-10-18 19:28:26 +05:30
Faris Ansari
c6f4e84a45
Merge pull request #23640 from abhishekbalam/address_customisation
2020-10-16 18:21:09 +05:30
Marica
569e218aa0
Merge pull request #23666 from marination/payment-reco-mandatory-check
...
fix: Payment Reconciliation client side validations
2020-10-16 18:06:16 +05:30
Rohit Waghchaure
c70cc0d950
fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled
2020-10-16 17:43:36 +05:30
rohitwaghchaure
6646c524e6
Merge pull request #23670 from rohitwaghchaure/enabled-no-copy-for-bill-date-devlop
...
refactor: enabled no copy property for Supplier Invoice Date to due date validation
2020-10-16 16:45:56 +05:30
marination
b14ffc4349
fix: Missing semicolon
2020-10-16 16:04:56 +05:30
Faris Ansari
be0fcbea68
fix: Dont add Contact link if is company address
2020-10-16 15:55:25 +05:30
Faris Ansari
22bcad9dc7
fix: Cleanup code
2020-10-16 15:28:12 +05:30
Rohit Waghchaure
3cdaa92582
refactor: enabled no copy property for Supplier Invoice Date to avoid due date validation
2020-10-16 15:26:27 +05:30
Shivam Mishra
5418818683
feat: add tour for account settings
2020-10-16 14:24:22 +05:30
marination
e9b04dc727
fix: Payment Reconciliation client side validations
2020-10-16 12:36:13 +05:30
Saqib Ansari
de505631a6
fix: codacy
2020-10-16 11:30:34 +05:30
Saqib Ansari
1dec68e8e4
fix: transalation syntax
2020-10-16 10:47:29 +05:30
Shivam Mishra
cb8457b9ae
feat: add description to Accounts onboarding
2020-10-15 13:53:12 +05:30
Wolfram Schmidt
3959ed5bef
Update payment_term.json ( #23644 )
...
added descriptions to fields to clarify input.
2020-10-14 22:48:46 +05:30
Deepesh Garg
ddccec4f5d
Merge pull request #23643 from deepeshgarg007/payment_reco_cancel
...
fix: Do not get cancelled vouchers in Payment Reconciliation
2020-10-14 22:09:08 +05:30
Deepesh Garg
37c2ed269e
fix: Do not get cancelled vouchers in Payment Reconciliation
2020-10-14 21:47:43 +05:30
Abhishek Balam
89419c9a30
fix: move get_shipping_address() from frappe to erpnext and fix references
2020-10-14 20:09:05 +05:30
Abhishek Balam
2f528c1c73
fix: gettext import and changed function order in address.py
2020-10-14 19:48:57 +05:30
Abhishek Balam
6e9e7b4c7a
fix: serverside validation overrides
2020-10-14 19:31:37 +05:30
Abhishek Balam
346ca568b7
fix: set company link in address when is_your_company_address is set
2020-10-14 18:11:04 +05:30
Nabin Hait
a2d6f254c5
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-14 16:34:56 +05:30
Saqib
577a7fe01d
fix: stock & account balance difference in fraction ( #23635 )
2020-10-14 15:44:30 +05:30
Marica
1cdb9b5b39
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-14 14:26:22 +05:30
marination
b5d16a82eb
fix: Dont overrule Item Price via Pricing Rule Rate if 0
2020-10-14 14:05:54 +05:30
Mohammad Hasnain
dfc3993cec
chore(UAE VAT 21): rename report
2020-10-14 12:21:36 +05:30
Raffael Meyer
d1863e6f9e
fix: Chart of Accounts ( #23530 )
...
* fix: Chart of Accounts
* fix: Chart of Accounts with lower case "of"
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-14 10:29:53 +05:30
Mohammad Hasnain Mohsin Rajan
abf628c95d
Merge branch 'develop' into UAE-VAT-Format
2020-10-14 00:26:57 +05:30
Saqib
639eea142f
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-13 21:42:22 +05:30
Sun Howwrongbum
93da52941e
fix: consider rounded_total in returns ( #23609 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-13 21:23:26 +05:30
Shivam Mishra
55f52e8135
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-13 20:09:22 +05:30
Mangesh-Khairnar
51228b5ee3
fix: make response handling more descriptive
2020-10-13 17:10:16 +05:30
Marica
43d3176d62
Merge branch 'develop' into patch-3
2020-10-13 17:01:18 +05:30
