Commit Graph

1281 Commits

Author SHA1 Message Date
KanchanChauhan
d114c8f88f fix(Purchase Order): Status updater (#18612) 2019-09-05 15:11:43 +05:30
Suraj Shetty
f75481fa23 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-30 15:45:18 +05:30
Rohit Waghchaure
13c7e183a6 fix: not able to save sales order 2019-08-29 20:03:52 +05:30
Suraj Shetty
8de8a78235 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-26 10:51:12 +05:30
Deepesh Garg
f3d78dd29c fix: Duplicate items check in Sales Invoice (#18660)
* fix: Duplicate items check in sales Invoice

* fix: Commonified function for duplicate items check in selling controller

* fix: Set valuation rate and transaction date in child tabel
2019-08-23 11:42:35 +05:30
Mangesh-Khairnar
5619db28cb fix: fetch capital work in progress as expense account (#18780) 2019-08-21 14:49:24 +05:30
Suraj Shetty
da2a623e38 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-21 11:48:27 +05:30
Sahil Khan
5f2c030ddc Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:22:49 +05:30
Suraj Shetty
5124b2806d Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-20 12:05:51 +05:30
Deepesh Garg
33b392ac2b
Update erpnext/controllers/sales_and_purchase_return.py
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
2019-08-19 17:43:10 +05:30
Deepesh Garg
3965451c7a
Update erpnext/controllers/sales_and_purchase_return.py
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
2019-08-19 17:40:29 +05:30
deepeshgarg007
0487ad5515 fix: Code cleanup 2019-08-19 16:40:29 +05:30
deepeshgarg007
e2acc748c8 fix: Check for return against delivery noteas well 2019-08-19 16:38:04 +05:30
deepeshgarg007
7d288437d8 fix: Assignment 2019-08-19 16:19:48 +05:30
deepeshgarg007
c80e5fe7a1 fix: Failing sales and purchase return test cases 2019-08-19 14:38:15 +05:30
Deepesh Garg
5efedd7a60 fix: Travis (#18772) 2019-08-19 12:56:22 +05:30
Anurag Mishra
19c3cb0d5b fix: removed filters(not required) (#18729) 2019-08-19 10:31:02 +05:30
Suraj Shetty
182f4def00 fix: Delivery note creation from pick list
- Changes in serial no and batch no seletion
- Changes in warehouse overrwite logic

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-08-16 08:16:22 +05:30
Suraj Shetty
83705af0b3 fix: Filters for portal quotation list (#18689)
* fix: Filters for portal quotation list

* fix: Remove unwanted import
2019-08-12 11:51:27 +05:30
rohitwaghchaure
5790fabd54
Merge pull request #18669 from rohitwaghchaure/removed_stock_item_condition_for_sub_contract_v12
fix: allow to subcontract service raw materials
2019-08-09 15:18:38 +05:30
Rohit Waghchaure
10e8073204 fix: allow to subcotract service raw materials 2019-08-08 18:20:53 +05:30
Mangesh-Khairnar
a3d5200194 fix(sales-order): update items (#18535)
* fix(sales-order): update items

* fix: minor changes

* Update: accounts controller
2019-08-05 10:16:40 +05:30
Mangesh-Khairnar
9accae3ddc fix(sales-order): update items (#18536)
* fix(sales-order): update items

* fix: minor changes
2019-08-05 10:16:25 +05:30
Deepesh Garg
8b0302bab9 fix: Make conversion rate optional for non itemized items (#18540) 2019-08-05 10:14:19 +05:30
Deepesh Garg
cfb899451f fix: Make conversion rate optional for non itemized items (#18541) 2019-08-05 10:14:05 +05:30
Suraj Shetty
580fa48642 fix: Quotation list in customer portal (#18579)
* fix: Quotation list in customer portal

Customers were not able to see their quotations because of
 the recent customer field removal from quotation

* fix: Remove duplicate code
2019-08-05 10:08:35 +05:30
deepeshgarg007
b656529818 fix: Error handling in taxes and totals 2019-08-03 13:49:33 +05:30
deepeshgarg007
8bf19ce81a fix: Error handling in taxes and totals 2019-08-03 13:44:44 +05:30
Deepesh Garg
d301d26fda fix: Enhancement in credit note (#18511)
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:19 +05:30
Deepesh Garg
b65c761b16 fix: Enhancement in credit note (#18510)
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:01 +05:30
Mangesh-Khairnar
3f8326358b fix: remove wrong status update for order type maintenance (#18444) 2019-07-22 16:24:56 +05:30
Anurag Mishra
305da799a4 Handling case for Material Request type 'Manufacture' v12 (#18365)
* fix: status for 'material request type == Manufacture'

* Patch: for setting status

* fix: list view status
2019-07-22 11:35:16 +05:30
Faris Ansari
7ed5919d5b fix(LoanApplication): Repayment amount check (#18376)
* fix: Clickable Asset link

* fix(LoanApplication): Repayment amount check
2019-07-22 11:30:05 +05:30
Mangesh-Khairnar
88620d6cbb fix: precision on comparing with the outstanding amount (#18375) 2019-07-22 11:29:26 +05:30
Karthikeyan S
747c2624cd
fix(BOM): Sever Error due in bom query to new behaviour of db.escape in v12 (#18401)
fixes bug introduced by commit 6a7969117f
2019-07-19 22:49:21 +05:30
Anurag Mishra
8a06b8fd38 fix precision 2019-07-17 14:55:16 +05:30
Deepesh Garg
322053ee1b
Merge pull request #18136 from nabinhait/inv-disc-improvements
fix: set invoice status considering invoice discounting
2019-07-15 18:53:30 +05:30
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields (#17788)
* refact: Refactored over delivery/receipt/billing fields

* fix: test case
2019-07-15 18:02:58 +05:30
Nabin Hait
d83e39d0ac Merge branch 'develop' of https://github.com/frappe/erpnext into inv-disc-improvements 2019-07-15 13:56:29 +05:30
Nabin Hait
b315acb5a7 fix: Calculate taxes and totals only if items added in transaction 2019-07-12 14:32:53 +05:30
Mangesh-Khairnar
6a7969117f fix(bom): escape name with wildcard character (#18164) 2019-07-08 10:40:40 +05:30
rohitwaghchaure
334335a2ef fix: not able to make credit note for the sales invoice in which item code is not set (#18184) 2019-07-08 10:26:29 +05:30
rohitwaghchaure
8a054e4b36
Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry
feat: provision to make debit / credit note against the stock returned entry
2019-07-07 00:51:46 +05:30
Rohit Waghchaure
5d4d70b75f feat: provision to make debit / credit note against the stock returned entry 2019-07-05 17:06:25 +05:30
Nabin Hait
7b684a01d3 fix: merge conflict 2019-07-04 12:06:50 +05:30
Shivam Mishra
7dedd9a8cd refactor: better error message when changing variant value (#18144) 2019-07-03 17:29:29 +05:30
Anurag Mishra
841d852f41 refactor: added missing translation functions (#18143)
* fix: Translating Error and Messages

* Update erpnext/controllers/item_variant.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>

* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-07-03 15:15:08 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997)
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
2019-07-03 10:34:31 +05:30
Nabin Hait
3bbcd491e4 fix: set invoice status considering invoice discounting 2019-07-02 15:31:24 +05:30
Nabin Hait
126a02e208 fix: set invoice status considering invoice discounting 2019-07-02 15:28:57 +05:30
Deepesh Garg
78a86af7fd fix: Fiter passing fix in get batch query (#18131) 2019-07-02 10:10:55 +05:30
Nabin Hait
659a01d819
Update accounts_controller.py 2019-07-01 15:16:49 +05:30
Mangesh-Khairnar
8c621ab90c fix: precision for certain calculations in buying controller (#18008)
* fix: precision for certain numbers

* fix: check precision of the received_qty

* Update buying_controller.py
2019-06-26 11:10:17 +05:30
Deepesh Garg
ea0574679f fix: Removed submitted status from Quotation (#18055)
* fix: Change in list view and status updater

* fix: Change status in doctype

* fix: Patch for submitted status
2019-06-26 11:05:51 +05:30
deepeshgarg007
e8d21cd8fa fix: Division by zero error fix in group similar item 2019-06-24 18:49:24 +05:30
Anurag Mishra
4c1639305f feat: creating stock entry against purchase receipt 2019-06-14 12:31:08 +05:30
Deepesh Garg
0d7d4879a9
Merge pull request #17920 from Anurag810/stock_balance_report
fix: fetch item on the base of item group
2019-06-13 10:49:30 +05:30
Anurag Mishra
bbe2c4fb01 fix: fetch item on the base of item group 2019-06-12 19:09:51 +05:30
Rohit Waghchaure
3cf24366a9 feat: provision to set multiple manufacturer in the item master 2019-06-06 19:53:32 +05:30
Rushabh Mehta
6744febedd
Merge pull request #17769 from deepeshgarg007/dimensions
feat: Configurable Accounting Dimensions
2019-06-03 17:00:58 +05:30
Nabin Hait
37fdeee367
Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev
fix: Rounding adjustment while additional discount amount is applied on grand total
2019-06-03 13:09:04 +05:30
deepeshgarg007
2580075583 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-30 22:11:27 +05:30
Nabin Hait
1bb3fc3c19
Merge pull request #17789 from sunnyakaxd/patch-2
fix: Dont fetch all orders to update a few
2019-05-30 17:24:49 +05:30
Nabin Hait
4d58734492 fix: Rounding adjustment while additional discount amount is aplied on grand total 2019-05-30 15:51:29 +05:30
Anurag Mishra
62d58acea9
fix: Added description if item variants does not have description in map(v12) (#17796)
* fix: variant item description based on attribute

* style: removed unwanted changes
2019-05-30 14:04:08 +05:30
Himanshu Mishra
70029b818b
Update status_updater.py 2019-05-29 14:19:35 +05:30
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