Marica
|
2d4a3498e9
|
Merge pull request #23735 from marination/purchase-invoice-payment-terms
fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt
|
2020-11-09 16:09:19 +05:30 |
|
Marica
|
9a3e1f6f83
|
Merge branch 'develop' into purchase-invoice-payment-terms
|
2020-11-09 14:51:20 +05:30 |
|
Shivam Mishra
|
723e220a34
|
chore: remove commented code
|
2020-11-09 14:07:40 +05:30 |
|
Shivam Mishra
|
12fafa3e7a
|
chore: remove validation for old member field
|
2020-11-09 14:07:39 +05:30 |
|
Shivam Mishra
|
7e1cdf9b97
|
feat(breaking): update get_last_membership to fetch correct details
|
2020-11-09 14:07:39 +05:30 |
|
Shivam Mishra
|
c04321e645
|
test(membership): add test for invoicing and validation
|
2020-11-09 14:06:53 +05:30 |
|
Shivam Mishra
|
286ec04197
|
test(membership): setup test defaults
|
2020-11-09 14:06:23 +05:30 |
|
Shivam Mishra
|
e0f4dd0643
|
fix: fieldtype for auto_create_for_web_forms
|
2020-11-09 14:06:23 +05:30 |
|
Shivam Mishra
|
9d9fa74e6b
|
refactor(member): drop email column
* remove email column
* update controller methods
* add patch to add value from email to email_id
|
2020-11-09 14:06:23 +05:30 |
|
Shivam Mishra
|
d75ff1a93e
|
feat: generate invoice on payment authorized
|
2020-11-09 14:06:23 +05:30 |
|
Shivam Mishra
|
e927224fbc
|
feat: update membership setting doctype
* rename enable_auto_invoicing to enable_invoicing
* add option to make_payment entry
|
2020-11-09 14:05:39 +05:30 |
|
Suraj Shetty
|
1183980e0e
|
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
|
2020-11-09 13:14:11 +05:30 |
|
Marica
|
63d1a0436c
|
Merge branch 'develop' into fix-po-no-fetching
|
2020-11-09 12:59:10 +05:30 |
|
rohitwaghchaure
|
94bfa6a659
|
Merge pull request #23843 from frappe/datev_check_fiscal_year
feat: validate fiscal year
|
2020-11-09 12:33:15 +05:30 |
|
rohitwaghchaure
|
af840ddec1
|
Merge pull request #23850 from marination/bank-link-card-desk
fix: Added link of bank reconciliation and clearance in accounting desk page
|
2020-11-09 12:31:54 +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 |
|
Deepesh Garg
|
29a8994506
|
Merge pull request #23832 from deepeshgarg007/india_tax_template_fetch
fix: Auto Statewise gst tax template
|
2020-11-08 17:48:57 +05:30 |
|
Deepesh Garg
|
dd94587ef8
|
fix: Loan write off precision issue
|
2020-11-07 17:08:30 +05:30 |
|
Deepesh Garg
|
2ad015450e
|
fix: Remarks fix
|
2020-11-07 00:14:40 +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 |
|
Saurabh
|
7c06c28216
|
fix: merge-conflicts
|
2020-11-06 19:08:58 +05:30 |
|
Saurabh
|
e7ab61da9a
|
bumped to version 13.0.0-beta.5
|
2020-11-06 19:23:55 +05:50 |
|
rohitwaghchaure
|
8cbcd54f3b
|
chore: change log for v13-beta-pre-release-5 (#23846)
|
2020-11-06 18:48:34 +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 |
|
Deepesh Garg
|
b4774ae65d
|
Merge pull request #23852 from frappe/pre-release
fix: [revert] provision to draft quotation from portal
|
2020-11-06 17:59:00 +05:30 |
|
rohitwaghchaure
|
471341fb87
|
Merge pull request #23849 from anupamvs/formatdate
fix: replaced formatdate -> format_date
|
2020-11-06 17:47:08 +05:30 |
|
Deepesh Garg
|
3899079bb9
|
fix: Loan seurity unpledge msg improvement
|
2020-11-06 17:39:54 +05:30 |
|
Anupam Kumar
|
bdb8a4023a
|
Delete test_parameter.py
|
2020-11-06 17:13:02 +05:30 |
|
Anupam Kumar
|
a739554b7d
|
Delete parameter.py
|
2020-11-06 17:12:44 +05:30 |
|
Anupam Kumar
|
c7f8204997
|
Delete parameter.json
|
2020-11-06 17:12:21 +05:30 |
|
Anupam Kumar
|
b4bad63e25
|
Delete parameter.js
|
2020-11-06 17:11:47 +05:30 |
|
Anupam Kumar
|
ec7002625f
|
Delete __init__.py
|
2020-11-06 17:11:33 +05:30 |
|
Anupam
|
14ef229b12
|
Revert "Update item_add_to_cart.html"
This reverts commit 5b3af82e75.
|
2020-11-06 16:50:15 +05:30 |
|
Anupam
|
886b680e1b
|
revert changes
|
2020-11-06 16:48:39 +05:30 |
|
Anupam
|
beba8da0a6
|
Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into pre-release
|
2020-11-06 16:38:16 +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 |
|
Deepesh Garg
|
3e69756e15
|
fix: Add better remarks for Loan GL entries
|
2020-11-06 14:25:09 +05:30 |
|
Marica
|
d07f6b7ef6
|
Merge pull request #23848 from AfshanKhan/fix-stock-mismatch-filter-pre-release
fix: showing error for wrong filters.
|
2020-11-06 13:42:07 +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 |
|
Afshan
|
4d3e83682e
|
fix: showing error for wrong filters.
|
2020-11-06 12:25:46 +05:30 |
|