rohitwaghchaure
7e3f10e5bc
Merge pull request #22397 from Anurag810/salary_deductions_report_fixes
...
fix: Salary deductions report fixes
2020-06-28 16:27:37 +05:30
rohitwaghchaure
81af2235f4
Merge branch 'develop' into dev-job-offer-list-view
2020-06-28 15:25:32 +05:30
rohitwaghchaure
41cd4fc788
Merge pull request #22478 from michellealva/cost_center_filter
...
fix: apply filters in all transactions
2020-06-28 15:10:13 +05:30
rohitwaghchaure
4cc2e70348
Merge pull request #22454 from wojosc/patch-10
...
refactor: update customs_tariff_number.json
2020-06-28 15:07:19 +05:30
rohitwaghchaure
cc2d7f3e7f
Merge pull request #22450 from marination/serial-no-rename
...
fix: Disable Renaming in Serial No
2020-06-28 11:15:35 +05:30
rohitwaghchaure
d5736711ce
fix: indentation
2020-06-28 11:12:20 +05:30
rohitwaghchaure
2f4971b5a6
Merge pull request #22461 from britlog/develop
...
fix: product_info
2020-06-28 11:05:26 +05:30
Deepesh Garg
1d8b13c943
Merge pull request #22483 from deepeshgarg007/loan_security_shorttfall_fixes
...
fix: Loan security shortfall fixes
2020-06-27 18:57:14 +05:30
Deepesh Garg
a4b9fc74aa
Merge branch 'develop' into feat_taxjar
2020-06-27 18:51:48 +05:30
Deepesh Garg
589364856c
fix: Syntax Error
2020-06-27 18:44:36 +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
92bea1326a
Merge branch 'develop' into serial-no-rename
2020-06-26 20:34:09 +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
08f842d12e
fix: apply filters in all transactions
2020-06-26 19:56:00 +05:30
michellealva
e9cec2ff76
fix: remove redundant label in salary slip
2020-06-26 19:39:54 +05:30
britlog
0086a3727f
fix: product_info
2020-06-26 15:30:27 +02:00
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
Wolfram Schmidt
a97715e464
Update customs_tariff_number.json
2020-06-26 10:24:48 +02:00
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
Wolfram Schmidt
7f2a3e8c7d
Update customs_tariff_number.json
...
Main information of tariff numbers are the number. A description is more or less double information as this is mostly the number. Thus a description should not be mandetory.
2020-06-25 13:56:32 +02:00
marination
f311f52f6e
fix: Disable Renaming in Serial No
2020-06-25 16:02:18 +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
Rohan Bansal
e7c91917aa
fix: setup status indicators for Job Offer and Job Applicant
2020-06-25 13:40:18 +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
Saqib Ansari
acdaf2b001
fiix: cannot cancel asset and asset movement
2020-06-25 12:43:25 +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
Anurag Mishra
2f867ca357
Merge branch 'develop' into salary-structure-help-fix
2020-06-24 17:41:32 +05:30
