Rohit Waghchaure
c2a5f99a38
fix: incorrect consumed qty for partial purchase receipt in subcontracting
2019-12-20 13:01:02 +05:30
Rohit Waghchaure
8bd84b28ca
fix: schedule date
2019-12-16 12:29:07 +05:30
Rohit Waghchaure
21fe97e723
fix: pricing rule not working for production discount
2019-12-16 11:15:53 +05:30
Nabin Hait
acdd5081da
fix: Service start and end date validation for deferred accounting ( #19805 )
2019-12-04 15:30:01 +05:30
Marica
c68a940aac
fix: Item qty cannot be zero in Purchase Receipt ( #19779 )
2019-12-03 12:59:22 +05:30
Suraj Shetty
9d6d95c4a2
fix: valuation of "finished good" item in purchase receipt ( #19268 )
...
* fix: Remove redundant purchase orders and unwanted condition
* fix: [WIP] Purchase receipt value
* fix: Add raw material cost based on transfered raw material
* fix: get_qty_to_be_received
* fix: Remove debugger statement
* fix: Reset rm_supp_cost before setting subcontracted raw_materials
* test: Fix and modify tests for backflush_based_on_stock_entry
* fix: Add non stock items to Purchase Receipt from Purchase Order
* fix: Ignore valuation rate check for non stock raw material
* fix: Rename check all rows
* fix: Remove amount from test
* test: Fix item rate error
* fix: handling of serial nos in backflush
* fix: Add serial no. of raw materials
* fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material
* fix: Raw material batch number selection in purchase receipt
* Update test_purchase_order.py
2019-11-29 13:26:52 +05:30
Nabin Hait
a7d168c05f
fix: merge conflict
2019-11-25 18:12:56 +05:30
Saqib
cd3976f7d2
Asset cancellation fix ( #19671 )
...
* fix: remove asset movement mandatory fields
* fix: label for reference doctype
2019-11-25 12:24:34 +05:30
Saqib
f37a46edea
Fixed Asset Refactor Review fixes ( #19665 )
...
* fix: fixed asset item creation ux fixes
* fix: auto creation of asset ux fixes
* fix: [LCV] incorrect condition when checking assets linked with PR
* fix: bulk update assets
* refac: remove company level cwip enabling
* cwip can be enabled only on category level
* fix : #19649
2019-11-22 16:32:50 +05:30
Saqib
1919af2ff1
Fixed Asset Refactor Review fixes ( #19666 )
...
* fix: fixed asset item creation ux fixes
* fix: auto creation of asset ux fixes
* fix: [LCV] incorrect condition when checking assets linked with PR
* fix: bulk update assets
* refac: remove company level cwip enabling
* cwip can be enabled only on category level
* fix : #19649
2019-11-22 16:32:34 +05:30
Rohit Waghchaure
a831848074
fix: code cleanup
2019-11-20 19:42:27 +05:30
Rohit Waghchaure
eed30c6d8c
fix: not able to select item in sales order
2019-11-20 19:42:11 +05:30
rohitwaghchaure
95270ad14b
Merge pull request #19619 from rohitwaghchaure/not_able_to_select_item_in_the_sales_order
...
fix: not able to select item in sales order
2019-11-19 19:40:11 +05:30
Rohit Waghchaure
248585b5a1
fix: code cleanup
2019-11-19 19:21:27 +05:30
Rohit Waghchaure
c42312ea12
fix: not able to select item in sales order
2019-11-19 19:06:51 +05:30
rohitwaghchaure
a85ddf2fb4
fix: performance issue of sales invoice while save/submit ( #19598 )
...
* fix: performace issue of sales invoice while save/submit
* Cached price list data, item group child data, added indexing for blanket order
2019-11-19 18:47:48 +05:30
Saqib
d995609ffa
Fixed asset refactor ( #19369 )
...
* refactor: Asset Movement with multiple assets using table
* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset
* feat: Auto create asset on Purchase checkbox
* refactor: LCV for asset created via PR/PI
* refactor: get asset category accounts from item master
* refactor: Purchase Receipt for asset purchasing
* refactor: Purchase Invoice for asset purchasing
* fix: post-refactor delete fixes
* refactor: moved asset validation from pr/pi on asset submission
* fix: Asset Category should be defined for auto purchasing assets
* fix: undo serial_no_update removal (for non asset item) from LCV
* fix: remove duplicate calls from item.js
* fix: args position of all occurrence of get_asset_category_account()
* fix: test cases
* fix: landed cost voucher validations
* refactor: test case for auto creation of asset
* fix: removed invalid assertions
* fix: patch errors on travis
* fix: codacy fixes
* fix: PI Items not fetching details from item
* fix: asset movement from list view having default purpose 'Receipt'
* chore: msgprint for selecting item code first while creating asset manually
* fix: alert messages
* minor: asset movement fixes
* fix: lcv was made against submitted assets
* minor: ux fixes
* refac: move specific asset validation to SINV
* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code
* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests
* fix: code review changes
* chore: remove unecessary asset movement updation
* refac: setting latest location while making asset movements
* Added extra validations
* fix: form dashboard make lcv button
* fix: auto asset movement creation validation
* fix: allow lcv against other items after removing submitted assets
* chore: remove unwanted condition
* fix: mismatch debit credit on purchase of asset with valuation tax
* chore: toggle required field based on movement type
* chore: fix lcv error message
* fix: travis failing
* fix: travis failing test
* fix: wrong conditions after merge
* fix: cannot cancel assets
* fix: travis failing* fix change in deletion of assets
* fix: codacy
* fix: process cancellation of assets
* refac: cancellation of pr only deletes auto created assets
* fix: incorrect query
2019-11-18 11:46:55 +05:30
rohitwaghchaure
090f9a3dc9
Merge pull request #19533 from rohitwaghchaure/fixed_precision_issue_while_updating_qty_and_rate
...
fix: precision issue
2019-11-08 14:54:58 +05:30
Rohit Waghchaure
e93dc9f1cd
fix: precision issue
2019-11-08 13:43:15 +05:30
Marica
e37a67245e
fix: Sales and Purchase Invoice Status, Payment Reconciliation Credit/Debit Note ( #19388 )
2019-11-07 12:52:23 +05:30
Deepesh Garg
0bcf8b64f6
Merge pull request #19422 from marination/search-field
...
fix: Search field entries included in Item Link field query
2019-11-01 15:38:25 +05:30
rohitwaghchaure
81c217584a
fix: purchase order issue, margin_rate_or_amount not there in the purchase documents ( #19466 )
2019-10-31 15:56:10 +05:30
Anurag Mishra
a11e738801
feat: Stock value and account balance sync. ( #19233 )
...
* feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked
* fix(test): Sales Invoice
* fix(test): Purchase Invoice
* fix(test): Delivery Note
* fix: more test_case
* fix(test): Stock Entry
* fix(test): Purchase Receipt
* fix(more-test): Stock Entries
* fix(more-test): Sales Invoice and Delivery Note
* fix: tests for delivery note
* fix: tests for stock reconciliation
* refactor: stock and account balance function
* fix(more-test): Warehouse
* fix(test): Landed Cost Voucher
* fix: changes requested
2019-10-31 15:55:03 +05:30
marination
1e754b161c
fix: Fetching catched meta and removed description fetch from Search Fields
...
Description is conditionally fetched and also used in WHERE clause, that is maintained.
Improved naming
2019-10-30 18:33:44 +05:30
marination
3dbef9de74
fix: Search field entries included in Item Link field query
2019-10-28 15:48:10 +05:30
rohitwaghchaure
5d0362669d
Merge pull request #19386 from rohitwaghchaure/while_making_return_entry_not_able_to_select_null_batch
...
fix: not able to select the zero qty batch while making the sales ret…
2019-10-23 18:35:58 +05:30
Rohit Waghchaure
d8ddd1e2ec
fix: not able to select the zero qty batch while making the sales return entry
2019-10-22 14:05:13 +05:30
Deepesh Garg
fbae893f07
Merge pull request #19306 from nabinhait/required_date_fix
...
fix: Always set required date based on min date on item table
2019-10-21 15:25:23 +05:30
Nabin Hait
dd893254be
Update buying_controller.py
2019-10-21 13:40:00 +05:30
Nabin Hait
49a46f08de
fix: Set gross profit in SO item on updating rate after submission ( #19311 )
2019-10-21 13:35:43 +05:30
Nabin Hait
a113861b0c
fix: Always set required date based on min date on item table
2019-10-15 12:43:27 +05:30
Mangesh-Khairnar
4ed9b45fb8
feat(Sales Order): Allow to skip delivery note creation ( #19222 )
...
* feat(sales-order): add option to skip delivery note creation for order type maintenance
* fix(sales-order): hide delivery date on setting skip delivery note creation
* fix: allow skipping delivery note for all order types
* fix: bypass delivery note creation on setting skip delivery note creation
* fix: show skip delivery note in list view
* fix: check for duplicate project name after submitting prompt
* fix: toggle delivery note reqd for skip delivery note
* fix: update status based on skip delivery note
2019-10-12 19:33:11 +05:30
rohitwaghchaure
285344eb0e
fix: over-bill error while making debit note against purchase return e… ( #19270 )
...
* fix: overbill error while making debit note against purchase return entry
* Update accounts_controller.py
2019-10-11 11:02:11 +05:30
Marica
f067447d9c
fix: Margin and Discount percentage set correctly via 'Update Items' ( #19276 )
2019-10-11 10:47:09 +05:30
Faris Ansari
38ac7f7350
Enhancements to Supplier Portal ( #19221 )
...
* fix: Add Purchase Order to portal
* fix: Create Customer or Supplier on first login
Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.
* fix: Styling for transaction_row
* fix: Styling for RFQ page
* fix: Add Purchase Invoice route
- Make Purchase Invoice from PO
* fix: minor
- Admissions for Student role
- Remove print statement
2019-10-09 11:41:33 +05:30
Anurag Mishra
fe5890b828
fix: Query Condition On Billing date filters
2019-10-07 14:27:07 +05:30
Deepesh Garg
d138633c5b
Merge pull request #19163 from thefalconx33/small-fixes
...
fix: Supplier field not getting populated in serial no on creation of asset
2019-09-25 22:09:41 +05:30
Marica
23d7b09389
fix: Item Rate within Update Items in Sales order ( #19172 )
...
Blocked negative discount percentage, which affected the item rate every time Update Items action was taken
2019-09-25 17:17:36 +05:30
Rucha Mahabal
c6b548b5b2
fix(Stock): item variant description ( #19134 )
2019-09-24 19:17:13 +05:30
thefalconx33
c15cc8fc28
fix : #18624
2019-09-24 18:49:16 +05:30
Marica
bac4b93639
fix: Displaying manufacturer part no along with manufacturer and added Manufacturers validation in Item master ( #19066 )
...
Manufacturer Link field options in Items Table of transactions will also display manufacturer part no.
Manufacturers table in Item master will check for duplicate entries.
2019-09-16 19:44:28 +05:30
Mangesh-Khairnar
7bcb24efbf
fix(purchase-invoice): Update paid amount on creation of debit note ( #18830 )
...
* fix(purchase-invoice): set paid amount for purchase return
* fix(purchase-invoice): remove payment schedule on creation of debit note
2019-09-11 10:49:33 +05:30
rohitwaghchaure
358a01a226
fix: Quotation Trends report not working for filter group by customer ( #18989 )
2019-09-10 19:18:30 +05:30
Nabin Hait
88e8688a4b
fix: set raw material's batch based on main item's batch only if RM has batch no ( #18977 )
2019-09-10 14:07:45 +05:30
Anurag Mishra
ac0c1edd23
feat: added date filter based on billing date and based date ( #18936 )
2019-09-06 12:10:10 +05:30
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
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
Mangesh-Khairnar
5eb66aed77
feat: add on hold status check
2019-03-02 20:48:03 +05:30
Mangesh-Khairnar
e17b7095bf
feat(sales order on hold): check status of sales order to validate entry
2019-03-02 20:48:03 +05:30
Saurabh
482ebd2c7c
Merge branch 'master' into develop
2019-02-20 18:14:18 +05:30
rohitwaghchaure
c18e925d61
fix: Moved regional methods from controller to hooks ( #16736 )
2019-02-20 17:13:15 +05:30
Sagar Vora
cc6e51c62d
Merge branch 'master' into develop
2019-02-19 18:09:49 +05:30
Gaurav
f1e28e0e8d
mod(regional,italy): Updates to Italian Localization
...
fixes:
removed cleanup_files from italy/utils
removed extract_doc_number from italy/utils
added country filter to italian localization patch
replaced dict assignment with dot operator in prepare_invoice
correcions in e-invoice xml following changes in prepare_invoice
added setup_report in patch
added section for e-invoicing custom fields in company
added Italy in test_company
2019-02-19 10:39:22 +05:30
Aditya Hase
13808b4cc9
fix(py3): Convert to float before comparison
2019-02-08 12:03:25 +05:30
Aditya Hase
d9ce732d3e
fix(py3): Explicitly convert to float for comparison
2019-02-07 22:21:05 +05:30
Saif Ur Rehman
1a441b267d
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-02-01 19:17:04 +05:00
Sagar Vora
f97c5dad82
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
Sagar Vora
f3cfad7595
Merge branch 'master' into staging-fixes
2019-01-29 17:20:46 +05:30
Saif Ur Rehman
3d275af67b
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/patches.txt
# erpnext/selling/doctype/customer/customer.json
2019-01-24 23:40:16 +05:00
Frappe Bot
e415cce1a9
Merge branch 'staging' into develop
2019-01-23 08:19:00 +00:00
Nabin Hait
d2e2ca31ac
Merge pull request #16460 from nabinhait/pricing-rule-issue
...
fix: Enforce pricing rule based on rate on server side
2019-01-23 12:09:12 +05:30
Nabin Hait
fb8c0bd664
Merge pull request #16464 from adityahase/flakes
...
style: Linting fixes
2019-01-23 12:08:57 +05:30
Nabin Hait
4ef578e1c4
Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports
...
fix: Multiple fixes in the reports
2019-01-23 12:05:36 +05:30
Aditya Hase
f79937d64b
style: Remove unused imports
2019-01-23 00:28:37 +05:30
Nabin Hait
da32916396
fix: Enforce pricing rule based on rate on server side
2019-01-22 19:06:06 +05:30
Saif Ur Rehman
74a3370095
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/patches.txt
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/sales_order/sales_order.json
2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed
Merge branch 'staging' into develop
2019-01-22 15:56:39 +05:30
Saif Ur Rehman
398f593e5f
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-01-18 17:33:19 +05:00
Nabin Hait
bace4d3e6d
Merge pull request #16358 from adityahase/naming-series
...
feat(naming): Deferred naming for SLE and GL Entry
2019-01-18 10:55:30 +05:30
Nabin Hait
bef2c22d23
Fix: merge conflict
2019-01-18 10:15:47 +05:30
Rohit Waghchaure
f725816809
Enhance: Added field limit in the Payment Reconciliation to handle large entries
2019-01-17 12:54:14 +05:30
Nabin Hait
983d102a19
Merge branch 'staging-fixes' into Quality-inspection-fix
2019-01-16 17:52:30 +05:30
Sahil Khan
34766c0c50
BIS issue fixes
2019-01-16 15:59:39 +05:30
Saif Ur Rehman
5085673030
test: fix for Item Tax Template v12
2019-01-11 03:53:43 +05:00
Saif Ur Rehman
8d61794540
Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/item/item.json
2019-01-10 04:23:40 +05:00
Saif Ur Rehman
eb7277d2d4
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/patches.txt
2019-01-09 11:25:53 +05:00
Nabin Hait
bf0b6fd8a9
Merge pull request #16342 from finbyz/staging-fixes
...
fix: rounded total if available while caclulating advance paid
2019-01-08 20:29:32 +05:30
Saurabh
afec3ca89a
Merge branch 'staging' into develop
2019-01-08 17:09:36 +05:30
Saif Ur Rehman
380b4b0926
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
2019-01-08 13:41:46 +05:00
Aditya Hase
0c16424d7d
fix(naming): Use creation instead of name to order SLEs
2019-01-08 00:09:36 +05:30
Sagar Vora
f5a00dc0c1
Merge branch 'hotfix' into is_fixed_asset_checkbox_not_copied
2019-01-07 15:45:33 +05:30
Sagar Vora
f733a39089
fix: remove trailing whitespace
2019-01-07 14:24:01 +05:30
Saif Ur Rehman
7ea6554f1f
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/stock/doctype/item/item.json
2019-01-06 04:43:13 +05:00
finbyz
5efc7973ea
Minor Fix for Rounded Total
2019-01-05 11:12:11 +05:30
Saif Ur Rehman
648bd15b2a
Force item_tax_rate on setting item details server-side
2019-01-03 04:03:54 +05:00
Anurag Mishra
0885485a61
changes
2019-01-01 15:00:16 +05:30