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 |
|
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 |
|
Rohit Waghchaure
|
30fda3ee54
|
feat: Added bank account no in bank reconcilliation
|
2019-04-09 18:58:23 +05:30 |
|
Mangesh-Khairnar
|
16c4fd6733
|
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
|
2019-04-09 12:13:45 +05:30 |
|
rohitwaghchaure
|
bc02ee23e0
|
Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order
feat: provision to unlink advance payment entry on cancelation of order
|
2019-04-06 12:30:05 +05:30 |
|
Rohit Waghchaure
|
9835c89e17
|
Added test cases
|
2019-04-06 12:29:05 +05:30 |
|
Nabin Hait
|
374b85b38e
|
Merge pull request #17140 from hrwX/pe_supp_inv_v12
fix(Payment Entry): Return Bill No on for Payment Entry
|
2019-04-05 15:59:58 +05:30 |
|
Mangesh-Khairnar
|
3d667b4c94
|
Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold
|
2019-04-05 12:11:26 +05:30 |
|
Himanshu Warekar
|
b30f584410
|
fix: return bill_no
|
2019-04-04 19:55:13 +05:30 |
|
Himanshu Warekar
|
6443d7dd10
|
refactor: declare bill_on at function start
|
2019-04-04 19:54:23 +05:30 |
|
Himanshu Warekar
|
ad32324c4c
|
fix: get bill_no
|
2019-04-04 19:50:23 +05:30 |
|
Rohit Waghchaure
|
55d3bcac37
|
fix: not able to change pos profile
|
2019-04-04 15:26:00 +05:30 |
|
Nabin Hait
|
0747273ea4
|
Merge pull request #17028 from sagarvora/field_order
fix(accounts): dependent field should be displayed after source link field
|
2019-04-04 11:45:01 +05:30 |
|
Nabin Hait
|
94c822f5f0
|
Merge pull request #17022 from hrwX/cost_center_fix
fix(Purchase Invoice): Cost Centre as per company
|
2019-04-04 11:43:44 +05:30 |
|
Nabin Hait
|
9eeb3715f0
|
Merge pull request #16992 from hrwX/cost_center
fix(Purchase Invoice): Cost Centre as per company
|
2019-04-04 11:43:35 +05:30 |
|
Nabin Hait
|
f4ae29320f
|
Merge pull request #17087 from deepeshgarg007/payment_entry
Party type validation in payment entry
|
2019-04-04 11:39:00 +05:30 |
|
Nabin Hait
|
2092a8b1cf
|
Merge pull request #17100 from nabinhait/gl-entry-precision
fix: Validate gl entry debit/credit as per field's precision
|
2019-04-04 10:59:06 +05:30 |
|
Nabin Hait
|
b1f3f04d71
|
fix: Validate gl entry debit/credit as per field's precision
|
2019-04-03 12:30:25 +05:30 |
|
Nabin Hait
|
b4263a41c6
|
fix: Validate gl entry debit/credit as per field's precision
|
2019-04-01 19:11:34 +05:30 |
|
Rohit Waghchaure
|
6f3f2185ab
|
fix: pos takes more time to add an item in the cart
|
2019-04-01 16:45:47 +05:30 |
|
deepeshgarg007
|
4614eb219b
|
Merge branch 'hotfix' of https://github.com/frappe/erpnext into payment_entry
|
2019-04-01 11:48:07 +05:30 |
|
Rohit Waghchaure
|
614f5adf6d
|
fix: code cleanup
|
2019-04-01 10:53:08 +05:30 |
|
Rohit Waghchaure
|
5fa9a7a1b4
|
feat: unlink advance payment entry on cancelation of order
|
2019-04-01 00:40:38 +05:30 |
|
Rohit Waghchaure
|
e540534e42
|
fix: Pricing rule not working for POS
|
2019-03-31 17:13:18 +05:30 |
|
deepeshgarg007
|
d0b98d74de
|
fix: Allow doctype only in party account types
|
2019-03-30 19:44:31 +05:30 |
|
rohitwaghchaure
|
43d79eaa92
|
Merge pull request #17057 from hrwX/bank_reconciliation_fix
fix(Bank Reconciliation): get credit and debit as float and not string
|
2019-03-30 10:16:12 +05:30 |
|
rohitwaghchaure
|
9d159be826
|
Merge pull request #17064 from rohitwaghchaure/not_able_to_create_chart_of_account
fix: user not able to create chart of account in parent if child has no chart of account
|
2019-03-30 10:14:19 +05:30 |
|
Rohit Waghchaure
|
cc59fcd75e
|
fix: user not able to create chart of account in parent if child has no chart of account
|
2019-03-29 19:23:04 +05:30 |
|
Rohit Waghchaure
|
fd2b1385a3
|
fix: user not able to create chart of account in parent if child has no chart of account
|
2019-03-29 19:20:47 +05:30 |
|
Himanshu Warekar
|
95003cbbca
|
fix: get credit and debit as float and not string
|
2019-03-29 16:21:59 +05:30 |
|
Himanshu Warekar
|
f7f85f7379
|
fix: get credit and debit in float and not string
|
2019-03-29 16:19:15 +05:30 |
|
Nabin Hait
|
d4e038b6ca
|
Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop
|
2019-03-29 12:41:48 +05:30 |
|
Nabin Hait
|
cf7538c17f
|
Merge pull request #17046 from nabinhait/deferred_revenue
Refactor: deferred revenue booking logic
|
2019-03-29 12:39:36 +05:30 |
|
Rohit Waghchaure
|
573d1dd31f
|
fix: bank reconciliation not working
|
2019-03-28 20:39:49 +05:30 |
|
Nabin Hait
|
0a90ce5cf6
|
Refactored deferred revenue booking logic
|
2019-03-28 19:43:02 +05:30 |
|
Rohit Waghchaure
|
d5e45481cd
|
fix: code cleanup
|
2019-03-28 17:09:57 +05:30 |
|
rohitwaghchaure
|
a8c9b81d93
|
Merge pull request #17040 from rohitwaghchaure/pricing_rule_not_working_for_item_groups
fix: pricing rule mixed connditions not working for item group
|
2019-03-28 16:52:55 +05:30 |
|
Rohit Waghchaure
|
39a41e7427
|
fix: pricing rule mixed connditions not working for item group
|
2019-03-28 16:51:57 +05:30 |
|
Saurabh
|
84a18f5b18
|
Merge branch 'master' into develop
|
2019-03-28 13:54:34 +05:30 |
|
Suraj Shetty
|
abc2a64d5e
|
fix: Commonify get gl_entry code by moving it to accounts_controller
|
2019-03-27 20:25:18 +05:30 |
|
Sagar Vora
|
d20ecb0a71
|
fix(accounts): dependent field should be displayed after source link field
|
2019-03-27 17:42:42 +05:30 |
|