Suraj Shetty
|
b68ae15dec
|
fix: Check permissions before renaming the account
|
2019-05-10 14:42:07 +05:30 |
|
Suraj Shetty
|
699f132d05
|
fix: Show "Merge Account" button only to users with write access
|
2019-05-10 14:41:40 +05:30 |
|
Himanshu
|
5cf12a4640
|
fix(Purchase Order): fetch payment terms (#17121)
* fix: fetch payment terms
* fix: test fixes
* fix: test cases
* fix: test case
* fix: check for payment terms fetching
* fix: test cases
* refactor: fetch payment terms in account settings
* fix: add fetch terms to account settings
|
2019-05-04 22:37:35 +05:30 |
|
Saurabh
|
7c5d3873fe
|
Merge branch 'develop' into auto-account-creation-company-tree-dev
|
2019-05-02 12:01:46 +05:30 |
|
Nabin Hait
|
9d04b67f46
|
fix: Validate parent account of child company while creating new account based on parent company
|
2019-05-01 20:26:36 +05:30 |
|
Nabin Hait
|
9ccdf594c3
|
Merge pull request #17445 from rmehta/refactor-child-tables
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
|
2019-05-01 19:31:00 +05:30 |
|
Rushabh Mehta
|
c3aecb1fbd
|
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
|
2019-05-01 18:04:22 +05:30 |
|
Nabin Hait
|
dc86bc756e
|
Merge pull request #17441 from nabinhait/pe-ref-exchange-rate-dev
fix: Always fetch exchange rate from ref document
|
2019-05-01 17:18:35 +05:30 |
|
Aditya Hase
|
8b8e3e7890
|
Merge pull request #17424 from adityahase/fix-py3-misc
fix: Python 3 compatibility fixes
|
2019-05-01 16:45:11 +05:30 |
|
Nabin Hait
|
6d9334810e
|
fix: reverted fetch from as the field does not exists for some ref doctypes
|
2019-05-01 15:40:00 +05:30 |
|
Nabin Hait
|
3191d072f0
|
fix: Always fetch exchange rate from ref document
|
2019-05-01 15:37:03 +05:30 |
|
Nabin Hait
|
316c3b3f9d
|
fix: Fetch exchange rate from invoice on server side
|
2019-05-01 13:34:17 +05:30 |
|
Aditya Hase
|
ee0093c593
|
Merge branch 'develop' into fix-py3-misc
|
2019-05-01 11:55:28 +05:30 |
|
Aditya Hase
|
234d35781c
|
fix: Python 3 compatibility fixes
import reduce from functools
Undefined variable
|
2019-05-01 11:52:37 +05:30 |
|
Nabin Hait
|
39f58ae92b
|
Merge pull request #17392 from ashish-greycube/develop_allow_bank_account_import
fix: allow_import_of_bank_account_by_account_manager
|
2019-05-01 11:16:33 +05:30 |
|
Nabin Hait
|
8dc7401ddf
|
Merge pull request #17388 from ashish-greycube/correct_party_type_values
fix: show only party_type doctypes in Party Type field of bank account
|
2019-05-01 11:15:02 +05:30 |
|
Faris Ansari
|
1e55c2e713
|
Remove old style custom scripts (#17077)
* fix: Move Newsletter script from frappe to erpnext
* fix: Remove old style client scripts
* C-Form
* fix: Cost Center
* fix: Fiscal Year
* fix: Monthly Distribution
* fix: Payment Gateway Account
* fix: Pricing Rule
* fix: Missing semicolon
|
2019-04-30 10:18:09 +05:30 |
|
ashish-greycube
|
e4e8197f46
|
codacy review
|
2019-04-26 14:06:21 +05:30 |
|
ashish-greycube
|
0ed9ec9a03
|
fix : allow_import_of_bank_account_by_account_manager
|
2019-04-26 12:42:14 +05:30 |
|
ashish-greycube
|
467609b193
|
show only party_type doctypes in Party Type field of bank account
|
2019-04-26 11:35:04 +05:30 |
|
Nabin Hait
|
4fcefda6c7
|
Merge pull request #17332 from deepeshgarg007/automatic_so_po
feat: Automatic inter company Sales and Purchase order
|
2019-04-26 00:24:08 +05:30 |
|
Nabin Hait
|
4a994d4eb8
|
fix: Don't allocate advance if pos
|
2019-04-25 17:49:38 +05:30 |
|
deepeshgarg007
|
f34e4f0e36
|
fix: Test case for inter-company-transaction
|
2019-04-25 14:28:57 +05:30 |
|
deepeshgarg007
|
4a4ce12eb4
|
fix: Commonfied code for inter-company-transaction
|
2019-04-25 14:28:19 +05:30 |
|
Nabin Hait
|
aa028d7856
|
fix: don't allocate advances if POS
|
2019-04-23 21:44:21 +05:30 |
|
Saif Ur Rehman
|
a216844d2c
|
fix: Set Allocate Advance Automatically disabled by default
|
2019-04-22 12:10:40 +05:00 |
|
Faris Ansari
|
733ff48d51
|
fix: Refactor for Print Format changes (#17242)
- Rename Server to Jinja
- Rename Js to JS
|
2019-04-22 12:08:18 +05:30 |
|
Nabin Hait
|
c8b1351e87
|
fix: fetch party account as discounted receivable account in payment entry
|
2019-04-19 21:33:29 +05:30 |
|
Nabin Hait
|
4a5bed5c07
|
fix: fetch party account as discounted receivable account in payment entry
|
2019-04-19 21:33:29 +05:30 |
|
Nabin Hait
|
06f992f850
|
Merge pull request #17299 from nabinhait/inv-disc-fixes
fix: Close loan considering latest invoice outstanding balance
|
2019-04-19 21:27:02 +05:30 |
|
Nabin Hait
|
d2797be1cd
|
fix: Close loan considering latest inv outstanding balance
|
2019-04-19 15:33:05 +05:30 |
|
Nabin Hait
|
8da71cebb7
|
fix: test cases
|
2019-04-19 15:10:02 +05:30 |
|
Nabin Hait
|
c99c712913
|
fix: Validate and update invoice discounting status on JE submit/cancel
|
2019-04-18 15:52:50 +05:30 |
|
Nabin Hait
|
8170585faf
|
fix: Don't fetch already discounted invoice
|
2019-04-18 15:13:18 +05:30 |
|
Nabin Hait
|
36bb3f55f2
|
fix: Added invoice discounting dashboard
|
2019-04-18 14:47:44 +05:30 |
|
Nabin Hait
|
076cc38c29
|
fix: Outstanding amount on making payment against discounted invoice
|
2019-04-15 18:42:10 +05:30 |
|
Nabin Hait
|
d584cfbf43
|
Fixed merge conflict
|
2019-04-15 16:16:25 +05:30 |
|
Nabin Hait
|
9fd3f10b67
|
Merge pull request #17220 from Anurag810/payment-entry-fix
fix: handle for party type member in payment entry (v12)
|
2019-04-15 10:06:08 +05:30 |
|
rohitwaghchaure
|
033b1babe8
|
Merge pull request #17186 from rohitwaghchaure/bank_account_in_bank_reconcilliation
feat: Added bank account no in bank reconcilliation
|
2019-04-14 16:10:19 +05:30 |
|
Anurag Mishra
|
95714297a4
|
fix: handle for party type member in payment entry
|
2019-04-12 15:03:46 +05:30 |
|
Nabin Hait
|
165e92ad5b
|
Merge pull request #17210 from rohitwaghchaure/fix_taxes_and_charges_are_adding_multiple_times
fix: Taxes and charges table not clear the existing rows if the template is changed
|
2019-04-12 11:02:37 +05:30 |
|
Rohit Waghchaure
|
72cc37e8da
|
fix: Taxes and charges table not clear the existing rows if the template is changed
|
2019-04-11 18:35:15 +05:30 |
|
Mangesh-Khairnar
|
3ab2a18088
|
Merge branch 'develop' into so-on-hold
|
2019-04-11 15:49:06 +05:30 |
|
Faris Ansari
|
6472ed2c1e
|
Merge pull request #16941 from Mangesh-Khairnar/po-on-hold
Feature: Purchase order on hold
|
2019-04-11 15:36:54 +05:30 |
|
Nabin Hait
|
89206e74d0
|
fixed merge conflict
|
2019-04-11 12:31:14 +05:30 |
|
Anurag Mishra
|
4c29d80cf1
|
fix: minor fixes
|
2019-04-11 11:14:32 +05:30 |
|
Anurag Mishra
|
accf310aa3
|
fix: start date and loan period should be mandatory
|
2019-04-11 11:08:07 +05:30 |
|
rohitwaghchaure
|
6cd114b467
|
Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
|
2019-04-11 09:57:45 +05:30 |
|
Rohit Waghchaure
|
49907e746b
|
fix: test cases
|
2019-04-10 17:33:32 +05:30 |
|
Rohit Waghchaure
|
b286fc99b8
|
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
|
2019-04-10 16:16:30 +05:30 |
|