deepeshgarg007
|
acc2422167
|
Merge branch develop into dimensions
|
2019-05-28 12:18:32 +05:30 |
|
Nabin Hait
|
ca8dae183a
|
Merge branch 'develop' into opening-stock-entry-dev
|
2019-05-27 11:50:16 +05:30 |
|
Nabin Hait
|
5cd04a6d30
|
fix: payment reconciliation against expense claim (#17729)
* fix: payment reconciliation against expense claim
* feat: Added dashboard for expense claim
|
2019-05-27 11:44:06 +05:30 |
|
deepeshgarg007
|
d330519f7c
|
fix: Merge branch develop into dimensions
|
2019-05-25 18:18:08 +05:30 |
|
Nabin Hait
|
8770ea2631
|
fix: Opening accounting entry for stock entry
|
2019-05-23 11:15:04 +05:30 |
|
deepeshgarg007
|
3d11ac0e75
|
fix: Accounting dimensions for child tables
|
2019-05-19 00:02:01 +05:30 |
|
Nabin Hait
|
3f119ec256
|
fix: GL Entry for opening stock reconciliation
|
2019-05-16 17:29:10 +05:30 |
|
rohitwaghchaure
|
d07a3e1de2
|
fix: limit offset was missing in the get_delivery_notes_to_be_billed method (#17611)
|
2019-05-15 07:46:28 +05:30 |
|
deepeshgarg007
|
60f4dd0736
|
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
|
2019-05-14 15:51:12 +05:30 |
|
rohitwaghchaure
|
39be1d43bc
|
Merge pull request #17546 from rohitwaghchaure/incorrect_payment_amount_if_advance_amount_in_si_develop
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
|
2019-05-14 11:15:14 +05:30 |
|
deepeshgarg007
|
d83cf65be1
|
fix: Added dimensions in financial reports and general ledger
|
2019-05-12 18:34:23 +05:30 |
|
Rohit Waghchaure
|
4a267b9340
|
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
|
2019-05-09 19:52:53 +05:30 |
|
rohitwaghchaure
|
4d2c307d6d
|
Merge pull request #17475 from netchampfaris/item-variant-attributes-optional
fix: Allow variant attributes to be optional
|
2019-05-09 00:54:45 +05:30 |
|
Faris Ansari
|
ab14892fc5
|
fix: Variant naming if optional attributes
|
2019-05-03 13:57:20 +05:30 |
|
Faris Ansari
|
cb03bb1c00
|
fix: Allow variant attributes to be optional
|
2019-05-03 13:41:50 +05:30 |
|
deepeshgarg007
|
bffa060ff6
|
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
|
2019-05-01 16:33:11 +05:30 |
|
Nabin Hait
|
b8103ac077
|
Merge branch 'develop' into item-discount
|
2019-05-01 12:23:30 +05:30 |
|
deepeshgarg007
|
f2fb0e03e6
|
fix: Add status for partial received
|
2019-04-29 21:42:48 +05:30 |
|
deepeshgarg007
|
c23b70950e
|
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
|
2019-04-26 16:43:06 +05:30 |
|
Nabin Hait
|
4a994d4eb8
|
fix: Don't allocate advance if pos
|
2019-04-25 17:49:38 +05:30 |
|
Nabin Hait
|
64bfdd9596
|
fix: test cases
|
2019-04-23 13:37:19 +05:30 |
|
Nabin Hait
|
593242fa5c
|
fix: Calculate rate based on discount on server side only if not rate or pricing rule applied
|
2019-04-23 13:22:38 +05:30 |
|
deepeshgarg007
|
06c20400ee
|
feat: Track purchase receipt status in Material Request
|
2019-04-22 12:25:14 +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 |
|
Nabin Hait
|
0f62b13dd8
|
Merge pull request #17159 from rohitwaghchaure/sales_return_not_working_for_bundle_items
fix: sales return not working for product bundle items
|
2019-04-11 11:44:57 +05:30 |
|
Rohit Waghchaure
|
9665a531fc
|
fix: item variant test cases
|
2019-04-11 09:56:00 +05:30 |
|
Rohit Waghchaure
|
f3a9552e48
|
fix: item variant test cases
|
2019-04-10 17:57:09 +05:30 |
|
Anurag Mishra
|
ed82e8ba3b
|
fix: removed before from accounts_controlle.pyr and fetch the gl from frontend
|
2019-04-09 15:19:05 +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 |
|
Rohit Waghchaure
|
3771db92b8
|
fix: sales return not working for bundle items
|
2019-04-06 17:34:40 +05:30 |
|
Rohit Waghchaure
|
9835c89e17
|
Added test cases
|
2019-04-06 12:29:05 +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 |
|
Nabin Hait
|
88f036a171
|
fix: Validate returned qty with ref qty considering field precision
|
2019-04-01 18:41:31 +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 |
|
Saurabh
|
84a18f5b18
|
Merge branch 'master' into develop
|
2019-03-28 13:54:34 +05:30 |
|
Suraj Shetty
|
a7992ecb62
|
style: Fix formatting
|
2019-03-27 20:32:42 +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 |
|
Rohit Waghchaure
|
5816fc2801
|
Renamed subcontract to Send to Subcontractor
|
2019-03-26 12:52:49 +05:30 |
|
Mangesh-Khairnar
|
324e06cba0
|
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
|
2019-03-25 18:51:13 +05:30 |
|
Mangesh-Khairnar
|
5e474f4664
|
fix: add server-side validation for closed sales order for linked material request
|
2019-03-25 17:28:20 +05:30 |
|
Frappe Bot
|
b07a5d449d
|
Merge branch 'master' into develop
|
2019-03-23 07:25:03 +00:00 |
|
Rohit Waghchaure
|
8bfe330b37
|
feat: pricing rule enhancements
|
2019-03-19 12:44:30 +05:30 |
|
Mangesh-Khairnar
|
439546c83c
|
feat: add on hold status in purchase order
|
2019-03-18 12:14:25 +05:30 |
|
Frappe Bot
|
7e67a400cd
|
Merge branch 'master' into develop
|
2019-03-08 09:39:33 +00:00 |
|
Rohit Waghchaure
|
6b33c9b934
|
fix: purchase receipt not able to submit because default inventory account has not selected in another company
|
2019-03-08 11:13:35 +05:30 |
|
Rohit Waghchaure
|
2bfb063fdb
|
fix(sales order item): not able to search item by description
|
2019-03-02 21:47:55 +05:30 |
|
Mangesh-Khairnar
|
86e650c1ed
|
feat: validate linked sales order on material request creation
|
2019-03-02 20:48:04 +05:30 |
|