Deepesh Garg
a4b9fc74aa
Merge branch 'develop' into feat_taxjar
2020-06-27 18:51:48 +05:30
Deepesh Garg
72ba8f1203
Merge pull request #22481 from frappe/michellealva-patch-7
...
fix: change button label in issue
2020-06-27 18:01:45 +05:30
Michelle Alva
2f37c447dd
fix: change button label in issue
...
Changed the label of the button from "Make" to "Create" so that it is consistent with other DocTypes.
Before:
2020-06-27 09:27:45 +05:30
Marica
14ad9e789d
Merge pull request #22477 from michellealva/label-fix2
...
fix: remove redundant label in salary slip
2020-06-26 20:32:23 +05:30
michellealva
e9cec2ff76
fix: remove redundant label in salary slip
2020-06-26 19:39:54 +05:30
rohitwaghchaure
275ebefdd2
Merge pull request #22468 from frappe/shopping-cart-settings
...
fix: enable show_configure_button when shopping cart is enabled
2020-06-26 17:20:35 +05:30
rohitwaghchaure
b2ae6d9961
Merge pull request #22467 from nabinhait/credit_limit_email
...
fix: Send email to credit controllers to increase credit limit
2020-06-26 15:49:25 +05:30
rohitwaghchaure
13e8c32172
Update shopping_cart_settings.js
2020-06-26 15:07:32 +05:30
rohitwaghchaure
b47218f7b3
Merge pull request #22470 from marination/production-plan-test
...
fix: Sales Order to MR test failing
2020-06-26 15:05:53 +05:30
marination
0f056ec51d
fix: Sales Order to MR test failing
2020-06-26 14:12:11 +05:30
Anupam K
0ce70bd68f
Merge branch 'develop' of https://github.com/frappe/erpnext into shopping-cart-settings
2020-06-26 12:47:37 +05:30
Nabin Hait
0ff5af222a
fix: Send email to credit controllers to increase credit limit
2020-06-26 12:46:42 +05:30
Anupam K
27d27c924d
enable show_configure_button when shopping cart is enabled
2020-06-26 12:46:40 +05:30
rohitwaghchaure
cc7e1b0ec5
Merge pull request #22400 from AfshanKhan/FR_ISS_204290
...
fix: removed condition that considered "Standard working hours" while…
2020-06-25 23:23:33 +05:30
rohitwaghchaure
2eb452f3bb
Merge pull request #22458 from scmmishra/fix-email-digest-so-company
...
fix: add company filter in email digest
2020-06-25 23:18:38 +05:30
rohitwaghchaure
6cf568d094
Merge pull request #22462 from marination/production-plan-ux
...
fix: Handling Empty tables in Production Plan
2020-06-25 23:15:28 +05:30
rohitwaghchaure
5414e2c306
Merge pull request #22463 from frappe/michellealva-fiscal_year
...
fix: grammatical fix on error message
2020-06-25 23:11:36 +05:30
Michelle Alva
978722621f
fix: grammatical fix on error message
...
Before:
Fiscal Year: 2020 does not exists
After:
Fiscal Year 2020 Does Not Exist
2020-06-25 22:35:33 +05:30
marination
c8f590bc8f
fix: Handling Empty tables in Production Plan
2020-06-25 21:30:45 +05:30
Shivam Mishra
5374e7ae1f
fix: add company filter in email digest
2020-06-25 19:41:42 +05:30
Saqib
40847aeac3
fix: cannot cancel assets with repair pending ( #22440 )
...
* fix: cannot cancel assets with repair pending
* fix: message
* Update asset.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-25 15:43:31 +05:30
Deepesh Garg
8a55ec1580
fix: Add view ledger button for cancelled docs ( #22432 )
...
* fix: Add view ledger button for cancelled docs
* fix: Add moddified to date in Stock Ledger
2020-06-25 15:34:01 +05:30
Sun Howwrongbum
ecff8f9582
fix: UnboundLocalError when setting product_info ( #22436 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-06-25 14:25:53 +05:30
Afshan
a462e29172
Merge branch 'develop' into FR_ISS_204290
2020-06-25 14:16:35 +05:30
Rucha Mahabal
7b3700b3ec
fix: handle custom statuses for the pause SLA configuration ( #22349 )
...
* fix: handle hold time for custom statuses
* fix: set total hold time only if hold configurations are enabled
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
2020-06-25 13:29:14 +05:30
Shivam Mishra
53346217d2
Revert "feat: added search to support page ( #22376 )" ( #22431 )
...
This reverts commit 3ab8d865dd
.
2020-06-25 11:12:09 +05:30
Deepesh Garg
fdc276bb0e
Merge pull request #22434 from frappe/michellealva-patch-4-1
...
fix: change error messages in RFQ
2020-06-25 09:17:36 +05:30
Michelle Alva
da0385cd39
fix: change error messages in RFQ
...
Before:
1. Row {0}: For supplier {0} Email Address is required to send email
2. Email sent to supplier
3. Request for Quotation is disabled to access from portal, for more check portal settings.
4. Supplier Quotation created.
After:
1. Row {0}: For Supplier {0} Email Address is Required to Send Email
2. Email sent to Supplier
3. The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.
4. Supplier Quotation Created.
2020-06-25 08:24:01 +05:30
Marica
ba334cbfa5
Merge pull request #22430 from frappe/clarkejj-patch-1
...
fix: stock_ageing.py report SyntaxError: can’t assign to function call
2020-06-24 21:24:44 +05:30
John Clarke
6fd1068af3
Update stock_ageing.py
2020-06-24 07:31:21 -06:00
Deepesh Garg
06a37660ae
Merge pull request #22421 from deepeshgarg007/update_jv_account_timestamp
...
fix: Update journal entry accounts times stamp
2020-06-24 17:56:51 +05:30
Deepesh Garg
2abd66da9d
fix: Update journal entry account timesstamp
2020-06-24 17:49:50 +05:30
Anupam Kumar
10c7faf090
updating education report modified time ( #22418 )
...
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-06-24 17:34:52 +05:30
vishdha
d3ec1c1d89
feat: Taxjar Integration Added
2020-06-24 16:37:21 +05:30
Shivam Mishra
3ab8d865dd
feat: added search to support page ( #22376 )
...
* feat: added search to support page
* style: add styles in style block
2020-06-24 15:50:06 +05:30
Afshan
a07a548622
fix: removed "standard working hours" also fixed test cases
2020-06-24 13:07:59 +05:30
rohitwaghchaure
a50c95c959
Merge pull request #22223 from deepeshgarg007/grn_posting
...
feat: Accounting entries for service item in Purchase receipt
2020-06-24 11:00:19 +05:30
rohitwaghchaure
c4382abc03
Merge pull request #22410 from kennethsequeira/item_report_date
...
fix: add error prompt for wrong date range
2020-06-24 10:49:21 +05:30
rohitwaghchaure
d63c59ced4
Merge branch 'develop' into grn_posting
2020-06-24 10:23:23 +05:30
Marica
7af7bb8311
fix: Insert Supplier Group via List View ( #22403 )
2020-06-23 17:51:02 +05:30
Rohan
9c25101d9b
feat: add ability for a contract to be authorised internally ( #22095 )
...
* Added ability for a contract to be signed by a company user before being sent out
* feat: contract signed by stays even after reload (#402 )
* format: use new JSON format
Co-authored-by: Neil Lasrado <neil@digithinkit.com>
Co-authored-by: nehasacher143 <45919049+nehasacher143@users.noreply.github.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-06-23 17:39:37 +05:30
Kenneth Sequeira
f5b7bd9dcb
fix: add error prompt for wrong date range
2020-06-23 16:55:35 +05:30
Anurag Mishra
ecbfda7d6a
fix: typo in template( #22401 )
2020-06-23 14:33:49 +05:30
Afshan
4e37d25374
fix: removed condition that considered "Standard working hours" while creating "timesheet" as it was setting wrong time #20848
2020-06-23 14:10:40 +05:30
Anoop
5e16ca0326
fix: Login page doesn't load for new sites ( #22388 )
...
* fix: Login page doesn't load for new sites
Login page broken as active domains are not set for new sites
* Update footer_powered.html
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-23 11:11:13 +05:30
Anurag Mishra
101d15f2f8
fix: not working without from_amount and percentage_deduction ( #22380 )
2020-06-23 10:45:54 +05:30
Anurag Mishra
36560c8406
fix: staffing Plan validation ( #22379 )
2020-06-23 10:44:33 +05:30
mergify[bot]
ca8894b0fc
fix: alternative item not working for subcontract ( #22386 )
...
(cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281)
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2020-06-23 10:42:32 +05:30
Marica
3dee5273d6
fix: Update Packed Items via Update Items in SO ( #22392 )
2020-06-23 10:33:47 +05:30
Marica
bd5c8573de
fix: Unable to create batched Item ( #22393 )
2020-06-23 10:32:51 +05:30