Aditya Hase
ba61be93ae
refactor: Major changes
2019-04-29 06:00:27 +05:30
Aditya Hase
b6e9eb9784
feat(tally): Preprocess and create items and uoms
2019-04-28 19:24:58 +05:30
Aditya Hase
27ab5b540b
fix(tally): Use LEDSTATENAME instead of STATENAME
2019-04-28 19:24:58 +05:30
Aditya Hase
f2202cf638
feat(tally): Preprocess and create parties and addresses
2019-04-28 19:24:58 +05:30
Aditya Hase
0668482f82
feat(tally): Create chart of accounts from tally master data
2019-04-28 19:24:58 +05:30
Aditya Hase
55d465f3ad
feat(tally): Preprocess master data to generate COA
2019-04-28 19:24:58 +05:30
Aditya Hase
9a84a99ac0
feat(tally): Add Tally Migration DocType
2019-04-28 19:24:58 +05:30
Mangesh-Khairnar
96661ba847
feat: add filters for multiple company operation
2019-04-28 17:11:28 +05:30
Chinmay Pai
b503896594
fix(demo): make demo work again
...
definitely not a maga rebranding.
* import erpnext and set default company for accounts
* replace job card start/end date with job card time log
* create a doc for lost_reason
* pass opportunity/quotation lost_reason as a list of dicts
* fix company in stock reconciliation
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-04-27 01:39:50 +05:30
deepeshgarg007
c23b70950e
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
2019-04-26 16:43:06 +05:30
Mangesh-Khairnar
9cd9671bb5
fix: minor changes
2019-04-26 16:02:25 +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
rohitwaghchaure
fa626bd3ab
Merge pull request #17372 from rohitwaghchaure/fix_straight_line_asset_depreciation_develop_v12
...
fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined
2019-04-26 12:04:32 +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
Shivam Mishra
53493bd67d
Merge pull request #17383 from scmmishra/lms-fixes-1
...
fix: Minor UI fixes in LMS
2019-04-26 11:10:10 +05:30
Shivam Mishra
377b230e41
Merge branch 'develop' into lms-fixes-1
2019-04-26 08:42:33 +05:30
Mangesh-Khairnar
da7b1673c3
test: track pi and pr changes
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
869544c0bc
fix: add mapped records as functions
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
438fa620b0
feat: fetch purchase invoice and purchase receipt records for actual cost calculation
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
fcd0edf415
test: compare expected data to generated data
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
46b9204e9d
feat: fetch data from budget records for cost estimation
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
5de08f71c5
feat: fetch all required fields from po
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
69909c0f51
feat: create procurement tracker report
2019-04-26 01:31:16 +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
5c4b7b32a1
Merge pull request #17373 from netchampfaris/item-attribute-order-dynamic
...
fix: Order Item attribute values dynamically
2019-04-26 00:21:39 +05:30
Nabin Hait
4c31acf5e4
Merge pull request #17382 from nabinhait/tax-exemption-dev
...
refactor: Employee Tax Exemption (develop)
2019-04-26 00:20:46 +05:30
Nabin Hait
ec7a18737b
fix: test cases
2019-04-25 22:30:23 +05:30
Nabin Hait
6adfc5618d
fix: test cases
2019-04-25 21:42:26 +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
Nabin Hait
c245ed88b5
Merge pull request #17379 from nabinhait/pos-advance-dev
...
fix: Don't allocate advance if pos
2019-04-25 20:33:41 +05:30
Nabin Hait
49446ba760
fix: test cases
2019-04-25 19:54:49 +05:30
Shivam Mishra
9fe7257bfc
fix (ui): refactored breadcrumbs
2019-04-25 19:44:37 +05:30
Shivam Mishra
2428485ebb
fix (ui): Card layout
2019-04-25 19:33:22 +05:30
Shivam Mishra
37a55345fd
feat: removed home page for lms role
2019-04-25 19:29:56 +05:30
Nabin Hait
04e7bf464f
refactor: Employee Tax Exemption
2019-04-25 18:53:39 +05:30
Nabin Hait
e70696e111
Merge branch 'develop' into pos-advance-dev
2019-04-25 17:53:56 +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
ce809d57a2
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
2019-04-25 14:29:31 +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
Faris Ansari
dd201b0797
fix: Order Item attribute values dynamically
2019-04-25 13:03:50 +05:30
Rohit Waghchaure
9c1fa77f4e
fixed test cases
2019-04-25 11:57:27 +05:30
Rohit Waghchaure
691e03a36b
fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined
2019-04-25 11:57:20 +05:30
Nabin Hait
07e005f963
Merge pull request #17350 from nabinhait/item-tax-patch
...
fix: create account if not exists in item tax patch
2019-04-25 10:40:46 +05:30
Nabin Hait
8784b0b134
Update move_item_tax_to_item_tax_template.py
2019-04-25 10:40:34 +05:30
deepeshgarg007
fef14182b7
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
2019-04-25 08:27:40 +05:30
Nabin Hait
2cb57dc3e7
Update move_item_tax_to_item_tax_template.py
2019-04-24 23:34:04 +05:30
Nabin Hait
d828f84da6
Merge pull request #17359 from netchampfaris/item-attribute-order-fix
...
fix: Item Attribute Order
2019-04-24 23:16:34 +05:30
