Suraj Shetty
c7062d8be7
fix: Check permissions before renaming the account
2019-05-09 14:18:41 +05:30
Suraj Shetty
1435e30ad5
fix: Show "Merge Account" button only to users with write access
2019-05-09 14:16:49 +05:30
rohitwaghchaure
b2ff0bda32
Merge pull request #17526 from rohitwaghchaure/allow_data_import_for_salary_slip
...
fix: allow data import for salary slip
2019-05-08 22:20:20 +05:30
Rohit Waghchaure
ff42d7b5ed
fix: allow data import for salary slip
2019-05-08 20:17:47 +05:30
Anurag Mishra
35a4cae2f6
feat: Adding action Stop or Warn for Quality inspection if it is not submitted
...
* feat: added action on quality inspection
* feat: added action on quality inspection
* feat: Allow the user to by pass inspection if action is warn ad stop when action is to warn
* patch: for setting default action to 'Stop'
* fix: resolve conflicts
* fix: travis
* Update stock_controller.py
2019-05-08 17:41:04 +05:30
rohitwaghchaure
a76cafecb0
Merge pull request #17521 from rohitwaghchaure/fixed_get_invoiced_item_gross_margin
...
fix: get totals of gross profit amount on call of the method get_invoiced_item_gross_margin
2019-05-08 16:17:11 +05:30
rohitwaghchaure
715ecc31c8
Merge pull request #17519 from rohitwaghchaure/added_validation_for_stock_entry_purpose
...
fix: job card issue, added validation in the stock entry
2019-05-08 16:16:39 +05:30
deepeshgarg007
09145674ec
bumped to version 11.1.28
2019-05-08 15:58:50 +05:50
Rohit Waghchaure
11eebddb79
fix: get totals of gross profit amount on call of the method get_invoiced_item_gross_margin
2019-05-08 15:31:29 +05:30
Rohit Waghchaure
7d7417af29
fix: job card issue, added validation in the stock entry
2019-05-08 15:07:31 +05:30
rohitwaghchaure
6edb6e0b09
Merge pull request #17506 from Anurag810/rename_column
...
fix: renamed column avg. buying rate to valuation rate in gross profit report
2019-05-08 14:34:14 +05:30
rohitwaghchaure
e057575661
Merge pull request #17518 from rohitwaghchaure/customer_not_able_to_save
...
fix: not able to save customer if contribution is not set
2019-05-08 14:33:44 +05:30
Rohit Waghchaure
b7b5eeb92b
fix: not able to save customer
2019-05-08 14:28:33 +05:30
rohitwaghchaure
85731053fd
Merge pull request #17514 from rohitwaghchaure/pricing_rule_not_working_on_quotation
...
fix: pricing rule not working properly on the quotation
2019-05-08 11:14:34 +05:30
Rohit Waghchaure
9f3eb9e077
fix: pricing rule not working properly on the quotation
2019-05-08 11:13:56 +05:30
Sahil Khan
5ac8dbfceb
Merge branch 'hotfix'
2019-05-07 17:55:28 +05:30
Sahil Khan
f4f2301e5b
bumped to version 11.1.27
2019-05-07 18:15:28 +05:50
rohitwaghchaure
7888336524
Merge pull request #17512 from rohitwaghchaure/address_not_set_from_the_lead
...
fix: address not set on the quotation from the lead
2019-05-07 17:50:09 +05:30
Rohit Waghchaure
b8c2e02c67
fix: address not set on the quotation from the lead
2019-05-07 17:18:00 +05:30
Sahil Khan
a9e9efbd23
Merge branch 'hotfix'
2019-05-07 14:45:45 +05:30
Sahil Khan
2f175e6d85
bumped to version 11.1.26
2019-05-07 15:01:01 +05:50
rohitwaghchaure
df817a858b
Merge pull request #17510 from rohitwaghchaure/fixed_lead_dashbord_quotation_redirect
...
fix: quotation link in the lead dashboard not working and filter from the dashboard was not set in the list view
2019-05-07 14:30:16 +05:30
Rohit Waghchaure
4a73059ed3
fix: quotation link in the lead dashboard not working and filter from the dashboard was not applying
2019-05-07 14:29:39 +05:30
rohitwaghchaure
552615525c
Merge pull request #17511 from deepeshgarg007/quotation-refactor-fixes
...
fix: Dynamic Link fieldname fix in quotation
2019-05-07 14:25:38 +05:30
deepeshgarg007
25e408fd2a
fix:Contact person query fix in quotation
2019-05-07 12:43:20 +05:30
rohitwaghchaure
375a6f67ae
Merge pull request #17505 from rohitwaghchaure/customer_not_found_in_qtn
...
fix: not able to make sales order from the lead quotation
2019-05-06 19:26:24 +05:30
Anurag Mishra
01095799e8
fix: renamed column avg. buying rate to valuation rate
2019-05-06 17:41:28 +05:30
Rohit Waghchaure
ead8d82a84
fix: not able to make sales order from the lead quotation
2019-05-06 17:16:57 +05:30
Deepesh Garg
2c229c6403
Merge pull request #17495 from sagarvora/ewb_fixes
...
fix(regional): imporvements to e-Way Bill JSON generation
2019-05-06 12:31:31 +05:30
Sagar Vora
5fb78a375d
fix(regional): imporvements to e-Way Bill JSON generation
...
- Set pincode correctly in 'Bill To - Ship To' scenario
- Python 2 compatibility (convert to int after rounding)
- Avoid execeeding max character limit in tax amounts by rounding the same to two digits
2019-05-06 11:32:37 +05:30
Tyler Matteson
8fcad571f5
Batch naming series hotfix ( #17483 )
...
* fix: not able to make sales order from quotation
* fix: batch naming series unicode() call is py3 incompatible
2019-05-04 23:49:24 +05:30
Himanshu
53d7e667dd
fix: patch to remove scheduling tool ( #17472 )
...
* fix: patch to remove scheduling tool
* fix: drop table
* patch: delete table if exists
* fix: remove drop table
* use orm
2019-05-04 22:42:35 +05:30
Rohan
7395716476
fix(stock): Allow expired batches to be flushed out of the system ( #17477 )
2019-05-04 22:40:42 +05:30
Rushabh Mehta
c068b6a885
fix: unlink task rather than deleting it ( #17486 )
2019-05-04 22:39:00 +05:30
Himanshu Warekar
02d28c5908
fix: use list comprehension
2019-05-04 22:35:08 +05:30
Rohan
90d0d24d1a
Update erpnext/selling/doctype/customer/customer.py
...
Co-Authored-By: hrwX <himanshuwarekar@yahoo.com >
2019-05-04 22:35:08 +05:30
Himanshu Warekar
6aab14f9cf
fix: calculate percentage only if sales team exist
2019-05-04 22:35:08 +05:30
Himanshu Warekar
163dbdca34
fix: allocated percentage should be equal to 100
2019-05-04 22:35:08 +05:30
Himanshu Warekar
dcc99a2644
fix: python side validation
2019-05-04 22:35:08 +05:30
Rohit Waghchaure
f5297cf386
fix: not able to make sales order from quotation
2019-05-03 15:52:59 +05:30
Mangesh-Khairnar
9f7fd16882
feat: unlink task from project on task deletion
2019-05-03 13:06:19 +05:30
Nabin Hait
5296ab1f87
Merge pull request #16783 from sahil28297/default_warehouse_for_sales_return
...
fix: set warehouse from def_warehouse_for_sales_return in sales return
2019-05-03 09:27:04 +05:30
Nabin Hait
e42c14f2cb
Merge pull request #17469 from rohitwaghchaure/fixed_sales_order_issue_from_quotation
...
fix: not able to make sales order from quotation
2019-05-03 09:19:27 +05:30
Rohit Waghchaure
4ef10fd6c3
fix: not able to make sales order from quotation
2019-05-03 01:48:45 +05:30
sahil28297
4c0d0e226b
Merge branch 'hotfix' into default_warehouse_for_sales_return
2019-05-03 00:05:22 +05:30
Deepesh Garg
094caaa03e
Merge pull request #17465 from deepeshgarg007/inactive-items-fix-hotfix
...
fix: Inactive sales item report fix
2019-05-02 23:50:57 +05:30
Nabin Hait
ce51553d29
Merge pull request #16907 from sagarvora/ewb
...
feat(regional 🇮🇳 ): auto-generate e-Way Bill JSON from Sales Invoice
2019-05-02 21:55:24 +05:30
Nabin Hait
f41fc21274
Merge branch 'hotfix' into ewb
2019-05-02 21:54:38 +05:30
Nabin Hait
1f49b77529
Merge pull request #17460 from nabinhait/project-billing-summary
...
Refactor: Project billing summary Report
2019-05-02 21:48:35 +05:30
deepeshgarg007
a0012f8c48
fix: Inactive sales item report fix
2019-05-02 19:32:43 +05:30
