Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,621 Commits 3 Branches 0 Tags 1 GiB
b8d0dec7f5
Commit Graph

4584 Commits

Author SHA1 Message Date
Mangesh-Khairnar
b8d0dec7f5 feat: filter bank from company account 2019-05-07 11:29:20 +05:30
Mangesh-Khairnar
e8bea2e936 feat: set payment order type on mapping 2019-05-06 19:54:11 +05:30
Mangesh-Khairnar
f709f330ce feat: show generate txt button for payment entry 2019-05-06 19:50:17 +05:30
Mangesh-Khairnar
525d8cefc1 fix: post process mapping 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
c448664e6b feat: generate file name 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
0fac6f1c4b feat: check bulk update option 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
08a375beb8 feat: add advice row 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
6bc48b8bfb fix: pass account paid information to postprocess 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
07a5471dd2 feat: add payment entry field 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
e56eaf6364 perf: improve mapping function speed 2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
48d88b0478 feat: add generate txt file button for india region 2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
0faf9f5f8c feat: add mapping logic for creating payment order 2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
f5a1bea189 feat: create payment order from payment entry 2019-05-05 22:37:20 +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
deepeshgarg007
6c6b24011f Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop 2019-05-02 23:03:59 +05:30
Saurabh
7c5d3873fe
Merge branch 'develop' into auto-account-creation-company-tree-dev 2019-05-02 12:01:46 +05:30
Rushabh Mehta
27a30c842d fix: simplify sort condition 2019-05-02 09:23:56 +05:30
Nabin Hait
7ca243094e
Merge branch 'develop' into coa-sorting 2019-05-02 00:58:56 +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
deepeshgarg007
1cfe96193f Merge branch 'develop' of https://github.com/frappe/erpnext into rename_report_develop 2019-05-01 18:14:07 +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
deepeshgarg007
db999e293b fix: Rename Inactive Items report to Inactive Sales Item 2019-05-01 14:06:06 +05:30
Rushabh Mehta
43958dcd11 fix(minor): chart of accounts sorting and message 2019-05-01 13:53:05 +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
1d21d89d2f
Merge pull request #17378 from rohitwaghchaure/trial_balance_error_finance_book_develop 
fix: Trial balance finance book issue
 2019-04-25 20:34:38 +05:30
Rohit Waghchaure
c181064782 fix: Trial balance finance book issue 2019-04-25 17:51:09 +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
Nabin Hait
8624957cbc
Merge pull request #17291 from prasadarr/listing-fixes 
fix: Allow system manager to access share ledger
 2019-04-22 15:35:35 +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
d21bacfc21 fix: Total row alignment in AR report 2019-04-20 10:58:58 +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