nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 16:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,076 Commits 458 Branches 1,746 Tags
a679d43722eb8aebcdddf8a2d1ff5fb33f0733da
Commit Graph

34076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4c726b25ee fix: Add view ledger button for cancelled docs (#22433) 
* fix: Add view ledger button for cancelled docs

* fix: Add moddified to date in Stock Ledger
 2020-06-25 15:37:04 +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
Shivam Mishra
42fd2312b8 style: add styles in style block 2020-06-25 15:28:58 +05:30
Shivam Mishra
3bbbd1b606 feat: added search to support page 2020-06-25 15:28:58 +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
8d8ce63be7 Merge pull request #22425 from deepeshgarg007/update_jv_account_timestamp_v13 
fix: Update journal entry account timestamp
 2020-06-24 18:48:36 +05:30
Deepesh Garg
be9a8e1a14 Resolve merge conflicts 2020-06-24 18:47:58 +05:30
Deepesh Garg
faa0c5624e fix: Update journal entry account timestamp 2020-06-24 18:45:16 +05:30
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
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
Anurag Mishra
020c6e9175 fix: Create salary slip button disappears 2020-06-24 15:22:45 +05:30
Afshan
a07a548622 fix: removed "standard working hours" also fixed test cases 2020-06-24 13:07:59 +05:30
Anurag Mishra
a81c54f23a fix: 'Condition & Formula Help' appears twice 2020-06-24 11:51:06 +05:30
Deepesh Garg
51ce1e1d4e fix: Test Cases 
(cherry picked from commit ded3ab1cd7)
 2020-06-24 05:38:33 +00:00
Deepesh Garg
12f1f8e111 fix: Move check from Stock Settings to Company Master 
(cherry picked from commit 53d5d16abb)
 2020-06-24 05:38:33 +00:00
Deepesh Garg
6e2ca779c5 feat: Accounting entries for service item in Purchase receipt 
(cherry picked from commit c258ac82c5)
 2020-06-24 05:38:32 +00:00
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
Nabin Hait
b90194970d fix: Merge conflict 2020-06-23 20:01:24 +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
Anurag Mishra
ece9508eb5 fix: test_tax_for_payroll_period 2020-06-23 14:25:43 +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
Anurag Mishra
f9ca29cebd Fix: if there is no component 2020-06-23 11:57:02 +05:30
Anurag Mishra
d0d9b53361 feat: added year filters 2020-06-23 11:49:57 +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 171699537c)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2020-06-23 10:42:32 +05:30